From 32d17447a258188b2d534bcb0bf65a659ba7b7d0 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 29 Aug 2008 12:11:34 +0000
Subject: Initial import.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUCommonGUI/pom.xml                               |  33 +
 BKUCommonGUI/src/main/java/META-INF/MANIFEST.MF    |   3 +
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 909 +++++++++++++++++++++
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |  66 ++
 .../java/at/gv/egiz/bku/gui/BKUGUIFactory.java     |  32 +
 .../java/at/gv/egiz/bku/gui/HashDataInput.java     |  36 +
 .../at/gv/egiz/bku/gui/Messages.properties         |  39 +
 BKUCommonGUI/src/main/resources/images/logo.png    | Bin 0 -> 4035 bytes
 .../test/java/at/gv/egiz/bku/gui/BKUGUITest.java   |  53 ++
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java | 136 +++
 10 files changed, 1307 insertions(+)
 create mode 100644 BKUCommonGUI/pom.xml
 create mode 100644 BKUCommonGUI/src/main/java/META-INF/MANIFEST.MF
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataInput.java
 create mode 100644 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
 create mode 100644 BKUCommonGUI/src/main/resources/images/logo.png
 create mode 100644 BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
 create mode 100644 BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
new file mode 100644
index 00000000..bd579c51
--- /dev/null
+++ b/BKUCommonGUI/pom.xml
@@ -0,0 +1,33 @@
+<?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">
+    <parent>
+        <artifactId>bku</artifactId>
+        <groupId>at.gv.egiz</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>at.gv.egiz</groupId>
+    <artifactId>BKUCommonGUI</artifactId>
+    <name>BKU Common GUI</name>
+    <version>1.0-SNAPSHOT</version>
+    <description />
+    <dependencies>
+        <dependency>
+            <groupId>at.gv.egiz</groupId>
+            <artifactId>smcc</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+    <!--build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build-->
+</project>
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/META-INF/MANIFEST.MF b/BKUCommonGUI/src/main/java/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..5e949512
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
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
new file mode 100644
index 00000000..87b4eab4
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java
@@ -0,0 +1,909 @@
+/*
+* 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.
+*/
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.smcc.PINSpec;
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Cursor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.MessageFormat;
+import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.swing.GroupLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JPasswordField;
+import javax.swing.LayoutStyle;
+import javax.swing.SwingUtilities;
+import javax.swing.filechooser.FileFilter;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.PlainDocument;
+
+/**
+ *
+ * @author clemens
+ */
+public class BKUGUI implements BKUGUIFacade {
+    
+    public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
+    public static final String LOGO_RESOURCE = "/images/logo.png";
+
+    public static final int MAIN_PANEL_WIDTH = 100;
+//    public static final int MAIN_PANEL_HEIGHT = 20;
+    public static final int PREF_SIZE_PINFIELD = 118;
+    public static final Color ERROR_COLOR = Color.RED;
+    public static final Color HYPERLINK_COLOR = Color.BLUE;
+    
+    private static final String TITLE_WELCOME = "title.welcome";
+    private static final String TITLE_INSERTCARD = "title.insertcard";
+    private static final String TITLE_CARD_NOT_SUPPORTED = "title.cardnotsupported";
+    private static final String TITLE_CARDPIN = "title.cardpin";
+    private static final String TITLE_SIGN = "title.sign";
+    private static final String TITLE_ERROR = "title.error";
+    private static final String TITLE_RETRY = "title.retry";
+    private static final String WINDOWTITLE_SAVE = "windowtitle.save";
+    
+    private static final String MESSAGE_WAIT="message.wait";
+    private static final String MESSAGE_INSERTCARD="message.insertcard";
+    private static final String MESSAGE_HASHDATALINK="message.hashdatalink";
+    private static final String MESSAGE_RETRIES="message.retries";
+    private static final String LABEL_PIN="label.pin";
+    private static final String LABEL_PINSIZE="label.pinsize";
+//    private static final String LABEL_CARDPINSIZE="label.cardpinsize";
+//    private static final String LABEL_SIGNPIN="label.signpin";
+//    private static final String LABEL_SIGNPINSIZE="label.signpinsize";
+    private static final String BUTTON_OK = "button.ok";
+    private static final String BUTTON_CANCEL = "button.cancel";
+    private static final String BUTTON_SIGN = "button.sign";
+    
+    private static final String MIMETYPE_DESC_XML = "mimetype.desc.xml";
+    private static final String MIMETYPE_DESC_TXT = "mimetype.desc.txt";
+    private static final String MIMETYPE_DESC_PDF = "mimetype.desc.pdf";
+    private static final String MIMETYPE_DESC_BIN = "mimetype.desc.bin";
+    private static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
+    
+    protected Container contentPane;
+    protected ResourceBundle messages;
+    
+    /** left and right side main panels */
+    protected JPanel iconPanel;
+    protected JPanel contentPanel;
+    /** right side content panels and layouts */
+    protected JPanel headerPanel;
+    protected JPanel mainPanel;
+    protected JPanel buttonPanel;
+    /** right side fixed labels  */
+    protected JLabel titleLabel;
+    /** remember the pinfield to return to worker */
+    protected JPasswordField pinField;
+
+    /**
+     * @param contentPane
+     * @param localeString may be null
+     */
+    @Override
+    public void init(final Container contentPane, String localeString) {
+       
+        if (localeString != null) {
+            messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, new Locale(localeString));
+        } else {
+            messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
+        }
+
+        this.contentPane = contentPane;
+
+        try {
+
+            SwingUtilities.invokeAndWait(new Runnable() {
+
+                public void run() {
+
+                    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));
+                }
+            });
+        } catch (Exception ex) {
+            throw new RuntimeException("Failed to init GUI: " + ex.getMessage());
+        }
+    }
+
+    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.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(iconPanelLayout.createSequentialGroup().addContainerGap().addComponent(iconLabel).addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
+        iconPanelLayout.setVerticalGroup(
+          iconPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(iconPanelLayout.createSequentialGroup().addContainerGap().addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, 105, GroupLayout.PREFERRED_SIZE).addContainerGap(41, Short.MAX_VALUE)));
+    }
+
+    protected void initContentPanel() {
+
+        contentPanel = new JPanel();
+
+        headerPanel = new JPanel();
+        mainPanel = new JPanel();
+        buttonPanel = new JPanel();
+
+//        headerPanel.setBorder(new TitledBorder("header"));
+//        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);
+                            
+        GroupLayout headerPanelLayout = new GroupLayout(headerPanel);
+        headerPanel.setLayout(headerPanelLayout);
+        
+        headerPanelLayout.setHorizontalGroup(
+          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+          .addComponent(titleLabel, GroupLayout.DEFAULT_SIZE, 225, Short.MAX_VALUE));
+        headerPanelLayout.setVerticalGroup(
+          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(titleLabel));
+
+//        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)
+          .addGroup(contentPanelLayout.createSequentialGroup()
+          .addContainerGap()
+          .addGroup(contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+            .addComponent(headerPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+            .addComponent(mainPanel, GroupLayout.DEFAULT_SIZE, MAIN_PANEL_WIDTH, Short.MAX_VALUE)
+            .addComponent(buttonPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))));
+        contentPanelLayout.setVerticalGroup(
+          contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+          .addGroup(contentPanelLayout.createSequentialGroup()
+          .addContainerGap()
+          .addComponent(headerPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+          .addComponent(mainPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE) //79, GroupLayout.PREFERRED_SIZE)
+          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+          .addComponent(buttonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+          .addContainerGap()));
+    }
+    
+    @Override
+    public void showLoginDialog(ActionListener loginListener, String actionCommand) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            public void run() {
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+                
+                titleLabel.setText(messages.getString(TITLE_ERROR));
+//                titleLabel.setForeground(defaultForground);
+                
+                JLabel waitMsgLabel = new JLabel();
+                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                waitMsgLabel.setText("<html>LoginDialog not supported yet.</html>"); 
+                waitMsgLabel.setForeground(ERROR_COLOR);
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel));
+                
+                contentPanel.validate();
+            }
+        });
+    }
+    
+    @Override
+    public void showWelcomeDialog() {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            public void run() {
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+                
+                titleLabel.setText(messages.getString(TITLE_WELCOME)); 
+//                titleLabel.setForeground(defaultForground);
+                
+                JLabel waitMsgLabel = new JLabel();
+                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                waitMsgLabel.setText(messages.getString(MESSAGE_WAIT)); 
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel));
+                
+                contentPanel.validate();
+                
+            }
+        });
+    }
+
+    @Override
+    public void showInsertCardDialog(final ActionListener cancelListener, final String cancelCommand) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            public void run() {
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+                
+                titleLabel.setText(messages.getString(TITLE_INSERTCARD)); 
+//                titleLabel.setForeground(defaultForground);
+                
+                JButton cancelButton = new JButton();
+                cancelButton.setFont(cancelButton.getFont());
+                cancelButton.setText(messages.getString(BUTTON_CANCEL)); 
+                cancelButton.addActionListener(cancelListener);
+                cancelButton.setActionCommand(cancelCommand);
+
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                buttonPanelLayout.setHorizontalGroup(
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
+                  .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                  .addComponent(cancelButton)
+                  .addContainerGap()));
+                buttonPanelLayout.setVerticalGroup(
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(cancelButton));
+               
+                contentPanel.validate();
+            }
+        });
+    }
+
+    @Override
+    public void showCardNotSupportedDialog(final ActionListener cancelListener, final String cancelCommand) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            public void run() {
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+                
+                titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
+//                titleLabel.setForeground(defaultForground);
+                
+                JButton cancelButton = new JButton();
+                cancelButton.setFont(cancelButton.getFont());
+                cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                cancelButton.addActionListener(cancelListener);
+                cancelButton.setActionCommand(cancelCommand);
+                
+                JLabel errorMsgLabel = new JLabel();
+                errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                errorMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD)); 
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel));
+                
+                
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                buttonPanelLayout.setHorizontalGroup(
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
+                  .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                  .addComponent(cancelButton)
+                  .addContainerGap()));
+                buttonPanelLayout.setVerticalGroup(
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(cancelButton));
+               
+                contentPanel.validate();
+            }
+        });
+    }
+
+    private void showCardPINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener okListener, final String okCommand, final ActionListener cancelListener, final String cancelCommand) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            public void run() {
+
+                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));
+                }
+
+                JButton cancelButton = new JButton();
+                cancelButton.setFont(cancelButton.getFont());
+                cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                cancelButton.setActionCommand(cancelCommand);
+                cancelButton.addActionListener(cancelListener);
+
+                JButton okButton = new JButton();
+                okButton.setEnabled(false);
+                okButton.setFont(okButton.getFont());
+                okButton.setText(messages.getString(BUTTON_OK));
+                okButton.setActionCommand(okCommand);
+                okButton.addActionListener(okListener);
+                
+                JLabel cardPinLabel = new JLabel();
+                cardPinLabel.setFont(cardPinLabel.getFont().deriveFont(cardPinLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                String pinLabel = messages.getString(LABEL_PIN); 
+                cardPinLabel.setText(MessageFormat.format(pinLabel, new Object[] {pinSpec.getLocalizedName()}));
+
+//                JPasswordField cardPINField = new JPasswordField();
+                pinField = new JPasswordField();
+                pinField.setText("");
+                pinField.setDocument(new PINDocument(pinSpec, okButton));
+                pinField.setActionCommand(okCommand);
+                pinField.addActionListener(new ActionListener() {
+
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        if (pinField.getPassword().length >= pinSpec.getMinLength()) {
+                            okListener.actionPerformed(e);
+                        }
+                    }
+                });
+
+                JLabel infoLabel = new JLabel();
+                if (numRetries < 0) {
+                    infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                    String pinsizePattern = messages.getString(LABEL_PINSIZE);
+                    String pinSize = String.valueOf(pinSpec.getMinLength());
+                    if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+                        pinSize += "-" + pinSpec.getMaxLength();
+                    }
+                    infoLabel.setText(MessageFormat.format(pinsizePattern, new Object[] {pinSize}));
+                } else  {
+                    infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[] {String.valueOf(numRetries)}));
+                    infoLabel.setForeground(ERROR_COLOR);
+                }
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+//                GroupLayout.ParallelGroup mainGroup = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+//                mainGroup.addComponent(pinSizeLabel) //, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)
+//                  .addComponent(pinField, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE);
+                
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup() //                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  //                  .addComponent(hashDataLabel)
+                  //                  .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
+                  .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) //RELATED)
+                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) //TRAILING)
+                  .addComponent(infoLabel) //, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)
+                  .addComponent(pinField, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)) //))
+                  .addContainerGap()));
+
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addGroup(mainPanelLayout.createSequentialGroup()
+                  .addContainerGap() //                  .addComponent(hashDataLabel).addGap(14, 14, 14)
+                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) //, false)
+                  .addComponent(cardPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
+                  .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(infoLabel).addGap(cardPinLabel.getFont().getSize()))); //10, 10, 10)));
+
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                buttonPanelLayout.setHorizontalGroup(
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
+                  .addContainerGap(15, Short.MAX_VALUE)
+                  .addComponent(okButton)
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                  .addComponent(cancelButton).addContainerGap()));
+                buttonPanelLayout.setVerticalGroup(
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(okButton).addComponent(cancelButton)));
+                
+                pinField.requestFocusInWindow();
+                contentPanel.validate();
+                
+            }
+        });
+    }
+
+    @Override
+    public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
+        showCardPINDialog(pinSpec, -1, okListener, okCommand, cancelListener, cancelCommand);
+    }
+
+    @Override
+    public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
+        showCardPINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand);
+    }
+    
+    @Override
+    public void showSignaturePINDialog(PINSpec pinSpec, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
+        showSignaturePINDialog(pinSpec, -1, signListener, signCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
+    }
+
+    @Override
+    public void showSignaturePINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
+        showSignaturePINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
+    }
+
+    
+    
+    private void showSignaturePINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener signListener, final String signCommand, final ActionListener cancelListener, final String cancelCommand, final ActionListener hashdataListener, final String hashdataCommand) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            public void run() {
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+                
+                if (numRetries < 0) {
+                    titleLabel.setText(messages.getString(TITLE_SIGN));
+                } else {
+                    titleLabel.setText(messages.getString(TITLE_RETRY));
+                }
+
+                JButton cancelButton = new JButton();
+                cancelButton.setFont(cancelButton.getFont());
+                cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                cancelButton.setActionCommand(cancelCommand);
+                cancelButton.addActionListener(cancelListener);
+
+                JButton signButton = new JButton();
+                signButton.setEnabled(false);
+                signButton.setFont(signButton.getFont());
+                signButton.setText(messages.getString(BUTTON_SIGN));
+                signButton.setActionCommand(signCommand);
+                signButton.addActionListener(signListener);
+
+                JLabel signPinLabel = new JLabel();
+                signPinLabel.setFont(signPinLabel.getFont().deriveFont(signPinLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                String pinLabel = messages.getString(LABEL_PIN); 
+                signPinLabel.setText(MessageFormat.format(pinLabel, new Object[] {pinSpec.getLocalizedName()}));
+
+                pinField = new JPasswordField();
+                pinField.setText("");
+                pinField.setDocument(new PINDocument(pinSpec, signButton));
+                pinField.setActionCommand(signCommand);
+                pinField.addActionListener(new ActionListener() {
+
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        if (pinField.getPassword().length >= pinSpec.getMinLength()) {
+                            signListener.actionPerformed(e);
+                        }
+                    }
+                });
+
+                //pinsize or error label
+                JLabel infoLabel = new JLabel();
+                infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                if (numRetries < 0) {
+                    String pinsizePattern = messages.getString(LABEL_PINSIZE);
+                    String pinSize = String.valueOf(pinSpec.getMinLength());
+                    if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+                        pinSize += "-" + pinSpec.getMaxLength();
+                    }
+                    infoLabel.setText(MessageFormat.format(pinsizePattern, new Object[] {pinSize}));
+                } else {
+                    infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[] {String.valueOf(numRetries)}));
+                    infoLabel.setForeground(ERROR_COLOR);
+                }
+                
+                JLabel hashDataLabel = new JLabel();
+                hashDataLabel.setFont(hashDataLabel.getFont().deriveFont(hashDataLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                hashDataLabel.setText(messages.getString(MESSAGE_HASHDATALINK));
+                hashDataLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                hashDataLabel.setForeground(HYPERLINK_COLOR);
+                hashDataLabel.addMouseListener(new MouseAdapter() {
+                    @Override
+                    public void mouseClicked(MouseEvent me) {       
+                        ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
+                        hashdataListener.actionPerformed(e);
+                    }
+                });
+                
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(hashDataLabel).addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup().addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING).addComponent(infoLabel) //, GroupLayout.DEFAULT_SIZE, 118, Short.MAX_VALUE)
+                  .addComponent(pinField, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)))).addContainerGap()));
+
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addComponent(hashDataLabel).addGap(hashDataLabel.getFont().getSize()) //14, 14, 14)
+                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE, false).addComponent(signPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
+                  .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(infoLabel).addGap(signPinLabel.getFont().getSize()))); //10, 10, 10)));
+
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                buttonPanelLayout.setHorizontalGroup(
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(signButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
+                buttonPanelLayout.setVerticalGroup(
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(signButton).addComponent(cancelButton)));
+
+                pinField.requestFocusInWindow();
+                contentPanel.validate();
+                
+            }
+
+//            private ParallelGroup createMainGroup(GroupLayout mainPanelLayout, JLabel hashDataLabel, JLabel signPinLabel, JLabel pinSizeLabel, JLabel errorLabel) {
+//                ParallelGroup mainGroup = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+//                mainGroup.addComponent(hashDataLabel);
+//                if (errorLabel != null) {
+//                    mainGroup.addComponent(errorLabel);
+//                }
+//                mainGroup.addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
+//                                                                    .addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE)
+//                                                                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+//                                                                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
+//                                                                                                .addComponent(pinSizeLabel)
+//                                                                                                .addComponent(pinField, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)));
+//                return mainGroup;
+//            }
+            
+//            private GroupLayout.SequentialGroup createVerticalMainGroup(GroupLayout mainPanelLayout, JLabel hashDataLabel, JLabel signPinLabel, JLabel pinSizeLabel, JLabel errorLabel) {
+//                GroupLayout.SequentialGroup mainGroup = mainPanelLayout.createSequentialGroup();
+//                mainGroup.addComponent(hashDataLabel)
+//                    .addGap(hashDataLabel.getFont().getSize()); //14, 14, 14)
+//                    
+//                if (errorLabel != null) {
+//                    mainGroup.addComponent(errorLabel)
+//                      .addGap(errorLabel.getFont().getSize());
+//                }
+//                mainGroup.addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE, false)
+//                        .addComponent(signPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
+//                        .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
+//                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+//                    .addComponent(pinSizeLabel)
+//                    .addGap(signPinLabel.getFont().getSize());
+//                
+//                return mainGroup;
+////                mainPanelLayout.createSequentialGroup()
+////                    .addComponent(hashDataLabel)
+////                    .addGap(hashDataLabel.getFont().getSize()) //14, 14, 14)
+////                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE, false)
+////                        .addComponent(signPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
+////                        .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
+////                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+////                    .addComponent(pinSizeLabel)
+////                    .addGap(signPinLabel.getFont().getSize())
+////                    
+////                    
+//            }
+        });
+    }
+
+    @Override
+    public void showErrorDialog(final String errorMsg, final ActionListener okListener, final String okCommand) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            public void run() {
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+                
+                titleLabel.setText(messages.getString(TITLE_ERROR)); 
+//                titleLabel.setForeground(defaultForground);
+
+                JLabel errorMsgLabel = new JLabel();
+                errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                errorMsgLabel.setText("<html>" + errorMsg + "</html>");
+                errorMsgLabel.setForeground(ERROR_COLOR);
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel));
+                
+                JButton okButton = new JButton();
+                okButton.setFont(okButton.getFont());
+                okButton.setText(messages.getString(BUTTON_OK));
+                okButton.setActionCommand(okCommand);
+                okButton.addActionListener(okListener);
+
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                buttonPanelLayout.setHorizontalGroup(
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
+                  .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                  .addComponent(okButton)
+                  .addContainerGap()));
+                buttonPanelLayout.setVerticalGroup(
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(okButton));
+                
+                contentPanel.validate();
+            }
+        });
+    }
+
+    @Override
+    public void showErrorDialog(final String errorMsg) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            public void run() {
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+                
+                titleLabel.setText(messages.getString(TITLE_ERROR)); 
+//                titleLabel.setForeground(defaultForground);
+
+                JLabel errorMsgLabel = new JLabel();
+                errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                errorMsgLabel.setText("<html>" + errorMsg + "</html>"); 
+                errorMsgLabel.setForeground(ERROR_COLOR);
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel));
+                
+                contentPanel.validate();
+            }
+        });
+    }
+    
+    @Override
+    public void showHashDataInputDialog(final List<HashDataInput> signedReferences, final ActionListener okListener, final String okCommand) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            public void run() {
+                
+                if (signedReferences != null && signedReferences.size() == 1) {
+                    FileOutputStream fos = null;
+                    try {
+                        HashDataInput signedRef = signedReferences.get(0);
+                        final String mimeType = signedRef.getMimeType();
+                        String dir = System.getProperty("user.home");
+                        JFileChooser fileDialog = new JFileChooser(dir);
+                        fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
+                        fileDialog.setMultiSelectionEnabled(false);
+                        fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVE));
+                        fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
+                        fileDialog.setFileHidingEnabled(true);
+                        MimeFilter mimeFilter = new MimeFilter(mimeType);
+                        fileDialog.setFileFilter(mimeFilter);
+                        String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + mimeFilter.getExtension();
+                        fileDialog.setSelectedFile(new File(dir, filename));
+                        switch (fileDialog.showSaveDialog(contentPane)) {
+                            case JFileChooser.APPROVE_OPTION:
+                                File f = fileDialog.getSelectedFile();
+//                                if (f.exists()) {
+//                                    //TODO
+//                                }
+                                    
+                                fos = new FileOutputStream(f);
+                                BufferedOutputStream bos = new BufferedOutputStream(fos);
+                                InputStream hdi = signedRef.getHashDataInput();
+                                int b;
+                                while ((b = hdi.read()) != -1) {
+                                    bos.write(b);
+                                }
+                                bos.flush();
+                                bos.close();
+                        }
+                    } catch (IOException ex) {
+                        showErrorDialog("Failed to write signed reference to file: " + ex.getMessage(), null, null);
+                        ex.printStackTrace();
+                    } finally {
+                        try {
+                            fos.close();
+                        } catch (IOException ex) {}
+                    }
+                } else {
+                    mainPanel.removeAll();
+                    buttonPanel.removeAll();
+
+                    titleLabel.setText(messages.getString(TITLE_ERROR)); 
+    //                titleLabel.setForeground(defaultForground);
+
+                    JLabel errorMsgLabel = new JLabel();
+                    errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                    errorMsgLabel.setText("<html>HashDataInputDialog not supported yet.</html>"); 
+                    errorMsgLabel.setForeground(ERROR_COLOR);
+
+                    GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                    mainPanel.setLayout(mainPanelLayout);
+
+                    mainPanelLayout.setHorizontalGroup(
+                      mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                    mainPanelLayout.setVerticalGroup(
+                      mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel));
+
+                    JButton okButton = new JButton();
+                    okButton.setFont(okButton.getFont());
+                    okButton.setText(messages.getString(BUTTON_OK));
+                    okButton.setActionCommand(okCommand);
+                    okButton.addActionListener(okListener);
+
+                    GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                    buttonPanel.setLayout(buttonPanelLayout);
+
+                    buttonPanelLayout.setHorizontalGroup(
+                      buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
+                      .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                      .addComponent(okButton)
+                      .addContainerGap()));
+                    buttonPanelLayout.setVerticalGroup(
+                      buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(okButton));
+
+                    contentPanel.validate();
+                }
+            }
+        });
+    }
+
+    @Override
+    public char[] getPin() {
+        if (pinField != null) 
+            return pinField.getPassword();
+        return null;
+    }
+    
+    class PINDocument extends PlainDocument {
+
+        private PINSpec pinSpec;
+        private Pattern pinPattern;
+        private JButton enterButton;
+
+        public PINDocument(PINSpec pinSpec, JButton enterButton) {
+            this.pinSpec = pinSpec;
+            if (pinSpec.getRexepPattern() != null) {
+                pinPattern = Pattern.compile(pinSpec.getRexepPattern());
+            } else {
+                pinPattern = Pattern.compile(".");
+            }
+            this.enterButton = enterButton;
+        }
+
+        @Override
+        public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
+            if (pinSpec.getMaxLength() >= (getLength() + str.length())) {
+                boolean matches = true;
+                for (int i = 0; i < str.length(); i++) {
+                    Matcher m = pinPattern.matcher(str.substring(i, i+1));
+                    if (!m.matches()) {
+                        matches = false;
+                    }
+                }
+                if (matches) {
+                    super.insertString(offs, str, a);
+                }
+            }
+            enterButton.setEnabled(getLength() >= pinSpec.getMinLength());
+        }
+
+        @Override
+        public void remove(int offs, int len) throws BadLocationException {
+            super.remove(offs, len);
+            enterButton.setEnabled(getLength() >= pinSpec.getMinLength());
+        }
+    }
+    
+    class MimeFilter extends FileFilter {
+
+        protected String mimeType;
+
+        public MimeFilter(String mimeType) {
+            this.mimeType = mimeType;
+        }
+        
+        @Override
+        public boolean accept(File f) {
+
+            if (f.isDirectory()) {
+                return true;
+            } else if ("text/xml".equals(mimeType)) {
+                return "xml".equals(getExtension(f));
+            } else if ("text/plain".equals(mimeType)) {
+                return "txt".equals(getExtension(f));
+            } else if ("application/pdf".equals(mimeType)) {
+                return "pdf".equals(getExtension(f));
+            } else {
+                return "bin".equals(getExtension(f));
+            }
+        }
+
+        private String getExtension(File f) {
+            String ext = null;
+            String s = f.getName();
+            int i = s.lastIndexOf('.');
+
+            if (i > 0 &&  i < s.length() - 1) {
+                ext = s.substring(i+1).toLowerCase();
+            }
+            return ext;
+        }
+
+        @Override
+        public String getDescription() {
+            if ("text/xml".equals(mimeType)) {
+                return messages.getString(MIMETYPE_DESC_XML);
+            } else if ("text/plain".equals(mimeType)) {
+                return messages.getString(MIMETYPE_DESC_TXT);
+            } else if ("application/pdf".equals(mimeType)) {
+                return messages.getString(MIMETYPE_DESC_PDF);
+            } else {
+                return messages.getString(MIMETYPE_DESC_BIN);
+            }
+        }
+        
+        public String getExtension() {
+            if ("text/xml".equals(mimeType)) {
+                return ".xml";
+            } else if ("text/plain".equals(mimeType)) {
+                return ".txt";
+            } else if ("application/pdf".equals(mimeType)) {
+                return ".pdf";
+            } else {
+                return ".bin";
+            }
+        }
+    }
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
new file mode 100644
index 00000000..3766e905
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -0,0 +1,66 @@
+/*
+* 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.
+*/
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package at.gv.egiz.bku.gui;
+
+//import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.PINSpec;
+import java.awt.Container;
+import java.awt.event.ActionListener;
+import java.util.List;
+import javax.swing.JPasswordField;
+
+/**
+ *
+ * @author clemens
+ */
+public interface BKUGUIFacade {
+    
+    public void init(Container contentPane, String localeString);
+    
+    public void showWelcomeDialog(); 
+    
+    /**
+     * MOA-ID only
+     * @param loginListener
+     */
+    public void showLoginDialog(ActionListener loginListener, String actionCommand);
+    
+    public void showInsertCardDialog(ActionListener cancelListener, String actionCommand);
+    
+    public void showCardNotSupportedDialog(ActionListener cancelListener, String actionCommand);
+    
+    public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand);
+    
+    public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand);
+    
+    public void showSignaturePINDialog(PINSpec pinSpec, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand);
+    
+    public void showSignaturePINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand);
+    
+    public char[] getPin();
+    
+    public void showHashDataInputDialog(List<HashDataInput> signedReferences, ActionListener okListener, String actionCommand);
+    
+    public void showErrorDialog(String errorMsg, ActionListener okListener, String actionCommand);
+    
+    public void showErrorDialog(String errorMsg);
+    
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
new file mode 100644
index 00000000..478b949b
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
@@ -0,0 +1,32 @@
+/*
+* 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.
+*/
+package at.gv.egiz.bku.gui;
+
+public class BKUGUIFactory {
+  private static BKUGUIFactory instance = new BKUGUIFactory();
+
+  private BKUGUIFactory() {
+  }
+
+  protected BKUGUIFacade createNewGUI() {
+    return new BKUGUI();
+  }
+
+  public static BKUGUIFacade createGUI() {
+    return instance.createNewGUI();
+  }
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataInput.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataInput.java
new file mode 100644
index 00000000..d916e81c
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataInput.java
@@ -0,0 +1,36 @@
+/*
+* 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.
+*/
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import java.io.InputStream;
+
+/**
+ *
+ * @author clemens
+ */
+public interface HashDataInput {
+    
+    public InputStream getHashDataInput();
+    
+    public String getMimeType();
+    
+}
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
new file mode 100644
index 00000000..62c5a670
--- /dev/null
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -0,0 +1,39 @@
+# 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.
+
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+title.welcome=<html>Willkommen</html>
+title.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken</html>
+title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
+title.cardpin=<html>{0} eingeben</html>
+title.sign=<html>Signatur erstellen</html>
+title.error=<html>Ein Fehler trat auf</html>
+title.retry=<html>Falscher PIN</html>
+windowtitle.save=Signaturdaten speichern
+message.wait=<html>Bitte warten...</html>
+message.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken.</html>
+message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen...</a></html>
+message.retries=<html>Noch {0} Versuche</html>
+label.pin=<html>{0}:</html>
+label.pinsize=<html>({0} stellig)</html>
+button.ok=OK
+button.cancel=Abbrechen
+button.sign=Signieren
+mimetype.desc.xml=XML-Dateien (*.xml)
+mimetype.desc.txt=Textdateien (*.txt)
+mimetype.desc.pdf=Adobe PDF-Dateien (*.pdf)
+mimetype.desc.bin=Bin\u00E4rdateien (*.bin)
+save.hashdatainput.prefix=Signaturdaten
diff --git a/BKUCommonGUI/src/main/resources/images/logo.png b/BKUCommonGUI/src/main/resources/images/logo.png
new file mode 100644
index 00000000..eee4be4f
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/images/logo.png differ
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
new file mode 100644
index 00000000..4dc1f8b3
--- /dev/null
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -0,0 +1,53 @@
+/*
+* 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.
+*/
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import javax.swing.JFrame;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ *
+ * @author clemens
+ */
+public class BKUGUITest {
+
+    @Ignore
+    public void testBKUGUI() {
+        JFrame testFrame = new JFrame("BKUGUITest");
+        BKUGUI gui = new BKUGUI();
+        gui.init(testFrame.getContentPane(), null);
+        BKUGUIWorker worker = new BKUGUIWorker();
+        worker.init(gui);
+        testFrame.pack();
+        testFrame.setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
+        testFrame.setVisible(true);
+        new Thread(worker).start();
+        
+        while(true) ;
+    }
+    
+    @Test
+    public void dummyTest() {
+    }
+}
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
new file mode 100644
index 00000000..50771216
--- /dev/null
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
@@ -0,0 +1,136 @@
+/*
+* 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.
+*/
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.smcc.PINSpec;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.Collections;
+
+/**
+ *
+ * @author clemens
+ */
+public class BKUGUIWorker implements Runnable {
+
+    BKUGUIFacade gui;
+
+    public void init(BKUGUIFacade gui) {
+        this.gui = gui;
+    }
+
+    @Override
+    public void run() {
+        try {
+
+            final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Signatur-PIN");
+
+            
+            final ActionListener cancelListener = new ActionListener() {
+
+                public void actionPerformed(ActionEvent e) {
+                    System.out.println("CANCEL EVENT OCCURED: " + e);
+                }
+            };
+            ActionListener okListener = new ActionListener() {
+
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    System.out.println("OK EVENT OCCURED: " + e);
+                }
+            };
+            final ActionListener signListener = new ActionListener() {
+
+                public void actionPerformed(ActionEvent e) {
+                    System.out.println("SIGN EVENT OCCURED: " + e);
+                }
+            };
+            ActionListener hashdataListener = new ActionListener() {
+
+                public void actionPerformed(ActionEvent e) {
+                    System.out.println("HASHDATA EVENT OCCURED: " + e);
+                    ActionListener returnListener = new ActionListener() {
+
+                        @Override
+                        public void actionPerformed(ActionEvent e) {
+                            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", null, "hashdata");
+                        }
+                    };
+                    HashDataInput signedRef = new HashDataInput() {
+
+                        @Override
+                        public InputStream getHashDataInput() {
+                            return new ByteArrayInputStream("<xml>HashDataInput_002</xml>".getBytes());
+                        }
+
+                        @Override
+                        public String getMimeType() {
+                            return "text/xml";
+                        }
+                    };
+                    gui.showHashDataInputDialog(Collections.singletonList(signedRef), returnListener, "return");
+                }
+            };
+           
+
+
+//        gui.showWelcomeDialog();
+//
+//        Thread.sleep(2000);
+        
+            gui.showInsertCardDialog(cancelListener, "cancel");
+            
+            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");
+//
+//            Thread.sleep(2000);
+//            
+//            gui.showSignaturePINRetryDialog(signPinSpec, 2, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+//
+//            Thread.sleep(2000);
+////            
+//            gui.showErrorDialog("Testfehler occured", null, null);
+//            
+//            Thread.sleep(2000);
+//            
+//            gui.showErrorDialog("Testfehler occured"); 
+
+        } catch (InterruptedException ex) {
+            ex.printStackTrace();
+        }
+    }
+}
-- 
cgit v1.2.3


From 3808a5b4ec9d13c8cbb1b7fd95afa62c133342fd Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 5 Sep 2008 13:39:14 +0000
Subject: HashDataInput

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@21 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUCommonGUI/pom.xml                               |  32 +-
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 432 +++++++++++----------
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |  17 +-
 .../java/at/gv/egiz/bku/gui/HashDataInput.java     |  36 --
 .../at/gv/egiz/bku/gui/Messages.properties         |   8 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |   8 +-
 6 files changed, 258 insertions(+), 275 deletions(-)
 delete mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataInput.java

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index bd579c51..8c08ba6e 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/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,23 +10,28 @@
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
     <version>1.0-SNAPSHOT</version>
-    <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>at.gv.egiz</groupId>
+            <artifactId>STAL</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
-    <!--build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
+    <!--build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
     </build-->
-</project>
\ No newline at end of file
+</project>
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 87b4eab4..0ad09c70 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
@@ -1,19 +1,19 @@
 /*
-* 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.
-*/
+ * 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.
+ */
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
@@ -21,6 +21,7 @@
 package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.stal.HashDataInput;
 import java.awt.Color;
 import java.awt.Container;
 import java.awt.Cursor;
@@ -30,7 +31,6 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -38,16 +38,14 @@ import java.text.MessageFormat;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.swing.GroupLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.LayoutStyle;
@@ -56,22 +54,23 @@ import javax.swing.filechooser.FileFilter;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.PlainDocument;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  *
  * @author clemens
  */
 public class BKUGUI implements BKUGUIFacade {
-    
+
+    private static final Log log = LogFactory.getLog(BKUGUI.class);
     public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
     public static final String LOGO_RESOURCE = "/images/logo.png";
-
     public static final int MAIN_PANEL_WIDTH = 100;
 //    public static final int MAIN_PANEL_HEIGHT = 20;
     public static final int PREF_SIZE_PINFIELD = 118;
     public static final Color ERROR_COLOR = Color.RED;
     public static final Color HYPERLINK_COLOR = Color.BLUE;
-    
     private static final String TITLE_WELCOME = "title.welcome";
     private static final String TITLE_INSERTCARD = "title.insertcard";
     private static final String TITLE_CARD_NOT_SUPPORTED = "title.cardnotsupported";
@@ -79,30 +78,32 @@ public class BKUGUI implements BKUGUIFacade {
     private static final String TITLE_SIGN = "title.sign";
     private static final String TITLE_ERROR = "title.error";
     private static final String TITLE_RETRY = "title.retry";
+    private static final String TITLE_WAIT = "title.wait";
+    private static final String TITLE_HASHDATA = "title.hashdata";
     private static final String WINDOWTITLE_SAVE = "windowtitle.save";
-    
-    private static final String MESSAGE_WAIT="message.wait";
-    private static final String MESSAGE_INSERTCARD="message.insertcard";
-    private static final String MESSAGE_HASHDATALINK="message.hashdatalink";
-    private static final String MESSAGE_RETRIES="message.retries";
-    private static final String LABEL_PIN="label.pin";
-    private static final String LABEL_PINSIZE="label.pinsize";
+    private static final String WINDOWTITLE_OVERWRITE = "windowtitle.overwrite";
+    private static final String MESSAGE_WAIT = "message.wait";
+    private static final String MESSAGE_INSERTCARD = "message.insertcard";
+    private static final String MESSAGE_HASHDATALINK = "message.hashdatalink";
+    private static final String MESSAGE_HASHDATA = "message.hashdata";
+    private static final String MESSAGE_RETRIES = "message.retries";
+    private static final String MESSAGE_OVERWRITE = "message.overwrite";
+    private static final String LABEL_PIN = "label.pin";
+    private static final String LABEL_PINSIZE = "label.pinsize";
 //    private static final String LABEL_CARDPINSIZE="label.cardpinsize";
 //    private static final String LABEL_SIGNPIN="label.signpin";
 //    private static final String LABEL_SIGNPINSIZE="label.signpinsize";
     private static final String BUTTON_OK = "button.ok";
     private static final String BUTTON_CANCEL = "button.cancel";
     private static final String BUTTON_SIGN = "button.sign";
-    
+    private static final String BUTTON_SAVE = "button.save";
     private static final String MIMETYPE_DESC_XML = "mimetype.desc.xml";
     private static final String MIMETYPE_DESC_TXT = "mimetype.desc.txt";
     private static final String MIMETYPE_DESC_PDF = "mimetype.desc.pdf";
     private static final String MIMETYPE_DESC_BIN = "mimetype.desc.bin";
     private static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
-    
     protected Container contentPane;
     protected ResourceBundle messages;
-    
     /** left and right side main panels */
     protected JPanel iconPanel;
     protected JPanel contentPanel;
@@ -121,7 +122,7 @@ public class BKUGUI implements BKUGUIFacade {
      */
     @Override
     public void init(final Container contentPane, String localeString) {
-       
+
         if (localeString != null) {
             messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, new Locale(localeString));
         } else {
@@ -174,18 +175,17 @@ public class BKUGUI implements BKUGUIFacade {
 //        headerPanel.setBorder(new TitledBorder("header"));
 //        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.setFont(titleLabel.getFont().deriveFont(titleLabel.getFont().getStyle() |
+          java.awt.Font.BOLD, titleLabel.getFont().getSize() + 2));
 //        titleLabel.setForeground(defaultForground);
-                            
+
         GroupLayout headerPanelLayout = new GroupLayout(headerPanel);
         headerPanel.setLayout(headerPanelLayout);
-        
+
         headerPanelLayout.setHorizontalGroup(
-          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-          .addComponent(titleLabel, GroupLayout.DEFAULT_SIZE, 225, Short.MAX_VALUE));
+          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(titleLabel, GroupLayout.DEFAULT_SIZE, 225, Short.MAX_VALUE));
         headerPanelLayout.setVerticalGroup(
           headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(titleLabel));
 
@@ -194,25 +194,12 @@ public class BKUGUI implements BKUGUIFacade {
         GroupLayout contentPanelLayout = new GroupLayout(contentPanel);
         contentPanel.setLayout(contentPanelLayout);
         contentPanelLayout.setHorizontalGroup(
-          contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-          .addGroup(contentPanelLayout.createSequentialGroup()
-          .addContainerGap()
-          .addGroup(contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-            .addComponent(headerPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-            .addComponent(mainPanel, GroupLayout.DEFAULT_SIZE, MAIN_PANEL_WIDTH, Short.MAX_VALUE)
-            .addComponent(buttonPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))));
+          contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(contentPanelLayout.createSequentialGroup().addContainerGap().addGroup(contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(headerPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(mainPanel, GroupLayout.DEFAULT_SIZE, MAIN_PANEL_WIDTH, Short.MAX_VALUE).addComponent(buttonPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))));
         contentPanelLayout.setVerticalGroup(
-          contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-          .addGroup(contentPanelLayout.createSequentialGroup()
-          .addContainerGap()
-          .addComponent(headerPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-          .addComponent(mainPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE) //79, GroupLayout.PREFERRED_SIZE)
-          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-          .addComponent(buttonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-          .addContainerGap()));
+          contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(contentPanelLayout.createSequentialGroup().addContainerGap().addComponent(headerPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(mainPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE) //79, GroupLayout.PREFERRED_SIZE)
+          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(buttonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE).addContainerGap()));
     }
-    
+
     @Override
     public void showLoginDialog(ActionListener loginListener, String actionCommand) {
         SwingUtilities.invokeLater(new Runnable() {
@@ -220,13 +207,13 @@ public class BKUGUI implements BKUGUIFacade {
             public void run() {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
-                
+
                 titleLabel.setText(messages.getString(TITLE_ERROR));
 //                titleLabel.setForeground(defaultForground);
-                
+
                 JLabel waitMsgLabel = new JLabel();
                 waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                waitMsgLabel.setText("<html>LoginDialog not supported yet.</html>"); 
+                waitMsgLabel.setText("<html>LoginDialog not supported yet.</html>");
                 waitMsgLabel.setForeground(ERROR_COLOR);
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
@@ -236,12 +223,12 @@ public class BKUGUI implements BKUGUIFacade {
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel));
-                
+
                 contentPanel.validate();
             }
         });
     }
-    
+
     @Override
     public void showWelcomeDialog() {
         SwingUtilities.invokeLater(new Runnable() {
@@ -249,13 +236,13 @@ public class BKUGUI implements BKUGUIFacade {
             public void run() {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
-                
-                titleLabel.setText(messages.getString(TITLE_WELCOME)); 
+
+                titleLabel.setText(messages.getString(TITLE_WELCOME));
 //                titleLabel.setForeground(defaultForground);
-                
+
                 JLabel waitMsgLabel = new JLabel();
                 waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                waitMsgLabel.setText(messages.getString(MESSAGE_WAIT)); 
+                waitMsgLabel.setText(messages.getString(MESSAGE_WAIT));
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
@@ -264,9 +251,9 @@ public class BKUGUI implements BKUGUIFacade {
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel));
-                
+
                 contentPanel.validate();
-                
+
             }
         });
     }
@@ -278,13 +265,13 @@ public class BKUGUI implements BKUGUIFacade {
             public void run() {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
-                
-                titleLabel.setText(messages.getString(TITLE_INSERTCARD)); 
+
+                titleLabel.setText(messages.getString(TITLE_INSERTCARD));
 //                titleLabel.setForeground(defaultForground);
-                
+
                 JButton cancelButton = new JButton();
                 cancelButton.setFont(cancelButton.getFont());
-                cancelButton.setText(messages.getString(BUTTON_CANCEL)); 
+                cancelButton.setText(messages.getString(BUTTON_CANCEL));
                 cancelButton.addActionListener(cancelListener);
                 cancelButton.setActionCommand(cancelCommand);
 
@@ -292,15 +279,10 @@ public class BKUGUI implements BKUGUIFacade {
                 buttonPanel.setLayout(buttonPanelLayout);
 
                 buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
-                  .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                  .addComponent(cancelButton)
-                  .addContainerGap()));
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(cancelButton).addContainerGap()));
                 buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(cancelButton));
-               
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(cancelButton));
+
                 contentPanel.validate();
             }
         });
@@ -313,19 +295,19 @@ public class BKUGUI implements BKUGUIFacade {
             public void run() {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
-                
+
                 titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
 //                titleLabel.setForeground(defaultForground);
-                
+
                 JButton cancelButton = new JButton();
                 cancelButton.setFont(cancelButton.getFont());
                 cancelButton.setText(messages.getString(BUTTON_CANCEL));
                 cancelButton.addActionListener(cancelListener);
                 cancelButton.setActionCommand(cancelCommand);
-                
+
                 JLabel errorMsgLabel = new JLabel();
                 errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                errorMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD)); 
+                errorMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD));
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
@@ -334,21 +316,16 @@ public class BKUGUI implements BKUGUIFacade {
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel));
-                
-                
+
+
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
                 buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
-                  .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                  .addComponent(cancelButton)
-                  .addContainerGap()));
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(cancelButton).addContainerGap()));
                 buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(cancelButton));
-               
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(cancelButton));
+
                 contentPanel.validate();
             }
         });
@@ -361,10 +338,10 @@ 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()}));
+                    titleLabel.setText(MessageFormat.format(cardpinTitle, new Object[]{pinSpec.getLocalizedName()}));
                 } else {
                     titleLabel.setText(messages.getString(TITLE_RETRY));
                 }
@@ -381,11 +358,11 @@ public class BKUGUI implements BKUGUIFacade {
                 okButton.setText(messages.getString(BUTTON_OK));
                 okButton.setActionCommand(okCommand);
                 okButton.addActionListener(okListener);
-                
+
                 JLabel cardPinLabel = new JLabel();
                 cardPinLabel.setFont(cardPinLabel.getFont().deriveFont(cardPinLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                String pinLabel = messages.getString(LABEL_PIN); 
-                cardPinLabel.setText(MessageFormat.format(pinLabel, new Object[] {pinSpec.getLocalizedName()}));
+                String pinLabel = messages.getString(LABEL_PIN);
+                cardPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
 
 //                JPasswordField cardPINField = new JPasswordField();
                 pinField = new JPasswordField();
@@ -410,9 +387,9 @@ public class BKUGUI implements BKUGUIFacade {
                     if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
                         pinSize += "-" + pinSpec.getMaxLength();
                     }
-                    infoLabel.setText(MessageFormat.format(pinsizePattern, new Object[] {pinSize}));
-                } else  {
-                    infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[] {String.valueOf(numRetries)}));
+                    infoLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                } else {
+                    infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
                     infoLabel.setForeground(ERROR_COLOR);
                 }
 
@@ -422,7 +399,7 @@ public class BKUGUI implements BKUGUIFacade {
 //                GroupLayout.ParallelGroup mainGroup = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
 //                mainGroup.addComponent(pinSizeLabel) //, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)
 //                  .addComponent(pinField, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE);
-                
+
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup() //                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   //                  .addComponent(hashDataLabel)
@@ -434,9 +411,7 @@ public class BKUGUI implements BKUGUIFacade {
                   .addContainerGap()));
 
                 mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addGroup(mainPanelLayout.createSequentialGroup()
-                  .addContainerGap() //                  .addComponent(hashDataLabel).addGap(14, 14, 14)
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addContainerGap() //                  .addComponent(hashDataLabel).addGap(14, 14, 14)
                   .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) //, false)
                   .addComponent(cardPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
                   .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
@@ -446,18 +421,13 @@ public class BKUGUI implements BKUGUIFacade {
                 buttonPanel.setLayout(buttonPanelLayout);
 
                 buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
-                  .addContainerGap(15, Short.MAX_VALUE)
-                  .addComponent(okButton)
-                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                  .addComponent(cancelButton).addContainerGap()));
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(okButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
                 buttonPanelLayout.setVerticalGroup(
                   buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(okButton).addComponent(cancelButton)));
-                
+
                 pinField.requestFocusInWindow();
                 contentPanel.validate();
-                
+
             }
         });
     }
@@ -471,7 +441,7 @@ public class BKUGUI implements BKUGUIFacade {
     public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
         showCardPINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand);
     }
-    
+
     @Override
     public void showSignaturePINDialog(PINSpec pinSpec, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
         showSignaturePINDialog(pinSpec, -1, signListener, signCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
@@ -482,15 +452,13 @@ public class BKUGUI implements BKUGUIFacade {
         showSignaturePINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
     }
 
-    
-    
     private void showSignaturePINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener signListener, final String signCommand, final ActionListener cancelListener, final String cancelCommand, final ActionListener hashdataListener, final String hashdataCommand) {
         SwingUtilities.invokeLater(new Runnable() {
 
             public void run() {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
-                
+
                 if (numRetries < 0) {
                     titleLabel.setText(messages.getString(TITLE_SIGN));
                 } else {
@@ -512,8 +480,8 @@ public class BKUGUI implements BKUGUIFacade {
 
                 JLabel signPinLabel = new JLabel();
                 signPinLabel.setFont(signPinLabel.getFont().deriveFont(signPinLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                String pinLabel = messages.getString(LABEL_PIN); 
-                signPinLabel.setText(MessageFormat.format(pinLabel, new Object[] {pinSpec.getLocalizedName()}));
+                String pinLabel = messages.getString(LABEL_PIN);
+                signPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
 
                 pinField = new JPasswordField();
                 pinField.setText("");
@@ -538,25 +506,26 @@ public class BKUGUI implements BKUGUIFacade {
                     if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
                         pinSize += "-" + pinSpec.getMaxLength();
                     }
-                    infoLabel.setText(MessageFormat.format(pinsizePattern, new Object[] {pinSize}));
+                    infoLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
                 } else {
-                    infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[] {String.valueOf(numRetries)}));
+                    infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
                     infoLabel.setForeground(ERROR_COLOR);
                 }
-                
+
                 JLabel hashDataLabel = new JLabel();
                 hashDataLabel.setFont(hashDataLabel.getFont().deriveFont(hashDataLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 hashDataLabel.setText(messages.getString(MESSAGE_HASHDATALINK));
                 hashDataLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
                 hashDataLabel.setForeground(HYPERLINK_COLOR);
                 hashDataLabel.addMouseListener(new MouseAdapter() {
+
                     @Override
-                    public void mouseClicked(MouseEvent me) {       
+                    public void mouseClicked(MouseEvent me) {
                         ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
                         hashdataListener.actionPerformed(e);
                     }
                 });
-                
+
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
@@ -580,10 +549,8 @@ public class BKUGUI implements BKUGUIFacade {
 
                 pinField.requestFocusInWindow();
                 contentPanel.validate();
-                
-            }
 
-//            private ParallelGroup createMainGroup(GroupLayout mainPanelLayout, JLabel hashDataLabel, JLabel signPinLabel, JLabel pinSizeLabel, JLabel errorLabel) {
+            }//            private ParallelGroup createMainGroup(GroupLayout mainPanelLayout, JLabel hashDataLabel, JLabel signPinLabel, JLabel pinSizeLabel, JLabel errorLabel) {
 //                ParallelGroup mainGroup = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
 //                mainGroup.addComponent(hashDataLabel);
 //                if (errorLabel != null) {
@@ -597,7 +564,6 @@ public class BKUGUI implements BKUGUIFacade {
 //                                                                                                .addComponent(pinField, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)));
 //                return mainGroup;
 //            }
-            
 //            private GroupLayout.SequentialGroup createVerticalMainGroup(GroupLayout mainPanelLayout, JLabel hashDataLabel, JLabel signPinLabel, JLabel pinSizeLabel, JLabel errorLabel) {
 //                GroupLayout.SequentialGroup mainGroup = mainPanelLayout.createSequentialGroup();
 //                mainGroup.addComponent(hashDataLabel)
@@ -637,8 +603,8 @@ public class BKUGUI implements BKUGUIFacade {
             public void run() {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
-                
-                titleLabel.setText(messages.getString(TITLE_ERROR)); 
+
+                titleLabel.setText(messages.getString(TITLE_ERROR));
 //                titleLabel.setForeground(defaultForground);
 
                 JLabel errorMsgLabel = new JLabel();
@@ -653,7 +619,7 @@ public class BKUGUI implements BKUGUIFacade {
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel));
-                
+
                 JButton okButton = new JButton();
                 okButton.setFont(okButton.getFont());
                 okButton.setText(messages.getString(BUTTON_OK));
@@ -664,15 +630,10 @@ public class BKUGUI implements BKUGUIFacade {
                 buttonPanel.setLayout(buttonPanelLayout);
 
                 buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
-                  .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                  .addComponent(okButton)
-                  .addContainerGap()));
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(okButton).addContainerGap()));
                 buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(okButton));
-                
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(okButton));
+
                 contentPanel.validate();
             }
         });
@@ -685,13 +646,13 @@ public class BKUGUI implements BKUGUIFacade {
             public void run() {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
-                
-                titleLabel.setText(messages.getString(TITLE_ERROR)); 
+
+                titleLabel.setText(messages.getString(TITLE_ERROR));
 //                titleLabel.setForeground(defaultForground);
 
                 JLabel errorMsgLabel = new JLabel();
                 errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                errorMsgLabel.setText("<html>" + errorMsg + "</html>"); 
+                errorMsgLabel.setText("<html>" + errorMsg + "</html>");
                 errorMsgLabel.setForeground(ERROR_COLOR);
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
@@ -701,69 +662,37 @@ public class BKUGUI implements BKUGUIFacade {
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel));
-                
+
                 contentPanel.validate();
             }
         });
     }
-    
+
     @Override
     public void showHashDataInputDialog(final List<HashDataInput> signedReferences, final ActionListener okListener, final String okCommand) {
         SwingUtilities.invokeLater(new Runnable() {
 
+            @Override
             public void run() {
-                
+
                 if (signedReferences != null && signedReferences.size() == 1) {
-                    FileOutputStream fos = null;
-                    try {
-                        HashDataInput signedRef = signedReferences.get(0);
-                        final String mimeType = signedRef.getMimeType();
-                        String dir = System.getProperty("user.home");
-                        JFileChooser fileDialog = new JFileChooser(dir);
-                        fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
-                        fileDialog.setMultiSelectionEnabled(false);
-                        fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVE));
-                        fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
-                        fileDialog.setFileHidingEnabled(true);
-                        MimeFilter mimeFilter = new MimeFilter(mimeType);
-                        fileDialog.setFileFilter(mimeFilter);
-                        String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + mimeFilter.getExtension();
-                        fileDialog.setSelectedFile(new File(dir, filename));
-                        switch (fileDialog.showSaveDialog(contentPane)) {
-                            case JFileChooser.APPROVE_OPTION:
-                                File f = fileDialog.getSelectedFile();
-//                                if (f.exists()) {
-//                                    //TODO
-//                                }
-                                    
-                                fos = new FileOutputStream(f);
-                                BufferedOutputStream bos = new BufferedOutputStream(fos);
-                                InputStream hdi = signedRef.getHashDataInput();
-                                int b;
-                                while ((b = hdi.read()) != -1) {
-                                    bos.write(b);
-                                }
-                                bos.flush();
-                                bos.close();
-                        }
-                    } catch (IOException ex) {
-                        showErrorDialog("Failed to write signed reference to file: " + ex.getMessage(), null, null);
-                        ex.printStackTrace();
-                    } finally {
-                        try {
-                            fos.close();
-                        } catch (IOException ex) {}
-                    }
+
+                    HashDataInput signedRef = signedReferences.get(0);
+//                    if ("text/plain".equals(signedRef.getMimeType())) {
+//                    } else {
+                        showSaveHashDataInputDialog(signedRef, okListener, okCommand);
+//                    }
+
                 } else {
                     mainPanel.removeAll();
                     buttonPanel.removeAll();
 
-                    titleLabel.setText(messages.getString(TITLE_ERROR)); 
-    //                titleLabel.setForeground(defaultForground);
+                    titleLabel.setText(messages.getString(TITLE_ERROR));
+                    //                titleLabel.setForeground(defaultForground);
 
                     JLabel errorMsgLabel = new JLabel();
                     errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                    errorMsgLabel.setText("<html>HashDataInputDialog not supported yet.</html>"); 
+                    errorMsgLabel.setText("<html>HashDataInputDialog not supported yet.</html>");
                     errorMsgLabel.setForeground(ERROR_COLOR);
 
                     GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
@@ -784,14 +713,9 @@ public class BKUGUI implements BKUGUIFacade {
                     buttonPanel.setLayout(buttonPanelLayout);
 
                     buttonPanelLayout.setHorizontalGroup(
-                      buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
-                      .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                      .addComponent(okButton)
-                      .addContainerGap()));
+                      buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(okButton).addContainerGap()));
                     buttonPanelLayout.setVerticalGroup(
-                      buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(okButton));
+                      buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(okButton));
 
                     contentPanel.validate();
                 }
@@ -799,13 +723,100 @@ public class BKUGUI implements BKUGUIFacade {
         });
     }
 
+    
+
+    private void showSaveHashDataInputDialog(HashDataInput signedRef, ActionListener okListener, String okCommand) {
+        String dir = System.getProperty("user.home");
+        JFileChooser fileDialog = new JFileChooser(dir);
+        fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
+        fileDialog.setMultiSelectionEnabled(false);
+        fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVE));
+        fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
+        fileDialog.setFileHidingEnabled(true);
+        MimeFilter mimeFilter = new MimeFilter(signedRef.getMimeType());
+        fileDialog.setFileFilter(mimeFilter);
+        String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + mimeFilter.getExtension();
+        fileDialog.setSelectedFile(new File(dir, filename));
+        switch (fileDialog.showSaveDialog(contentPane)) {
+            case JFileChooser.APPROVE_OPTION:
+                File f = fileDialog.getSelectedFile();
+                if (f.exists()) {
+//                                    log.debug("hashDataInput file exists, overwrite?");
+                    String ovrwrt = messages.getString(MESSAGE_OVERWRITE);
+                    int overwrite = JOptionPane.showConfirmDialog(contentPane, MessageFormat.format(ovrwrt, filename), messages.getString(WINDOWTITLE_OVERWRITE), JOptionPane.OK_CANCEL_OPTION);
+                    if (overwrite != JOptionPane.OK_OPTION) {
+//                                        log.debug("User canceled overwrite HashDataInput, returning to SignaturePin dialog");
+                        okListener.actionPerformed(new ActionEvent(fileDialog, ActionEvent.ACTION_PERFORMED, okCommand));
+                        return;
+                    }
+                }
+                if (log.isDebugEnabled()) {
+                    log.debug("Writing HashDataInput " + signedRef.getReferenceId() + " (" + signedRef.getMimeType() + ") to file " + f);
+                }
+                FileOutputStream fos = null;
+                try {
+                    fos = new FileOutputStream(f);
+                    BufferedOutputStream bos = new BufferedOutputStream(fos);
+                    InputStream hdi = signedRef.getHashDataInput();
+                    int b;
+                    while ((b = hdi.read()) != -1) {
+                        bos.write(b);
+                    }
+                    bos.flush();
+                    bos.close();
+                } catch (IOException ex) {
+                    log.error("Failed to write HashDataInput to file " + f + ": " + ex.getMessage());
+                    showErrorDialog("Failed to write signed reference to file: " + ex.getMessage(), null, null);
+                    ex.printStackTrace();
+                } finally {
+                    try {
+                        fos.close();
+                    } catch (IOException ex) {
+                    }
+                }
+        }
+        okListener.actionPerformed(new ActionEvent(fileDialog, ActionEvent.ACTION_PERFORMED, okCommand));
+    }
+
+    @Override
+    public void showWaitDialog(final String waitMessage) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            public void run() {
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+                titleLabel.setText(messages.getString(TITLE_WAIT));
+
+                JLabel waitMsgLabel = new JLabel();
+                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                if (waitMessage != null) {
+                    waitMsgLabel.setText("<html>" + waitMessage + "</html>");
+                } else {
+                    waitMsgLabel.setText("<html>" + messages.getString(MESSAGE_WAIT) + "</html>");
+                }
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel));
+
+                contentPanel.validate();
+            }
+        });
+    }
+
     @Override
     public char[] getPin() {
-        if (pinField != null) 
+        if (pinField != null) {
             return pinField.getPassword();
+        }
         return null;
     }
-    
+
     class PINDocument extends PlainDocument {
 
         private PINSpec pinSpec;
@@ -827,7 +838,7 @@ public class BKUGUI implements BKUGUIFacade {
             if (pinSpec.getMaxLength() >= (getLength() + str.length())) {
                 boolean matches = true;
                 for (int i = 0; i < str.length(); i++) {
-                    Matcher m = pinPattern.matcher(str.substring(i, i+1));
+                    Matcher m = pinPattern.matcher(str.substring(i, i + 1));
                     if (!m.matches()) {
                         matches = false;
                     }
@@ -845,7 +856,7 @@ public class BKUGUI implements BKUGUIFacade {
             enterButton.setEnabled(getLength() >= pinSpec.getMinLength());
         }
     }
-    
+
     class MimeFilter extends FileFilter {
 
         protected String mimeType;
@@ -853,20 +864,23 @@ public class BKUGUI implements BKUGUIFacade {
         public MimeFilter(String mimeType) {
             this.mimeType = mimeType;
         }
-        
+
         @Override
         public boolean accept(File f) {
 
             if (f.isDirectory()) {
                 return true;
-            } else if ("text/xml".equals(mimeType)) {
-                return "xml".equals(getExtension(f));
+            }
+
+            String ext = getExtension(f);
+            if ("text/xml".equals(mimeType)) {
+                return "xml".equals(ext);
             } else if ("text/plain".equals(mimeType)) {
-                return "txt".equals(getExtension(f));
+                return "txt".equals(ext);
             } else if ("application/pdf".equals(mimeType)) {
-                return "pdf".equals(getExtension(f));
+                return "pdf".equals(ext);
             } else {
-                return "bin".equals(getExtension(f));
+                return "bin".equals(ext);
             }
         }
 
@@ -875,8 +889,8 @@ public class BKUGUI implements BKUGUIFacade {
             String s = f.getName();
             int i = s.lastIndexOf('.');
 
-            if (i > 0 &&  i < s.length() - 1) {
-                ext = s.substring(i+1).toLowerCase();
+            if (i > 0 && i < s.length() - 1) {
+                ext = s.substring(i + 1).toLowerCase();
             }
             return ext;
         }
@@ -893,7 +907,7 @@ public class BKUGUI implements BKUGUIFacade {
                 return messages.getString(MIMETYPE_DESC_BIN);
             }
         }
-        
+
         public String getExtension() {
             if ("text/xml".equals(mimeType)) {
                 return ".xml";
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 3766e905..f8b80556 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -14,23 +14,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package at.gv.egiz.bku.gui;
 
-//import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.smcc.PINSpec;
 import java.awt.Container;
 import java.awt.event.ActionListener;
 import java.util.List;
-import javax.swing.JPasswordField;
 
-/**
- *
- * @author clemens
- */
 public interface BKUGUIFacade {
     
     public void init(Container contentPane, String localeString);
@@ -42,7 +33,10 @@ public interface BKUGUIFacade {
      * @param loginListener
      */
     public void showLoginDialog(ActionListener loginListener, String actionCommand);
-    
+
+   /** optional wait message */
+    public void showWaitDialog(String waitMessage);
+
     public void showInsertCardDialog(ActionListener cancelListener, String actionCommand);
     
     public void showCardNotSupportedDialog(ActionListener cancelListener, String actionCommand);
@@ -62,5 +56,4 @@ public interface BKUGUIFacade {
     public void showErrorDialog(String errorMsg, ActionListener okListener, String actionCommand);
     
     public void showErrorDialog(String errorMsg);
-    
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataInput.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataInput.java
deleted file mode 100644
index d916e81c..00000000
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataInput.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* 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.
-*/
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package at.gv.egiz.bku.gui;
-
-import java.io.InputStream;
-
-/**
- *
- * @author clemens
- */
-public interface HashDataInput {
-    
-    public InputStream getHashDataInput();
-    
-    public String getMimeType();
-    
-}
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 62c5a670..21a6bd1b 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
 title.welcome=<html>Willkommen</html>
 title.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken</html>
 title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
@@ -22,16 +20,22 @@ title.cardpin=<html>{0} eingeben</html>
 title.sign=<html>Signatur erstellen</html>
 title.error=<html>Ein Fehler trat auf</html>
 title.retry=<html>Falscher PIN</html>
+title.wait=<html>Bitte warten</html>
+title.hashdata=<html>Signaturdaten</html>
 windowtitle.save=Signaturdaten speichern
+windowtitle.overwrite=Datei \u00FCberschreiben?
 message.wait=<html>Bitte warten...</html>
 message.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken.</html>
 message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen...</a></html>
+message.hashdata=<html>Referenz Id: {0}</html>
 message.retries=<html>Noch {0} Versuche</html>
+message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
 label.pin=<html>{0}:</html>
 label.pinsize=<html>({0} stellig)</html>
 button.ok=OK
 button.cancel=Abbrechen
 button.sign=Signieren
+button.save=Speichern...
 mimetype.desc.xml=XML-Dateien (*.xml)
 mimetype.desc.txt=Textdateien (*.txt)
 mimetype.desc.pdf=Adobe PDF-Dateien (*.pdf)
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 50771216..a251be55 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
@@ -21,10 +21,9 @@
 package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.stal.HashDataInput;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Collections;
@@ -89,6 +88,11 @@ public class BKUGUIWorker implements Runnable {
                         public String getMimeType() {
                             return "text/xml";
                         }
+
+                        @Override
+                        public String getReferenceId() {
+                            return "ref123";
+                        }
                     };
                     gui.showHashDataInputDialog(Collections.singletonList(signedRef), returnListener, "return");
                 }
-- 
cgit v1.2.3


From d3698ed2a4f129e5af970f072bc79bb8226d7765 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 5 Sep 2008 15:41:19 +0000
Subject: Text HashDataInput

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@24 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 111 ++++++++++++++++++++-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |  34 ++++---
 .../stal/service/impl/STALRequestBrokerImpl.java   |   2 +-
 .../gv/egiz/stal/service/impl/STALServiceImpl.java |   2 +-
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   |   2 +-
 5 files changed, 128 insertions(+), 23 deletions(-)

(limited to 'BKUCommonGUI')

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 0ad09c70..5175b45f 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
@@ -29,15 +29,22 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.text.MessageFormat;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.swing.GroupLayout;
@@ -48,6 +55,8 @@ import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
 import javax.swing.LayoutStyle;
 import javax.swing.SwingUtilities;
 import javax.swing.filechooser.FileFilter;
@@ -677,11 +686,44 @@ public class BKUGUI implements BKUGUIFacade {
 
                 if (signedReferences != null && signedReferences.size() == 1) {
 
-                    HashDataInput signedRef = signedReferences.get(0);
-//                    if ("text/plain".equals(signedRef.getMimeType())) {
-//                    } else {
+                    final HashDataInput signedRef = signedReferences.get(0);
+                    if ("text/plain".equals(signedRef.getMimeType())) {
+                        //TODO get encoding from mimetype
+                        //read directly to byte[] since hashDataIS is backed by byte[] ?
+                        ByteArrayOutputStream baos = null;
+                        try {
+                            String refId = signedRef.getReferenceId();
+                            InputStream hashDataIS = signedRef.getHashDataInput();
+                            if (hashDataIS == null) {
+                                showErrorDialog("Failed to obtain HashDataInput for reference " + refId, okListener, okCommand);
+                            } else {
+                                baos = new ByteArrayOutputStream(hashDataIS.available());
+                                int c;
+                                while ((c = hashDataIS.read()) != -1) {
+                                    baos.write(c);
+                                }
+                                String text = baos.toString("UTF-8");
+
+                                ActionListener al = new ActionListener() {
+
+                                    @Override
+                                    public void actionPerformed(ActionEvent e) {
+                                        showSaveHashDataInputDialog(signedRef, okListener, okCommand);
+                                    }
+                                };
+                                showPlainTextHashDataInputDialog(text, refId, okListener, okCommand, al, "save");
+                            }
+                        } catch (IOException ex) {
+                            showErrorDialog("Failed to read HashDataInput for reference " + signedRef.getReferenceId() + ": " + ex.getMessage(), okListener, okCommand);
+                        } finally {
+                            try {
+                                baos.close();
+                            } catch (IOException ex) {
+                            }
+                        }
+                    } else {
                         showSaveHashDataInputDialog(signedRef, okListener, okCommand);
-//                    }
+                    }
 
                 } else {
                     mainPanel.removeAll();
@@ -723,7 +765,66 @@ public class BKUGUI implements BKUGUIFacade {
         });
     }
 
-    
+    private void showPlainTextHashDataInputDialog(String text, String refId, ActionListener cancelListener, String cancelCommand, ActionListener saveListener, String saveCommand) {
+        mainPanel.removeAll();
+        buttonPanel.removeAll();
+
+        titleLabel.setText(messages.getString(TITLE_HASHDATA));
+
+        JLabel refIdLabel = new JLabel();
+        refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+        String refIdLabelPattern = messages.getString(MESSAGE_HASHDATA);
+        refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[] {refId} ));
+
+        JScrollPane hashDataScrollPane = new JScrollPane();
+        JTextArea hashDataTextArea = new JTextArea(text);
+        hashDataTextArea.setEditable(false);
+        hashDataTextArea.setColumns(20);
+        hashDataTextArea.setRows(3);
+        hashDataScrollPane.setViewportView(hashDataTextArea);
+
+        
+        JButton cancelButton = new JButton();
+        cancelButton.setFont(cancelButton.getFont());
+        cancelButton.setText(messages.getString(BUTTON_CANCEL));
+        cancelButton.setActionCommand(cancelCommand);
+        cancelButton.addActionListener(cancelListener);
+
+        JButton saveButton = new JButton();
+        saveButton.setFont(saveButton.getFont());
+        saveButton.setText(messages.getString(BUTTON_SAVE));
+        saveButton.setActionCommand(saveCommand);
+        saveButton.addActionListener(saveListener);
+
+        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+        mainPanel.setLayout(mainPanelLayout);
+
+        mainPanelLayout.setHorizontalGroup(
+          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+          .addGroup(mainPanelLayout.createSequentialGroup()
+          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+          .addComponent(refIdLabel)
+          .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE))
+          .addContainerGap()));
+          
+        mainPanelLayout.setVerticalGroup(
+          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+          .addGroup(mainPanelLayout.createSequentialGroup()
+          .addComponent(refIdLabel)
+          .addGap(refIdLabel.getFont().getSize())
+          .addComponent(hashDataScrollPane)
+          .addGap(refIdLabel.getFont().getSize())));
+                
+        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+        buttonPanel.setLayout(buttonPanelLayout);
+
+        buttonPanelLayout.setHorizontalGroup(
+          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(saveButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
+        buttonPanelLayout.setVerticalGroup(
+          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(cancelButton)));
+
+        contentPanel.validate();
+    }
 
     private void showSaveHashDataInputDialog(HashDataInput signedRef, ActionListener okListener, String okCommand) {
         String dir = System.getProperty("user.home");
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 a251be55..e2f478c9 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
@@ -86,7 +86,7 @@ public class BKUGUIWorker implements Runnable {
 
                         @Override
                         public String getMimeType() {
-                            return "text/xml";
+                            return "text/plain";
                         }
 
                         @Override
@@ -104,13 +104,13 @@ public class BKUGUIWorker implements Runnable {
 //
 //        Thread.sleep(2000);
         
-            gui.showInsertCardDialog(cancelListener, "cancel");
-            
-            Thread.sleep(2000);
-            
-            gui.showCardNotSupportedDialog(cancelListener, "cancel");
-            
-            Thread.sleep(2000);
+//            gui.showInsertCardDialog(cancelListener, "cancel");
+//            
+//            Thread.sleep(2000);
+//            
+//            gui.showCardNotSupportedDialog(cancelListener, "cancel");
+//            
+//            Thread.sleep(2000);
 
 //            PINSpec cardPinSpec = new PINSpec(4, 4, "[0-9]", "Karten-PIN");
 //            
@@ -119,19 +119,23 @@ public class BKUGUIWorker implements Runnable {
 //            Thread.sleep(2000);
 //
             
-//            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
-//
-//            Thread.sleep(2000);
-//            
-//            gui.showSignaturePINRetryDialog(signPinSpec, 2, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
-//
-//            Thread.sleep(2000);
+            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+
+            Thread.sleep(2000);
+            
+            gui.showSignaturePINRetryDialog(signPinSpec, 2, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+
+            Thread.sleep(2000);
 ////            
 //            gui.showErrorDialog("Testfehler occured", null, null);
 //            
 //            Thread.sleep(2000);
 //            
 //            gui.showErrorDialog("Testfehler occured"); 
+            
+            
+//            gui.showTextPlainHashDataInput("hallo,\n welt!", "12345", null, "cancel", null, "save");
+//            Thread.sleep(2000);
 
         } catch (InterruptedException ex) {
             ex.printStackTrace();
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
index 9601d39c..d206913d 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
@@ -95,7 +95,7 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
         currentHashDataInput = null;
         for (STALRequest request : requests) {
             if (request instanceof SignRequest) {
-                log.trace("Received SignRequest, keep HashDataInput callback.");
+                log.trace("Received SignRequest, keep HashDataInput.");
                 currentHashDataInput = ((SignRequest) request).getHashDataInput();
                 break;
             } else if (request instanceof QuitRequest) {
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
index f0df22ea..f4cdc7d2 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
@@ -1,4 +1,4 @@
-/*
+    /*
  * Copyright 2008 Federal Chancellery Austria and
  * Graz University of Technology
  *
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index 2fe77c5d..1f84300a 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -146,7 +146,7 @@ public class SignRequestHandler extends AbstractRequestHandler implements
                 if (signedInfo != null) {
                     try {
                         gui.showWaitDialog(null);
-                        if (hashDataInputs == null) {
+                        if (hashDataInputs == null || hashDataInputs.size() == 0) {
                             hashDataInputs = getHashDataInputs(signedInfo.getReference());
                         }
                         gui.showHashDataInputDialog(hashDataInputs, this, "ok");
-- 
cgit v1.2.3


From 84e214e4d708f13c8f09c68273541e535c560296 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 10 Sep 2008 16:54:04 +0000
Subject: gui final 0.1b

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@30 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 620 ++++++++++++++++-----
 .../at/gv/egiz/bku/gui/Messages.properties         |  10 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUITest.java   |  10 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |  90 ++-
 .../src/test/resources/commons-logging.properties  |   1 +
 BKUCommonGUI/src/test/resources/log4j.properties   |  19 +
 6 files changed, 579 insertions(+), 171 deletions(-)
 create mode 100644 BKUCommonGUI/src/test/resources/commons-logging.properties
 create mode 100644 BKUCommonGUI/src/test/resources/log4j.properties

(limited to 'BKUCommonGUI')

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 5175b45f..044e6927 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
@@ -23,43 +23,47 @@ package at.gv.egiz.bku.gui;
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.stal.HashDataInput;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Container;
 import java.awt.Cursor;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
 import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.Vector;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.swing.GroupLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.JScrollPane;
+import javax.swing.JTable;
 import javax.swing.JTextArea;
 import javax.swing.LayoutStyle;
 import javax.swing.SwingUtilities;
+import javax.swing.border.TitledBorder;
 import javax.swing.filechooser.FileFilter;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableModel;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.PlainDocument;
@@ -75,9 +79,9 @@ public class BKUGUI implements BKUGUIFacade {
     private static final Log log = LogFactory.getLog(BKUGUI.class);
     public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
     public static final String LOGO_RESOURCE = "/images/logo.png";
-    public static final int MAIN_PANEL_WIDTH = 100;
+//    public static final int MAIN_PANEL_WIDTH = 100;
 //    public static final int MAIN_PANEL_HEIGHT = 20;
-    public static final int PREF_SIZE_PINFIELD = 118;
+//    public static final int PREF_SIZE_PINFIELD = 118;
     public static final Color ERROR_COLOR = Color.RED;
     public static final Color HYPERLINK_COLOR = Color.BLUE;
     private static final String TITLE_WELCOME = "title.welcome";
@@ -95,18 +99,21 @@ public class BKUGUI implements BKUGUIFacade {
     private static final String MESSAGE_INSERTCARD = "message.insertcard";
     private static final String MESSAGE_HASHDATALINK = "message.hashdatalink";
     private static final String MESSAGE_HASHDATA = "message.hashdata";
+    private static final String MESSAGE_HASHDATALIST = "message.hashdatalist";
     private static final String MESSAGE_RETRIES = "message.retries";
     private static final String MESSAGE_OVERWRITE = "message.overwrite";
     private static final String LABEL_PIN = "label.pin";
     private static final String LABEL_PINSIZE = "label.pinsize";
-//    private static final String LABEL_CARDPINSIZE="label.cardpinsize";
-//    private static final String LABEL_SIGNPIN="label.signpin";
-//    private static final String LABEL_SIGNPINSIZE="label.signpinsize";
+    private static final String ERROR_HASHDATA = "error.hashdata";
+    
     private static final String BUTTON_OK = "button.ok";
     private static final String BUTTON_CANCEL = "button.cancel";
+    private static final String BUTTON_BACK = "button.back";
     private static final String BUTTON_SIGN = "button.sign";
     private static final String BUTTON_SAVE = "button.save";
     private static final String MIMETYPE_DESC_XML = "mimetype.desc.xml";
+    private static final String MIMETYPE_DESC_HTML = "mimetype.desc.html";
+    private static final String MIMETYPE_DESC_XHTML = "mimetype.desc.xhtml";
     private static final String MIMETYPE_DESC_TXT = "mimetype.desc.txt";
     private static final String MIMETYPE_DESC_PDF = "mimetype.desc.pdf";
     private static final String MIMETYPE_DESC_BIN = "mimetype.desc.bin";
@@ -125,6 +132,15 @@ public class BKUGUI implements BKUGUIFacade {
     /** remember the pinfield to return to worker */
     protected JPasswordField pinField;
 
+    protected JButton okButton;
+    protected JButton cancelButton;
+    protected JButton signButton;
+    protected JButton saveButton;
+    protected JButton backButton;
+    protected int buttonSize;
+    
+    private static final int CHECKBOX_WIDTH = new JCheckBox().getPreferredSize().width;
+    
     /**
      * @param contentPane
      * @param localeString may be null
@@ -168,9 +184,19 @@ public class BKUGUI implements BKUGUIFacade {
         GroupLayout iconPanelLayout = new GroupLayout(iconPanel);
         iconPanel.setLayout(iconPanelLayout);
         iconPanelLayout.setHorizontalGroup(
-          iconPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(iconPanelLayout.createSequentialGroup().addContainerGap().addComponent(iconLabel).addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
+          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.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(iconPanelLayout.createSequentialGroup().addContainerGap().addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, 105, GroupLayout.PREFERRED_SIZE).addContainerGap(41, Short.MAX_VALUE)));
+          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 initContentPanel() {
@@ -190,23 +216,60 @@ public class BKUGUI implements BKUGUIFacade {
           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);        
+        
+        if (okButton.getPreferredSize().width > buttonSize)
+            buttonSize = okButton.getPreferredSize().width;
+        if (cancelButton.getPreferredSize().width > buttonSize)
+            buttonSize = cancelButton.getPreferredSize().width;
+        if (signButton.getPreferredSize().width > buttonSize)
+            buttonSize = signButton.getPreferredSize().width;
+        if (backButton.getPreferredSize().width > buttonSize)
+            buttonSize = backButton.getPreferredSize().width;
+        if (saveButton.getPreferredSize().width > buttonSize)
+            buttonSize = saveButton.getPreferredSize().width;
+
+        
         GroupLayout headerPanelLayout = new GroupLayout(headerPanel);
         headerPanel.setLayout(headerPanelLayout);
 
         headerPanelLayout.setHorizontalGroup(
-          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(titleLabel, GroupLayout.DEFAULT_SIZE, 225, Short.MAX_VALUE));
+          headerPanelLayout.createSequentialGroup()
+//          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
         headerPanelLayout.setVerticalGroup(
-          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(titleLabel));
+          headerPanelLayout.createSequentialGroup()
+//          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+            .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).addGroup(contentPanelLayout.createSequentialGroup().addContainerGap().addGroup(contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(headerPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(mainPanel, GroupLayout.DEFAULT_SIZE, MAIN_PANEL_WIDTH, Short.MAX_VALUE).addComponent(buttonPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))));
+          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.setVerticalGroup(
-          contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(contentPanelLayout.createSequentialGroup().addContainerGap().addComponent(headerPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(mainPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE) //79, GroupLayout.PREFERRED_SIZE)
-          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(buttonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE).addContainerGap()));
+          contentPanelLayout.createSequentialGroup()
+            .addContainerGap()
+            .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)
+            .addContainerGap()); //);
     }
 
     @Override
@@ -229,9 +292,13 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(waitMsgLabel)
+                  .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
                 mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel));
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(waitMsgLabel));
 
                 contentPanel.validate();
             }
@@ -257,9 +324,14 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(waitMsgLabel)
+                  .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
                 mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel));
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(waitMsgLabel));
 
                 contentPanel.validate();
 
@@ -276,21 +348,25 @@ public class BKUGUI implements BKUGUIFacade {
                 buttonPanel.removeAll();
 
                 titleLabel.setText(messages.getString(TITLE_INSERTCARD));
-//                titleLabel.setForeground(defaultForground);
 
-                JButton cancelButton = new JButton();
-                cancelButton.setFont(cancelButton.getFont());
-                cancelButton.setText(messages.getString(BUTTON_CANCEL));
                 cancelButton.addActionListener(cancelListener);
                 cancelButton.setActionCommand(cancelCommand);
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
+//                buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
                 buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(cancelButton).addContainerGap()));
+                  buttonPanelLayout.createSequentialGroup()
+//                  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()); //);
                 buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(cancelButton));
+                  buttonPanelLayout.createSequentialGroup()
+//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(cancelButton));
 
                 contentPanel.validate();
             }
@@ -308,12 +384,6 @@ public class BKUGUI implements BKUGUIFacade {
                 titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
 //                titleLabel.setForeground(defaultForground);
 
-                JButton cancelButton = new JButton();
-                cancelButton.setFont(cancelButton.getFont());
-                cancelButton.setText(messages.getString(BUTTON_CANCEL));
-                cancelButton.addActionListener(cancelListener);
-                cancelButton.setActionCommand(cancelCommand);
-
                 JLabel errorMsgLabel = new JLabel();
                 errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 errorMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD));
@@ -322,19 +392,33 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(errorMsgLabel)); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
                 mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel));
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(errorMsgLabel));
 
+                cancelButton.addActionListener(cancelListener);
+                cancelButton.setActionCommand(cancelCommand);
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
+//                buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
                 buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(cancelButton).addContainerGap()));
+                  buttonPanelLayout.createSequentialGroup()
+//                  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()); //);
                 buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(cancelButton));
-
+                  buttonPanelLayout.createSequentialGroup()
+//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(cancelButton));
+                
                 contentPanel.validate();
             }
         });
@@ -355,16 +439,10 @@ public class BKUGUI implements BKUGUIFacade {
                     titleLabel.setText(messages.getString(TITLE_RETRY));
                 }
 
-                JButton cancelButton = new JButton();
-                cancelButton.setFont(cancelButton.getFont());
-                cancelButton.setText(messages.getString(BUTTON_CANCEL));
                 cancelButton.setActionCommand(cancelCommand);
                 cancelButton.addActionListener(cancelListener);
 
-                JButton okButton = new JButton();
                 okButton.setEnabled(false);
-                okButton.setFont(okButton.getFont());
-                okButton.setText(messages.getString(BUTTON_OK));
                 okButton.setActionCommand(okCommand);
                 okButton.addActionListener(okListener);
 
@@ -402,37 +480,77 @@ public class BKUGUI implements BKUGUIFacade {
                     infoLabel.setForeground(ERROR_COLOR);
                 }
 
+//                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+//                mainPanel.setLayout(mainPanelLayout);
+//
+//                mainPanelLayout.setHorizontalGroup(
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//                  .addGroup(mainPanelLayout.createSequentialGroup() //                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//                  //                  .addComponent(hashDataLabel)
+//                  //                  .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
+//                  .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) //RELATED)
+//                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) //TRAILING)
+//                  .addComponent(infoLabel) //, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)
+//                  .addComponent(pinField, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)) //))
+//                  .addContainerGap()));
+//
+//                mainPanelLayout.setVerticalGroup(
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addContainerGap() //                  .addComponent(hashDataLabel).addGap(14, 14, 14)
+//                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) //, false)
+//                  .addComponent(cardPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
+//                  .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
+//                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(infoLabel).addGap(cardPinLabel.getFont().getSize()))); //10, 10, 10)));
+//
+//                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+//                buttonPanel.setLayout(buttonPanelLayout);
+//
+//                buttonPanelLayout.setHorizontalGroup(
+//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(okButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
+//                buttonPanelLayout.setVerticalGroup(
+//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(okButton).addComponent(cancelButton)));
+
+                
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
-//                GroupLayout.ParallelGroup mainGroup = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
-//                mainGroup.addComponent(pinSizeLabel) //, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)
-//                  .addComponent(pinField, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE);
-
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup() //                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  //                  .addComponent(hashDataLabel)
-                  //                  .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
-                  .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) //RELATED)
-                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) //TRAILING)
-                  .addComponent(infoLabel) //, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)
-                  .addComponent(pinField, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)) //))
-                  .addContainerGap()));
+                  mainPanelLayout.createSequentialGroup()
+//                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//                            .addComponent(hashDataLabel)
+//                        .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
+                        .addComponent(cardPinLabel, 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.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addContainerGap() //                  .addComponent(hashDataLabel).addGap(14, 14, 14)
-                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) //, false)
-                  .addComponent(cardPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
-                  .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
-                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(infoLabel).addGap(cardPinLabel.getFont().getSize()))); //10, 10, 10)));
+                  mainPanelLayout.createSequentialGroup()
+//                        .addComponent(hashDataLabel)
+//                        .addGap(hashDataLabel.getFont().getSize())
+                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(cardPinLabel)
+                            .addComponent(pinField))
+                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(infoLabel));
+//                        .addGap(signPinLabel.getFont().getSize())); 
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
+//                buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
                 buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(okButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
+                  buttonPanelLayout.createSequentialGroup()
+                        .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());//);
                 buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(okButton).addComponent(cancelButton)));
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
+                        .addComponent(okButton)
+                        .addComponent(cancelButton)); 
 
                 pinField.requestFocusInWindow();
                 contentPanel.validate();
@@ -474,16 +592,10 @@ public class BKUGUI implements BKUGUIFacade {
                     titleLabel.setText(messages.getString(TITLE_RETRY));
                 }
 
-                JButton cancelButton = new JButton();
-                cancelButton.setFont(cancelButton.getFont());
-                cancelButton.setText(messages.getString(BUTTON_CANCEL));
                 cancelButton.setActionCommand(cancelCommand);
                 cancelButton.addActionListener(cancelListener);
 
-                JButton signButton = new JButton();
                 signButton.setEnabled(false);
-                signButton.setFont(signButton.getFont());
-                signButton.setText(messages.getString(BUTTON_SIGN));
                 signButton.setActionCommand(signCommand);
                 signButton.addActionListener(signListener);
 
@@ -539,22 +651,43 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(hashDataLabel).addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup().addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING).addComponent(infoLabel) //, GroupLayout.DEFAULT_SIZE, 118, Short.MAX_VALUE)
-                  .addComponent(pinField, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)))).addContainerGap()));
+                  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.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addComponent(hashDataLabel).addGap(hashDataLabel.getFont().getSize()) //14, 14, 14)
-                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE, false).addComponent(signPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
-                  .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
-                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(infoLabel).addGap(signPinLabel.getFont().getSize()))); //10, 10, 10)));
+                  mainPanelLayout.createSequentialGroup()
+                        .addComponent(hashDataLabel)
+                        .addGap(hashDataLabel.getFont().getSize())
+                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(signPinLabel)
+                            .addComponent(pinField))
+                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(infoLabel));
+//                        .addGap(signPinLabel.getFont().getSize())); 
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
+//                buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
                 buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(signButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
+                  buttonPanelLayout.createSequentialGroup()
+                        .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());//);
                 buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(signButton).addComponent(cancelButton)));
+                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
+                        .addComponent(signButton)
+                        .addComponent(cancelButton)); 
 
                 pinField.requestFocusInWindow();
                 contentPanel.validate();
@@ -625,23 +758,30 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(errorMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
                 mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel));
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(errorMsgLabel));
 
-                JButton okButton = new JButton();
-                okButton.setFont(okButton.getFont());
-                okButton.setText(messages.getString(BUTTON_OK));
                 okButton.setActionCommand(okCommand);
                 okButton.addActionListener(okListener);
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
+//                buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
                 buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(okButton).addContainerGap()));
+                  buttonPanelLayout.createSequentialGroup()
+//                  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()); //);
                 buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(okButton));
+                  buttonPanelLayout.createSequentialGroup()
+//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(okButton));
 
                 contentPanel.validate();
             }
@@ -668,9 +808,13 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(errorMsgLabel)
+                  .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
                 mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel));
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(errorMsgLabel));
 
                 contentPanel.validate();
             }
@@ -725,41 +869,26 @@ public class BKUGUI implements BKUGUIFacade {
                         showSaveHashDataInputDialog(signedRef, okListener, okCommand);
                     }
 
-                } else {
-                    mainPanel.removeAll();
-                    buttonPanel.removeAll();
-
-                    titleLabel.setText(messages.getString(TITLE_ERROR));
-                    //                titleLabel.setForeground(defaultForground);
+                } else if (signedReferences != null && signedReferences.size() > 1) {
+                    final HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
 
-                    JLabel errorMsgLabel = new JLabel();
-                    errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                    errorMsgLabel.setText("<html>HashDataInputDialog not supported yet.</html>");
-                    errorMsgLabel.setForeground(ERROR_COLOR);
+                    ActionListener al = new ActionListener() {
 
-                    GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                    mainPanel.setLayout(mainPanelLayout);
-
-                    mainPanelLayout.setHorizontalGroup(
-                      mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
-                    mainPanelLayout.setVerticalGroup(
-                      mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(errorMsgLabel));
-
-                    JButton okButton = new JButton();
-                    okButton.setFont(okButton.getFont());
-                    okButton.setText(messages.getString(BUTTON_OK));
-                    okButton.setActionCommand(okCommand);
-                    okButton.addActionListener(okListener);
-
-                    GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                    buttonPanel.setLayout(buttonPanelLayout);
-
-                    buttonPanelLayout.setHorizontalGroup(
-                      buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(okButton).addContainerGap()));
-                    buttonPanelLayout.setVerticalGroup(
-                      buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(okButton));
-
-                    contentPanel.validate();
+                        @Override
+                        public void actionPerformed(ActionEvent e) {
+                            List<String> selection = tableModel.getSelectedReferenceIds();
+                            StringBuilder sb = new StringBuilder("<html>Not implemented yet. \n");
+                            for (String string : selection) {
+                                sb.append(string);
+                                sb.append('\n');
+                            }
+                            showErrorDialog(sb.toString(), okListener, okCommand);
+//                            showSaveHashDataInputDialog(signedRef, okListener, okCommand);
+                        }
+                    };
+                    showMultipleHashDataInputDialog(tableModel, okListener, okCommand, al, "save");
+                } else {
+                    showErrorDialog(messages.getString(ERROR_HASHDATA), okListener, okCommand);
                 }
             }
         });
@@ -774,54 +903,193 @@ public class BKUGUI implements BKUGUIFacade {
         JLabel refIdLabel = new JLabel();
         refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
         String refIdLabelPattern = messages.getString(MESSAGE_HASHDATA);
-        refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[] {refId} ));
+        refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{refId}));
 
         JScrollPane hashDataScrollPane = new JScrollPane();
         JTextArea hashDataTextArea = new JTextArea(text);
         hashDataTextArea.setEditable(false);
-        hashDataTextArea.setColumns(20);
-        hashDataTextArea.setRows(3);
+        hashDataTextArea.setColumns(1);
+        hashDataTextArea.setRows(1);
         hashDataScrollPane.setViewportView(hashDataTextArea);
 
+        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+        mainPanel.setLayout(mainPanelLayout);
+
+        mainPanelLayout.setHorizontalGroup(
+          mainPanelLayout.createSequentialGroup()
+                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(refIdLabel)
+                    .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addContainerGap());
+
+        mainPanelLayout.setVerticalGroup(
+          mainPanelLayout.createSequentialGroup()
+                .addComponent(refIdLabel)
+                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(hashDataScrollPane, 0, GroupLayout.PREFERRED_SIZE, hashDataTextArea.getPreferredSize().height+3));
+
         
-        JButton cancelButton = new JButton();
-        cancelButton.setFont(cancelButton.getFont());
-        cancelButton.setText(messages.getString(BUTTON_CANCEL));
-        cancelButton.setActionCommand(cancelCommand);
-        cancelButton.addActionListener(cancelListener);
+        
+//        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+//        mainPanel.setLayout(mainPanelLayout);
+//
+//        mainPanelLayout.setHorizontalGroup(
+//          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(refIdLabel).addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)).addContainerGap()));
+//
+//        mainPanelLayout.setVerticalGroup(
+//          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addComponent(refIdLabel).addGap(refIdLabel.getFont().getSize()).addComponent(hashDataScrollPane).addGap(refIdLabel.getFont().getSize())));
+
+        backButton.setActionCommand(cancelCommand);
+        backButton.addActionListener(cancelListener);
 
-        JButton saveButton = new JButton();
-        saveButton.setFont(saveButton.getFont());
-        saveButton.setText(messages.getString(BUTTON_SAVE));
         saveButton.setActionCommand(saveCommand);
         saveButton.addActionListener(saveListener);
+        
+        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+        buttonPanel.setLayout(buttonPanelLayout);
+
+//        buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
+        buttonPanelLayout.setHorizontalGroup(
+          buttonPanelLayout.createSequentialGroup()
+                .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());
+        buttonPanelLayout.setVerticalGroup(
+          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
+                .addComponent(saveButton)
+                .addComponent(backButton)); 
+
+
+//        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+//        buttonPanel.setLayout(buttonPanelLayout);
+//
+//        buttonPanelLayout.setHorizontalGroup(
+//          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(saveButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
+//        buttonPanelLayout.setVerticalGroup(
+//          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(cancelButton)));
+
+        contentPanel.validate();
+    }
+
+    private void showMultipleHashDataInputDialog(final TableModel signedReferences, final ActionListener cancelListener, final String cancelCommand, ActionListener saveListener, String saveCommand) {
+        mainPanel.removeAll();
+        buttonPanel.removeAll();
+
+        titleLabel.setText(messages.getString(TITLE_HASHDATA));
 
+        JLabel refIdLabel = new JLabel();
+        refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+        String refIdLabelPattern = messages.getString(MESSAGE_HASHDATALIST);
+        refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{signedReferences.getRowCount()}));
+
+        JTable hashDataTable = new JTable();
+        hashDataTable.setModel(signedReferences);
+        hashDataTable.setTableHeader(null);
+//        hashDataTable.setShowVerticalLines(false);
+//        hashDataTable.setRowSelectionAllowed(false);
+        TableColumn selectCol = hashDataTable.getColumnModel().getColumn(1);
+        selectCol.setMinWidth(CHECKBOX_WIDTH);
+        selectCol.setMaxWidth(CHECKBOX_WIDTH);
+        
+        
+        hashDataTable.setPreferredScrollableViewportSize(mainPanel.getPreferredSize());
+        
+        JScrollPane hashDataScrollPane = new JScrollPane(hashDataTable);
+        
         GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
         mainPanel.setLayout(mainPanelLayout);
 
         mainPanelLayout.setHorizontalGroup(
-          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-          .addGroup(mainPanelLayout.createSequentialGroup()
-          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-          .addComponent(refIdLabel)
-          .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE))
-          .addContainerGap()));
-          
+          mainPanelLayout.createSequentialGroup()
+                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(refIdLabel)
+                    .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addContainerGap());
+
         mainPanelLayout.setVerticalGroup(
-          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-          .addGroup(mainPanelLayout.createSequentialGroup()
-          .addComponent(refIdLabel)
-          .addGap(refIdLabel.getFont().getSize())
-          .addComponent(hashDataScrollPane)
-          .addGap(refIdLabel.getFont().getSize())));
-                
+          mainPanelLayout.createSequentialGroup()
+                .addComponent(refIdLabel)
+                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(hashDataScrollPane, 0, GroupLayout.PREFERRED_SIZE, hashDataTable.getPreferredSize().height+3));
+//                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED));
+
+        
+        
+//        
+//        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+//        mainPanel.setLayout(mainPanelLayout);
+//
+//        mainPanelLayout.setHorizontalGroup(
+//          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//            .addGroup(mainPanelLayout.createSequentialGroup()
+//                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//                    .addComponent(refIdLabel)
+//                    .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE))
+//                    .addContainerGap()));
+//
+//        mainPanelLayout.setVerticalGroup(
+//          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//          .addGroup(mainPanelLayout.createSequentialGroup()
+//            .addComponent(refIdLabel)
+//            .addGap(refIdLabel.getFont().getSize())
+//            .addComponent(hashDataScrollPane)
+//            .addGap(refIdLabel.getFont().getSize())));
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+//        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+//        buttonPanel.setLayout(buttonPanelLayout);
+//
+//        buttonPanelLayout.setHorizontalGroup(
+//          buttonPanelLayout.createSequentialGroup()
+////          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+////            .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
+//                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+//                .addComponent(saveButton)
+//                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+//                .addComponent(cancelButton)
+//                .addContainerGap()); //);
+//        buttonPanelLayout.setVerticalGroup(
+//          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//          .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
+//            .addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+//                .addComponent(saveButton)
+//                .addComponent(cancelButton))
+//            .addContainerGap()));
+
+        
+        backButton.setActionCommand(cancelCommand);
+        backButton.addActionListener(cancelListener);
+
+        saveButton.setActionCommand(saveCommand);
+        saveButton.addActionListener(saveListener);
+        
         GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
         buttonPanel.setLayout(buttonPanelLayout);
 
+//        buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
         buttonPanelLayout.setHorizontalGroup(
-          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(saveButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
+          buttonPanelLayout.createSequentialGroup()
+                .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());//);
         buttonPanelLayout.setVerticalGroup(
-          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(cancelButton)));
+          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
+                .addComponent(saveButton)
+                .addComponent(backButton)); 
 
         contentPanel.validate();
     }
@@ -901,9 +1169,13 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(waitMsgLabel)
+                  .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
                 mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(waitMsgLabel));
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(waitMsgLabel));
 
                 contentPanel.validate();
             }
@@ -975,13 +1247,17 @@ public class BKUGUI implements BKUGUIFacade {
 
             String ext = getExtension(f);
             if ("text/xml".equals(mimeType)) {
-                return "xml".equals(ext);
+                return "xml".equalsIgnoreCase(ext);
+            } else if ("text/html".equals(mimeType)) {
+                return "html".equalsIgnoreCase(ext) || "htm".equalsIgnoreCase(ext);
+            } else if ("application/xhtml+xml".equals(mimeType)) {
+                return "xhtml".equalsIgnoreCase(ext);
             } else if ("text/plain".equals(mimeType)) {
-                return "txt".equals(ext);
+                return "txt".equalsIgnoreCase(ext);
             } else if ("application/pdf".equals(mimeType)) {
-                return "pdf".equals(ext);
+                return "pdf".equalsIgnoreCase(ext);
             } else {
-                return "bin".equals(ext);
+                return true;
             }
         }
 
@@ -1000,6 +1276,10 @@ public class BKUGUI implements BKUGUIFacade {
         public String getDescription() {
             if ("text/xml".equals(mimeType)) {
                 return messages.getString(MIMETYPE_DESC_XML);
+            } else if ("text/html".equals(mimeType)) {
+                return messages.getString(MIMETYPE_DESC_HTML);
+            } else if ("application/xhtml+xml".equals(mimeType)) {
+                return messages.getString(MIMETYPE_DESC_XHTML);
             } else if ("text/plain".equals(mimeType)) {
                 return messages.getString(MIMETYPE_DESC_TXT);
             } else if ("application/pdf".equals(mimeType)) {
@@ -1012,6 +1292,10 @@ public class BKUGUI implements BKUGUIFacade {
         public String getExtension() {
             if ("text/xml".equals(mimeType)) {
                 return ".xml";
+            } else if ("text/html".equals(mimeType)) {
+                return ".html";
+            } else if ("application/xhtml+xml".equals(mimeType)) {
+                return ".xhtml";
             } else if ("text/plain".equals(mimeType)) {
                 return ".txt";
             } else if ("application/pdf".equals(mimeType)) {
@@ -1021,4 +1305,34 @@ public class BKUGUI implements BKUGUIFacade {
             }
         }
     }
+
+    class HashDataTableModel extends DefaultTableModel {
+
+        Class[] types = new Class[]{
+            java.lang.String.class, java.lang.Boolean.class
+        };
+        
+        public HashDataTableModel(List<HashDataInput> signedReferences) {
+            super(0, 2);
+            for (HashDataInput hashDataInput : signedReferences) {
+                addRow(new Object[]{hashDataInput.getReferenceId(), new Boolean(true)});
+            }
+        }
+
+        @Override
+        public Class getColumnClass(int columnIndex) {
+            return types [columnIndex];
+        }
+
+        public List<String> getSelectedReferenceIds() {
+            ArrayList<String> selection = new ArrayList<String>();
+            for (Object row : dataVector) {
+                if ((Boolean) ((Vector) row).elementAt(1)) {
+                    selection.add((String) ((Vector) row).elementAt(0));
+                }
+            }
+            return selection;
+        }
+        
+    }
 }
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 21a6bd1b..b651fa8d 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -25,18 +25,24 @@ title.hashdata=<html>Signaturdaten</html>
 windowtitle.save=Signaturdaten speichern
 windowtitle.overwrite=Datei \u00FCberschreiben?
 message.wait=<html>Bitte warten...</html>
-message.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken.</html>
+message.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken</html>
 message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen...</a></html>
-message.hashdata=<html>Referenz Id: {0}</html>
+message.hashdata=<html>Ein textuelles Signaturdatenobjekt:</html> 
+#message.hashdata=<html>Referenz Id: {0}</html>
+message.hashdatalist=<html>{0} Signaturdatenobjekte:</html>
 message.retries=<html>Noch {0} Versuche</html>
 message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
 label.pin=<html>{0}:</html>
 label.pinsize=<html>({0} stellig)</html>
+error.hashdata=<html>Keine Signaturdaten verf\u00FCgbar</html>
 button.ok=OK
 button.cancel=Abbrechen
+button.back=Zur\u00FCck
 button.sign=Signieren
 button.save=Speichern...
 mimetype.desc.xml=XML-Dateien (*.xml)
+mimetype.desc.html=HTML-Dateien (*.html, *.htm)
+mimetype.desc.xhtml=XHTML-Dateien (*.xhtml)
 mimetype.desc.txt=Textdateien (*.txt)
 mimetype.desc.pdf=Adobe PDF-Dateien (*.pdf)
 mimetype.desc.bin=Bin\u00E4rdateien (*.bin)
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index 4dc1f8b3..a9c21a00 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -21,6 +21,8 @@
 
 package at.gv.egiz.bku.gui;
 
+import java.awt.Container;
+import java.awt.Dimension;
 import javax.swing.JFrame;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -36,7 +38,9 @@ public class BKUGUITest {
     public void testBKUGUI() {
         JFrame testFrame = new JFrame("BKUGUITest");
         BKUGUI gui = new BKUGUI();
-        gui.init(testFrame.getContentPane(), null);
+        Container contentPane = testFrame.getContentPane();
+        contentPane.setPreferredSize(new Dimension(500, 200));
+        gui.init(contentPane, null);
         BKUGUIWorker worker = new BKUGUIWorker();
         worker.init(gui);
         testFrame.pack();
@@ -50,4 +54,8 @@ public class BKUGUITest {
     @Test
     public void dummyTest() {
     }
+    
+//    public static void main(String[] args) {
+//        new BKUGUITest().testBKUGUI();
+//    }
 }
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 e2f478c9..4367f642 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
@@ -26,7 +26,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.util.Collections;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  *
@@ -42,7 +43,7 @@ public class BKUGUIWorker implements Runnable {
 
     @Override
     public void run() {
-        try {
+//        try {
 
             final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Signatur-PIN");
 
@@ -77,11 +78,11 @@ public class BKUGUIWorker implements Runnable {
                             gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", null, "hashdata");
                         }
                     };
-                    HashDataInput signedRef = new HashDataInput() {
+                    HashDataInput signedRef1 = new HashDataInput() {
 
                         @Override
                         public InputStream getHashDataInput() {
-                            return new ByteArrayInputStream("<xml>HashDataInput_002</xml>".getBytes());
+                            return new ByteArrayInputStream("HashDataInput_001\n12345\n\tHello, world!\n12345\n\n12345\n6789\nblabla".getBytes());
                         }
 
                         @Override
@@ -91,10 +92,69 @@ public class BKUGUIWorker implements Runnable {
 
                         @Override
                         public String getReferenceId() {
-                            return "ref123";
+                            return "Reference-ref1-00000000000000000000001";
                         }
                     };
-                    gui.showHashDataInputDialog(Collections.singletonList(signedRef), returnListener, "return");
+                    HashDataInput signedRef2 = new HashDataInput() {
+
+                        @Override
+                        public InputStream getHashDataInput() {
+                            return new ByteArrayInputStream("<xml>HashDataInput_002</xml>".getBytes());
+                        }
+
+                        @Override
+                        public String getMimeType() {
+                            return "text/xml";
+                        }
+
+                        @Override
+                        public String getReferenceId() {
+                            return "Reference-ref2-00000000000000000000002";
+                        }
+                    };
+                    HashDataInput signedRef3 = new HashDataInput() {
+
+                        @Override
+                        public InputStream getHashDataInput() {
+                            return new ByteArrayInputStream("<xml>HashDataInput_003</xml>".getBytes());
+                        }
+
+                        @Override
+                        public String getMimeType() {
+                            return "text/xml";
+                        }
+
+                        @Override
+                        public String getReferenceId() {
+                            return "Reference-ref3-00000000000000000000003";
+                        }
+                    };
+                    HashDataInput signedRef4 = new HashDataInput() {
+
+                        @Override
+                        public InputStream getHashDataInput() {
+                            return new ByteArrayInputStream("<xml>HashDataInput_004</xml>".getBytes());
+                        }
+
+                        @Override
+                        public String getMimeType() {
+                            return "text/xml";
+                        }
+
+                        @Override
+                        public String getReferenceId() {
+                            return "ref4";
+                        }
+                    };
+                    
+                    //
+                    List<HashDataInput> signedRefs = new ArrayList();
+                    signedRefs.add(signedRef1);
+                    signedRefs.add(signedRef2);
+                    signedRefs.add(signedRef3);
+                    signedRefs.add(signedRef4);
+//                    signedRefs = Collections.singletonList(signedRef1);
+                    gui.showHashDataInputDialog(signedRefs, returnListener, "return");
                 }
             };
            
@@ -105,7 +165,7 @@ public class BKUGUIWorker implements Runnable {
 //        Thread.sleep(2000);
         
 //            gui.showInsertCardDialog(cancelListener, "cancel");
-//            
+            
 //            Thread.sleep(2000);
 //            
 //            gui.showCardNotSupportedDialog(cancelListener, "cancel");
@@ -113,7 +173,7 @@ public class BKUGUIWorker implements Runnable {
 //            Thread.sleep(2000);
 
 //            PINSpec cardPinSpec = new PINSpec(4, 4, "[0-9]", "Karten-PIN");
-//            
+////            
 //            gui.showCardPINDialog(cardPinSpec, okListener, "ok", cancelListener, "cancel");
 //            
 //            Thread.sleep(2000);
@@ -121,11 +181,11 @@ public class BKUGUIWorker implements Runnable {
             
             gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
 
-            Thread.sleep(2000);
+//            Thread.sleep(2000);
             
-            gui.showSignaturePINRetryDialog(signPinSpec, 2, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
-
-            Thread.sleep(2000);
+//            gui.showSignaturePINRetryDialog(signPinSpec, 2, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+//
+//            Thread.sleep(2000);
 ////            
 //            gui.showErrorDialog("Testfehler occured", null, null);
 //            
@@ -137,8 +197,8 @@ public class BKUGUIWorker implements Runnable {
 //            gui.showTextPlainHashDataInput("hallo,\n welt!", "12345", null, "cancel", null, "save");
 //            Thread.sleep(2000);
 
-        } catch (InterruptedException ex) {
-            ex.printStackTrace();
-        }
+//        } catch (InterruptedException ex) {
+//            ex.printStackTrace();
+//        }
     }
 }
diff --git a/BKUCommonGUI/src/test/resources/commons-logging.properties b/BKUCommonGUI/src/test/resources/commons-logging.properties
new file mode 100644
index 00000000..29292562
--- /dev/null
+++ b/BKUCommonGUI/src/test/resources/commons-logging.properties
@@ -0,0 +1 @@
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
diff --git a/BKUCommonGUI/src/test/resources/log4j.properties b/BKUCommonGUI/src/test/resources/log4j.properties
new file mode 100644
index 00000000..053eac17
--- /dev/null
+++ b/BKUCommonGUI/src/test/resources/log4j.properties
@@ -0,0 +1,19 @@
+# loglever DEBUG, appender STDOUT
+log4j.rootLogger=TRACE, STDOUT
+#log4j.logger.at.gv.egiz.slbinding.RedirectEventFilter=DEBUG, STDOUT
+
+# STDOUT appender
+log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
+log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
+#log4j.appender.STDOUT.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20c |  %10t | %m%n
+#log4j.appender.STDOUT.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+log4j.appender.STDOUT.layout.ConversionPattern=%-5p |%d | %t | %c %x- %m%n
+
+### FILE appender
+#log4j.appender.file=org.apache.log4j.RollingFileAppender
+#log4j.appender.file.maxFileSize=100KB
+#log4j.appender.file.maxBackupIndex=9
+#log4j.appender.file.File=egovbus_ca.log
+#log4j.appender.file.threshold=info
+#log4j.appender.file.layout=org.apache.log4j.PatternLayout
+#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
\ No newline at end of file
-- 
cgit v1.2.3


From 3794536434fdbb06067eddcfd248898ce85f85a1 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 12 Sep 2008 13:06:34 +0000
Subject: gui 0.2

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@34 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    | 102 ++-
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 885 ++++++++++-----------
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   2 +
 .../at/gv/egiz/bku/gui/HashDataTableModel.java     |  71 ++
 .../main/java/at/gv/egiz/bku/gui/MimeFilter.java   |  98 +++
 .../main/java/at/gv/egiz/bku/gui/PinDocument.java  |  58 ++
 .../at/gv/egiz/bku/gui/Messages.properties         |  15 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java | 276 +++----
 BKUOnline/pom.xml                                  |  13 +-
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   |   6 +-
 10 files changed, 840 insertions(+), 686 deletions(-)
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/MimeFilter.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 8289f30b..c7df0871 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -34,63 +34,59 @@ import at.gv.egiz.bku.gui.BKUGUIFactory;
  */
 public class BKUApplet extends JApplet {
 
-	private static Log log = LogFactory.getLog(BKUApplet.class);
+    private static Log log = LogFactory.getLog(BKUApplet.class);
+    public final static String RESOURCE_BUNDLE_BASE = "at/gv/egiz/bku/online/applet/Messages";
+    public final static String LOCALE_PARAM_KEY = "Locale";
+    public final static String LOGO_URL_KEY = "LogoURL";
+    public final static String WSDL_URL = "WSDL_URL";
+    public final static String SESSION_ID = "SessionID";
+    protected ResourceBundle resourceBundle;
+    protected BKUWorker worker;
+    protected Thread workerThread;
 
-	public final static String RESOURCE_BUNDLE_BASE = "at/gv/egiz/bku/online/applet/Messages";
+    public BKUApplet() {
+    }
 
-	public final static String LOCALE_PARAM_KEY = "Locale";
-	public final static String LOGO_URL_KEY = "LogoURL";
-	public final static String WSDL_URL = "WSDL_URL";
-	public final static String SESSION_ID = "SessionID";
+    public void init() {
+        log.debug("Called init()");
+        HttpsURLConnection.setDefaultSSLSocketFactory(InternalSSLSocketFactory.getInstance());
+        String localeString = getMyAppletParameter(LOCALE_PARAM_KEY);
+        if (localeString != null) {
+            resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE_BASE,
+              new Locale(localeString));
+        } else {
+            resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE_BASE);
+        }
+        BKUGUIFacade gui = BKUGUIFactory.createGUI();
+        gui.init(getContentPane(), localeString);
+        worker = new BKUWorker(gui, this, resourceBundle);
+    }
 
-	protected ResourceBundle resourceBundle;
-	protected BKUWorker worker;
-	protected Thread workerThread;
+    public void start() {
+        log.debug("Called start()");
+        workerThread = new Thread(worker);
+        workerThread.start();
+    }
 
-	public BKUApplet() {
-	}
+    public void stop() {
+        log.debug("Called stop()");
+        if ((workerThread != null) && (workerThread.isAlive())) {
+            workerThread.interrupt();
+        }
+    }
 
-	public void init() {
-		log.debug("Called init()");
-		HttpsURLConnection.setDefaultSSLSocketFactory(InternalSSLSocketFactory
-				.getInstance());
-		String localeString = getMyAppletParameter(LOCALE_PARAM_KEY);
-		if (localeString != null) {
-			resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE_BASE,
-					new Locale(localeString));
-		} else {
-			resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE_BASE);
-		}
-		BKUGUIFacade gui = BKUGUIFactory.createGUI();
-		gui.init(getContentPane(), localeString);
-		worker = new BKUWorker(gui, this, resourceBundle);
-	}
+    public void destroy() {
+        log.debug("Called destroy()");
+    }
 
-	public void start() {
-		log.debug("Called start()");
-		workerThread = new Thread(worker);
-		workerThread.start();
-	}
-
-	public void stop() {
-		log.debug("Called stop()");
-		if ((workerThread != null) && (workerThread.isAlive())) {
-			workerThread.interrupt();
-		}
-	}
-
-	public void destroy() {
-		log.debug("Called destroy()");
-	}
-
-	/**
-	 * Applet configuration parameters
-	 * 
-	 * @param paramKey
-	 * @return
-	 */
-	public String getMyAppletParameter(String paramKey) {
-		log.info("Getting parameter: " + paramKey + ": " + getParameter(paramKey));
-		return getParameter(paramKey);
-	}
+    /**
+     * Applet configuration parameters
+     * 
+     * @param paramKey
+     * @return
+     */
+    public String getMyAppletParameter(String paramKey) {
+        log.info("Getting parameter: " + paramKey + ": " + getParameter(paramKey));
+        return getParameter(paramKey);
+    }
 }
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 044e6927..584dba1a 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
@@ -27,6 +27,7 @@ import java.awt.Component;
 import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -75,13 +76,11 @@ import org.apache.commons.logging.LogFactory;
  * @author clemens
  */
 public class BKUGUI implements BKUGUIFacade {
-
+    
     private static final Log log = LogFactory.getLog(BKUGUI.class);
     public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
     public static final String LOGO_RESOURCE = "/images/logo.png";
-//    public static final int MAIN_PANEL_WIDTH = 100;
-//    public static final int MAIN_PANEL_HEIGHT = 20;
-//    public static final int PREF_SIZE_PINFIELD = 118;
+    public static final String HASHDATA_FONT = "Monospaced";
     public static final Color ERROR_COLOR = Color.RED;
     public static final Color HYPERLINK_COLOR = Color.BLUE;
     private static final String TITLE_WELCOME = "title.welcome";
@@ -94,6 +93,7 @@ public class BKUGUI implements BKUGUIFacade {
     private static final String TITLE_WAIT = "title.wait";
     private static final String TITLE_HASHDATA = "title.hashdata";
     private static final String WINDOWTITLE_SAVE = "windowtitle.save";
+    private static final String WINDOWTITLE_SAVEDIR = "windowtitle.savedir";
     private static final String WINDOWTITLE_OVERWRITE = "windowtitle.overwrite";
     private static final String MESSAGE_WAIT = "message.wait";
     private static final String MESSAGE_INSERTCARD = "message.insertcard";
@@ -104,19 +104,13 @@ public class BKUGUI implements BKUGUIFacade {
     private static final String MESSAGE_OVERWRITE = "message.overwrite";
     private static final String LABEL_PIN = "label.pin";
     private static final String LABEL_PINSIZE = "label.pinsize";
-    private static final String ERROR_HASHDATA = "error.hashdata";
+    private static final String ERROR_NO_HASHDATA = "error.no.hashdata";
     
     private static final String BUTTON_OK = "button.ok";
     private static final String BUTTON_CANCEL = "button.cancel";
     private static final String BUTTON_BACK = "button.back";
     private static final String BUTTON_SIGN = "button.sign";
     private static final String BUTTON_SAVE = "button.save";
-    private static final String MIMETYPE_DESC_XML = "mimetype.desc.xml";
-    private static final String MIMETYPE_DESC_HTML = "mimetype.desc.html";
-    private static final String MIMETYPE_DESC_XHTML = "mimetype.desc.xhtml";
-    private static final String MIMETYPE_DESC_TXT = "mimetype.desc.txt";
-    private static final String MIMETYPE_DESC_PDF = "mimetype.desc.pdf";
-    private static final String MIMETYPE_DESC_BIN = "mimetype.desc.bin";
     private static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
     protected Container contentPane;
     protected ResourceBundle messages;
@@ -132,11 +126,11 @@ public class BKUGUI implements BKUGUIFacade {
     /** remember the pinfield to return to worker */
     protected JPasswordField pinField;
 
-    protected JButton okButton;
-    protected JButton cancelButton;
-    protected JButton signButton;
-    protected JButton saveButton;
-    protected JButton backButton;
+//    protected JButton okButton;
+//    protected JButton cancelButton;
+//    protected JButton signButton;
+//    protected JButton saveButton;
+//    protected JButton backButton;
     protected int buttonSize;
     
     private static final int CHECKBOX_WIDTH = new JCheckBox().getPreferredSize().width;
@@ -216,28 +210,43 @@ public class BKUGUI implements BKUGUIFacade {
           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));
+//        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);        
         
-        if (okButton.getPreferredSize().width > buttonSize)
-            buttonSize = okButton.getPreferredSize().width;
-        if (cancelButton.getPreferredSize().width > buttonSize)
-            buttonSize = cancelButton.getPreferredSize().width;
-        if (signButton.getPreferredSize().width > buttonSize)
-            buttonSize = signButton.getPreferredSize().width;
-        if (backButton.getPreferredSize().width > buttonSize)
-            buttonSize = backButton.getPreferredSize().width;
-        if (saveButton.getPreferredSize().width > buttonSize)
-            buttonSize = saveButton.getPreferredSize().width;
+        JButton b = new JButton();
+        b.setText(messages.getString(BUTTON_CANCEL));
+        if (b.getPreferredSize().width > buttonSize)
+            buttonSize = b.getPreferredSize().width;
+        b.setText(messages.getString(BUTTON_OK));
+        if (b.getPreferredSize().width > buttonSize)
+            buttonSize = b.getPreferredSize().width;
+        b.setText(messages.getString(BUTTON_SIGN));
+        if (b.getPreferredSize().width > buttonSize)
+            buttonSize = b.getPreferredSize().width;
+        b.setText(messages.getString(BUTTON_BACK));
+        if (b.getPreferredSize().width > buttonSize)
+            buttonSize = b.getPreferredSize().width;
+        b.setText(messages.getString(BUTTON_SAVE));
+        if (b.getPreferredSize().width > buttonSize)
+            buttonSize = b.getPreferredSize().width;
+        
+//        if (cancelButton.getPreferredSize().width > buttonSize)
+//            buttonSize = cancelButton.getPreferredSize().width;
+//        if (signButton.getPreferredSize().width > buttonSize)
+//            buttonSize = signButton.getPreferredSize().width;
+//        if (backButton.getPreferredSize().width > buttonSize)
+//            buttonSize = backButton.getPreferredSize().width;
+//        if (saveButton.getPreferredSize().width > buttonSize)
+//            buttonSize = saveButton.getPreferredSize().width;
 
         
         GroupLayout headerPanelLayout = new GroupLayout(headerPanel);
@@ -349,6 +358,8 @@ public class BKUGUI implements BKUGUIFacade {
 
                 titleLabel.setText(messages.getString(TITLE_INSERTCARD));
 
+                JButton cancelButton = new JButton();
+                cancelButton.setText(messages.getString(BUTTON_CANCEL));
                 cancelButton.addActionListener(cancelListener);
                 cancelButton.setActionCommand(cancelCommand);
 
@@ -400,6 +411,8 @@ public class BKUGUI implements BKUGUIFacade {
 //                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                     .addComponent(errorMsgLabel));
 
+                JButton cancelButton = new JButton();
+                cancelButton.setText(messages.getString(BUTTON_CANCEL));
                 cancelButton.addActionListener(cancelListener);
                 cancelButton.setActionCommand(cancelCommand);
 
@@ -439,9 +452,13 @@ public class BKUGUI implements BKUGUIFacade {
                     titleLabel.setText(messages.getString(TITLE_RETRY));
                 }
 
+                JButton cancelButton = new JButton();
+                cancelButton.setText(messages.getString(BUTTON_CANCEL));
                 cancelButton.setActionCommand(cancelCommand);
                 cancelButton.addActionListener(cancelListener);
 
+                JButton okButton = new JButton();
+                okButton.setText(messages.getString(BUTTON_OK));
                 okButton.setEnabled(false);
                 okButton.setActionCommand(okCommand);
                 okButton.addActionListener(okListener);
@@ -592,9 +609,13 @@ public class BKUGUI implements BKUGUIFacade {
                     titleLabel.setText(messages.getString(TITLE_RETRY));
                 }
 
+                JButton cancelButton = new JButton();
+                cancelButton.setText(messages.getString(BUTTON_CANCEL));
                 cancelButton.setActionCommand(cancelCommand);
                 cancelButton.addActionListener(cancelListener);
 
+                JButton signButton = new JButton();
+                signButton.setText(messages.getString(BUTTON_SIGN));
                 signButton.setEnabled(false);
                 signButton.setActionCommand(signCommand);
                 signButton.addActionListener(signListener);
@@ -764,6 +785,8 @@ public class BKUGUI implements BKUGUIFacade {
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(errorMsgLabel));
 
+                JButton okButton = new JButton();
+                okButton.setText(messages.getString(BUTTON_OK));
                 okButton.setActionCommand(okCommand);
                 okButton.addActionListener(okListener);
 
@@ -790,343 +813,386 @@ public class BKUGUI implements BKUGUIFacade {
 
     @Override
     public void showErrorDialog(final String errorMsg) {
-        SwingUtilities.invokeLater(new Runnable() {
+      SwingUtilities.invokeLater(new Runnable() {
 
-            public void run() {
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
+        @Override
+        public void run() {
+          mainPanel.removeAll();
+          buttonPanel.removeAll();
 
-                titleLabel.setText(messages.getString(TITLE_ERROR));
+          titleLabel.setText(messages.getString(TITLE_ERROR));
 //                titleLabel.setForeground(defaultForground);
 
-                JLabel errorMsgLabel = new JLabel();
-                errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                errorMsgLabel.setText("<html>" + errorMsg + "</html>");
-                errorMsgLabel.setForeground(ERROR_COLOR);
+          JLabel errorMsgLabel = new JLabel();
+          errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+          errorMsgLabel.setText("<html>" + errorMsg + "</html>");
+          errorMsgLabel.setForeground(ERROR_COLOR);
 
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
+          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+          mainPanel.setLayout(mainPanelLayout);
 
-                mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
+          mainPanelLayout.setHorizontalGroup(
+            mainPanelLayout.createSequentialGroup()
 //                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(errorMsgLabel)
-                  .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(errorMsgLabel));
+            .addComponent(errorMsgLabel)
+            .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+          mainPanelLayout.setVerticalGroup(
+            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+            .addComponent(errorMsgLabel));
 
-                contentPanel.validate();
-            }
-        });
+          contentPanel.validate();
+        }
+      });
     }
 
     @Override
     public void showHashDataInputDialog(final List<HashDataInput> signedReferences, final ActionListener okListener, final String okCommand) {
-        SwingUtilities.invokeLater(new Runnable() {
+      
+      if (signedReferences == null) {
+        showErrorDialog(messages.getString(ERROR_NO_HASHDATA), okListener, okCommand);
+      }
+      
+      if (signedReferences.size() == 1) {
+
+//          final HashDataInput signedRef = signedReferences.get(0);
+          
+          if ("text/plain".equals(signedReferences.get(0).getMimeType())) {
+            
+            ActionListener saveHashDataListener = new ActionListener() {
+
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
+                }
+            };
+            String hashDataText = getText(signedReferences.get(0));
+            if (hashDataText != null) {
+              showPlainTextHashDataInputDialog(hashDataText, saveHashDataListener, "save", okListener, okCommand);
+            } else {
+              showErrorDialog(messages.getString(ERROR_NO_HASHDATA), okListener, okCommand);
+            }
+          
+          } else {
+            showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
+          }
+          
+      } else {
 
-            @Override
-            public void run() {
+        final HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
 
-                if (signedReferences != null && signedReferences.size() == 1) {
-
-                    final HashDataInput signedRef = signedReferences.get(0);
-                    if ("text/plain".equals(signedRef.getMimeType())) {
-                        //TODO get encoding from mimetype
-                        //read directly to byte[] since hashDataIS is backed by byte[] ?
-                        ByteArrayOutputStream baos = null;
-                        try {
-                            String refId = signedRef.getReferenceId();
-                            InputStream hashDataIS = signedRef.getHashDataInput();
-                            if (hashDataIS == null) {
-                                showErrorDialog("Failed to obtain HashDataInput for reference " + refId, okListener, okCommand);
-                            } else {
-                                baos = new ByteArrayOutputStream(hashDataIS.available());
-                                int c;
-                                while ((c = hashDataIS.read()) != -1) {
-                                    baos.write(c);
-                                }
-                                String text = baos.toString("UTF-8");
-
-                                ActionListener al = new ActionListener() {
-
-                                    @Override
-                                    public void actionPerformed(ActionEvent e) {
-                                        showSaveHashDataInputDialog(signedRef, okListener, okCommand);
-                                    }
-                                };
-                                showPlainTextHashDataInputDialog(text, refId, okListener, okCommand, al, "save");
-                            }
-                        } catch (IOException ex) {
-                            showErrorDialog("Failed to read HashDataInput for reference " + signedRef.getReferenceId() + ": " + ex.getMessage(), okListener, okCommand);
-                        } finally {
-                            try {
-                                baos.close();
-                            } catch (IOException ex) {
-                            }
-                        }
-                    } else {
-                        showSaveHashDataInputDialog(signedRef, okListener, okCommand);
-                    }
+        ActionListener saveHashDataListener = new ActionListener() {
 
-                } else if (signedReferences != null && signedReferences.size() > 1) {
-                    final HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
-
-                    ActionListener al = new ActionListener() {
-
-                        @Override
-                        public void actionPerformed(ActionEvent e) {
-                            List<String> selection = tableModel.getSelectedReferenceIds();
-                            StringBuilder sb = new StringBuilder("<html>Not implemented yet. \n");
-                            for (String string : selection) {
-                                sb.append(string);
-                                sb.append('\n');
-                            }
-                            showErrorDialog(sb.toString(), okListener, okCommand);
-//                            showSaveHashDataInputDialog(signedRef, okListener, okCommand);
-                        }
-                    };
-                    showMultipleHashDataInputDialog(tableModel, okListener, okCommand, al, "save");
-                } else {
-                    showErrorDialog(messages.getString(ERROR_HASHDATA), okListener, okCommand);
-                }
+            @Override
+            public void actionPerformed(ActionEvent e) {
+              showSaveHashDataInputDialog(tableModel.getSelectedHashData(), okListener, okCommand);
             }
-        });
+        };
+        showMultipleHashDataInputDialog(tableModel, okListener, okCommand, saveHashDataListener, "save");
+      }
+    }
+    
+     private static String getText(HashDataInput hdi) {
+      ByteArrayOutputStream baos = null;
+      try {
+        InputStream hashDataIS = hdi.getHashDataInput();
+        if (hashDataIS == null) {
+          log.error("No HashDataInput stream for reference " + hdi.getReferenceId());
+          return null;
+        } else {
+          baos = new ByteArrayOutputStream(hashDataIS.available());
+          int c;
+          while ((c = hashDataIS.read()) != -1) {
+              baos.write(c);
+          }
+          return baos.toString("UTF-8");
+        }
+      } catch (IOException ex) {
+          log.error("Failed to read HashDataInput for reference " + hdi.getReferenceId() + ": " + ex.getMessage());
+          return null;
+      } finally {
+          try {
+              baos.close();
+          } catch (IOException ex) {
+          }
+      }
     }
 
-    private void showPlainTextHashDataInputDialog(String text, String refId, ActionListener cancelListener, String cancelCommand, ActionListener saveListener, String saveCommand) {
-        mainPanel.removeAll();
-        buttonPanel.removeAll();
+    private void showPlainTextHashDataInputDialog(final String hashDataText, final ActionListener saveListener, final String saveCommand, final ActionListener cancelListener, final String cancelCommand) {
+      SwingUtilities.invokeLater(new Runnable() {
 
-        titleLabel.setText(messages.getString(TITLE_HASHDATA));
+        @Override
+        public void run() {
+          mainPanel.removeAll();
+          buttonPanel.removeAll();
+
+          titleLabel.setText(messages.getString(TITLE_HASHDATA));
+
+          JLabel refIdLabel = new JLabel();
+          refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+          refIdLabel.setText(messages.getString(MESSAGE_HASHDATA)); //MessageFormat.format(refIdLabelPattern, new Object[]{refId}));
+
+          JScrollPane hashDataScrollPane = new JScrollPane();
+          JTextArea hashDataTextArea = new JTextArea(hashDataText);
+          hashDataTextArea.setEditable(false);
+          hashDataTextArea.setColumns(1);
+          hashDataTextArea.setRows(1);
+          hashDataTextArea.setFont(new Font(HASHDATA_FONT, hashDataTextArea.getFont().getStyle(), hashDataTextArea.getFont().getSize()));
+          hashDataScrollPane.setViewportView(hashDataTextArea);
+
+          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+          mainPanel.setLayout(mainPanelLayout);
+
+          mainPanelLayout.setHorizontalGroup(
+            mainPanelLayout.createSequentialGroup()
+                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(refIdLabel)
+                      .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                  .addContainerGap());
+
+          mainPanelLayout.setVerticalGroup(
+            mainPanelLayout.createSequentialGroup()
+                  .addComponent(refIdLabel)
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                  .addComponent(hashDataScrollPane, 0, GroupLayout.PREFERRED_SIZE, hashDataTextArea.getPreferredSize().height+3));
+
+
+
+  //        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+  //        mainPanel.setLayout(mainPanelLayout);
+  //
+  //        mainPanelLayout.setHorizontalGroup(
+  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(refIdLabel).addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)).addContainerGap()));
+  //
+  //        mainPanelLayout.setVerticalGroup(
+  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addComponent(refIdLabel).addGap(refIdLabel.getFont().getSize()).addComponent(hashDataScrollPane).addGap(refIdLabel.getFont().getSize())));
+
+          JButton backButton = new JButton();
+          backButton.setText(messages.getString(BUTTON_BACK));
+          backButton.setActionCommand(cancelCommand);
+          backButton.addActionListener(cancelListener);
+
+          JButton saveButton = new JButton();
+          saveButton.setText(messages.getString(BUTTON_SAVE));
+          saveButton.setActionCommand(saveCommand);
+          saveButton.addActionListener(saveListener);
+
+          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+          buttonPanel.setLayout(buttonPanelLayout);
+
+  //        buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
+          buttonPanelLayout.setHorizontalGroup(
+            buttonPanelLayout.createSequentialGroup()
+                  .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());
+          buttonPanelLayout.setVerticalGroup(
+            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
+                  .addComponent(saveButton)
+                  .addComponent(backButton)); 
+
+
+  //        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+  //        buttonPanel.setLayout(buttonPanelLayout);
+  //
+  //        buttonPanelLayout.setHorizontalGroup(
+  //          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(saveButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
+  //        buttonPanelLayout.setVerticalGroup(
+  //          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(cancelButton)));
+
+          contentPanel.validate();
+        }
+      });
+    }
 
-        JLabel refIdLabel = new JLabel();
-        refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-        String refIdLabelPattern = messages.getString(MESSAGE_HASHDATA);
-        refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{refId}));
+    private void showMultipleHashDataInputDialog(final TableModel signedReferences, final ActionListener cancelListener, final String cancelCommand, final ActionListener saveListener, final String saveCommand) {
+      SwingUtilities.invokeLater(new Runnable() {
 
-        JScrollPane hashDataScrollPane = new JScrollPane();
-        JTextArea hashDataTextArea = new JTextArea(text);
-        hashDataTextArea.setEditable(false);
-        hashDataTextArea.setColumns(1);
-        hashDataTextArea.setRows(1);
-        hashDataScrollPane.setViewportView(hashDataTextArea);
+        @Override
+        public void run() {
+          mainPanel.removeAll();
+          buttonPanel.removeAll();
 
-        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-        mainPanel.setLayout(mainPanelLayout);
+          titleLabel.setText(messages.getString(TITLE_HASHDATA));
 
-        mainPanelLayout.setHorizontalGroup(
-          mainPanelLayout.createSequentialGroup()
-                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addComponent(refIdLabel)
-                    .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                .addContainerGap());
+          JLabel refIdLabel = new JLabel();
+          refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+          String refIdLabelPattern = messages.getString(MESSAGE_HASHDATALIST);
+          refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{signedReferences.getRowCount()}));
 
-        mainPanelLayout.setVerticalGroup(
-          mainPanelLayout.createSequentialGroup()
-                .addComponent(refIdLabel)
-                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(hashDataScrollPane, 0, GroupLayout.PREFERRED_SIZE, hashDataTextArea.getPreferredSize().height+3));
+          JTable hashDataTable = new JTable();
+          hashDataTable.setModel(signedReferences);
+          hashDataTable.setTableHeader(null);
+  //        hashDataTable.setShowVerticalLines(false);
+  //        hashDataTable.setRowSelectionAllowed(false);
+          TableColumn selectCol = hashDataTable.getColumnModel().getColumn(1);
+          selectCol.setMinWidth(CHECKBOX_WIDTH);
+          selectCol.setMaxWidth(CHECKBOX_WIDTH);
+
+
+          hashDataTable.setPreferredScrollableViewportSize(mainPanel.getPreferredSize());
 
-        
-        
-//        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-//        mainPanel.setLayout(mainPanelLayout);
-//
-//        mainPanelLayout.setHorizontalGroup(
-//          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(refIdLabel).addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)).addContainerGap()));
-//
-//        mainPanelLayout.setVerticalGroup(
-//          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addComponent(refIdLabel).addGap(refIdLabel.getFont().getSize()).addComponent(hashDataScrollPane).addGap(refIdLabel.getFont().getSize())));
+          JScrollPane hashDataScrollPane = new JScrollPane(hashDataTable);
 
-        backButton.setActionCommand(cancelCommand);
-        backButton.addActionListener(cancelListener);
+          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+          mainPanel.setLayout(mainPanelLayout);
 
-        saveButton.setActionCommand(saveCommand);
-        saveButton.addActionListener(saveListener);
-        
-        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-        buttonPanel.setLayout(buttonPanelLayout);
-
-//        buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
-        buttonPanelLayout.setHorizontalGroup(
-          buttonPanelLayout.createSequentialGroup()
-                .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());
-        buttonPanelLayout.setVerticalGroup(
-          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
-                .addComponent(saveButton)
-                .addComponent(backButton)); 
-
-
-//        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-//        buttonPanel.setLayout(buttonPanelLayout);
-//
-//        buttonPanelLayout.setHorizontalGroup(
-//          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(saveButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
-//        buttonPanelLayout.setVerticalGroup(
-//          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(cancelButton)));
+          mainPanelLayout.setHorizontalGroup(
+            mainPanelLayout.createSequentialGroup()
+                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(refIdLabel)
+                      .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                  .addContainerGap());
 
-        contentPanel.validate();
-    }
+          mainPanelLayout.setVerticalGroup(
+            mainPanelLayout.createSequentialGroup()
+                  .addComponent(refIdLabel)
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                  .addComponent(hashDataScrollPane, 0, GroupLayout.PREFERRED_SIZE, hashDataTable.getPreferredSize().height+3));
+  //                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED));
 
-    private void showMultipleHashDataInputDialog(final TableModel signedReferences, final ActionListener cancelListener, final String cancelCommand, ActionListener saveListener, String saveCommand) {
-        mainPanel.removeAll();
-        buttonPanel.removeAll();
-
-        titleLabel.setText(messages.getString(TITLE_HASHDATA));
-
-        JLabel refIdLabel = new JLabel();
-        refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-        String refIdLabelPattern = messages.getString(MESSAGE_HASHDATALIST);
-        refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{signedReferences.getRowCount()}));
-
-        JTable hashDataTable = new JTable();
-        hashDataTable.setModel(signedReferences);
-        hashDataTable.setTableHeader(null);
-//        hashDataTable.setShowVerticalLines(false);
-//        hashDataTable.setRowSelectionAllowed(false);
-        TableColumn selectCol = hashDataTable.getColumnModel().getColumn(1);
-        selectCol.setMinWidth(CHECKBOX_WIDTH);
-        selectCol.setMaxWidth(CHECKBOX_WIDTH);
-        
-        
-        hashDataTable.setPreferredScrollableViewportSize(mainPanel.getPreferredSize());
-        
-        JScrollPane hashDataScrollPane = new JScrollPane(hashDataTable);
-        
-        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-        mainPanel.setLayout(mainPanelLayout);
-
-        mainPanelLayout.setHorizontalGroup(
-          mainPanelLayout.createSequentialGroup()
-                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addComponent(refIdLabel)
-                    .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                .addContainerGap());
-
-        mainPanelLayout.setVerticalGroup(
-          mainPanelLayout.createSequentialGroup()
-                .addComponent(refIdLabel)
-                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(hashDataScrollPane, 0, GroupLayout.PREFERRED_SIZE, hashDataTable.getPreferredSize().height+3));
-//                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED));
 
-        
-        
-//        
-//        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-//        mainPanel.setLayout(mainPanelLayout);
-//
-//        mainPanelLayout.setHorizontalGroup(
-//          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//            .addGroup(mainPanelLayout.createSequentialGroup()
-//                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//                    .addComponent(refIdLabel)
-//                    .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE))
-//                    .addContainerGap()));
-//
-//        mainPanelLayout.setVerticalGroup(
-//          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//          .addGroup(mainPanelLayout.createSequentialGroup()
-//            .addComponent(refIdLabel)
-//            .addGap(refIdLabel.getFont().getSize())
-//            .addComponent(hashDataScrollPane)
-//            .addGap(refIdLabel.getFont().getSize())));
 
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-//        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-//        buttonPanel.setLayout(buttonPanelLayout);
-//
-//        buttonPanelLayout.setHorizontalGroup(
-//          buttonPanelLayout.createSequentialGroup()
-////          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-////            .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
-//                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-//                .addComponent(saveButton)
-//                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-//                .addComponent(cancelButton)
-//                .addContainerGap()); //);
-//        buttonPanelLayout.setVerticalGroup(
-//          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//          .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
-//            .addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-//                .addComponent(saveButton)
-//                .addComponent(cancelButton))
-//            .addContainerGap()));
+  //        
+  //        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+  //        mainPanel.setLayout(mainPanelLayout);
+  //
+  //        mainPanelLayout.setHorizontalGroup(
+  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+  //            .addGroup(mainPanelLayout.createSequentialGroup()
+  //                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+  //                    .addComponent(refIdLabel)
+  //                    .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE))
+  //                    .addContainerGap()));
+  //
+  //        mainPanelLayout.setVerticalGroup(
+  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+  //          .addGroup(mainPanelLayout.createSequentialGroup()
+  //            .addComponent(refIdLabel)
+  //            .addGap(refIdLabel.getFont().getSize())
+  //            .addComponent(hashDataScrollPane)
+  //            .addGap(refIdLabel.getFont().getSize())));
 
-        
-        backButton.setActionCommand(cancelCommand);
-        backButton.addActionListener(cancelListener);
 
-        saveButton.setActionCommand(saveCommand);
-        saveButton.addActionListener(saveListener);
-        
-        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-        buttonPanel.setLayout(buttonPanelLayout);
-
-//        buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
-        buttonPanelLayout.setHorizontalGroup(
-          buttonPanelLayout.createSequentialGroup()
-                .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());//);
-        buttonPanelLayout.setVerticalGroup(
-          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
-                .addComponent(saveButton)
-                .addComponent(backButton)); 
-
-        contentPanel.validate();
+
+
+
+
+
+
+
+
+
+
+  //        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+  //        buttonPanel.setLayout(buttonPanelLayout);
+  //
+  //        buttonPanelLayout.setHorizontalGroup(
+  //          buttonPanelLayout.createSequentialGroup()
+  ////          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+  ////            .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
+  //                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+  //                .addComponent(saveButton)
+  //                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+  //                .addComponent(cancelButton)
+  //                .addContainerGap()); //);
+  //        buttonPanelLayout.setVerticalGroup(
+  //          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+  //          .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
+  //            .addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+  //                .addComponent(saveButton)
+  //                .addComponent(cancelButton))
+  //            .addContainerGap()));
+
+
+          JButton backButton = new JButton();
+          backButton.setText(messages.getString(BUTTON_BACK));
+          backButton.setActionCommand(cancelCommand);
+          backButton.addActionListener(cancelListener);
+
+          JButton saveButton = new JButton();
+          saveButton.setText(messages.getString(BUTTON_SAVE));
+          saveButton.setActionCommand(saveCommand);
+          saveButton.addActionListener(saveListener);
+
+          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+          buttonPanel.setLayout(buttonPanelLayout);
+
+  //        buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
+          buttonPanelLayout.setHorizontalGroup(
+            buttonPanelLayout.createSequentialGroup()
+                  .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());//);
+          buttonPanelLayout.setVerticalGroup(
+            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
+                  .addComponent(saveButton)
+                  .addComponent(backButton)); 
+
+          contentPanel.validate();
+        }
+      });
     }
 
-    private void showSaveHashDataInputDialog(HashDataInput signedRef, ActionListener okListener, String okCommand) {
-        String dir = System.getProperty("user.home");
-        JFileChooser fileDialog = new JFileChooser(dir);
-        fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
-        fileDialog.setMultiSelectionEnabled(false);
-        fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVE));
-        fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
-        fileDialog.setFileHidingEnabled(true);
-        MimeFilter mimeFilter = new MimeFilter(signedRef.getMimeType());
-        fileDialog.setFileFilter(mimeFilter);
-        String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + mimeFilter.getExtension();
-        fileDialog.setSelectedFile(new File(dir, filename));
-        switch (fileDialog.showSaveDialog(contentPane)) {
+//    private DisposableFileChooser fileDialog;
+    
+    private void showSaveHashDataInputDialog(final List<HashDataInput> signedRefs, final ActionListener okListener, final String okCommand) {
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+        @Override
+        public void run() {
+          String userHome = System.getProperty("user.home");
+          
+          JFileChooser fileDialog = new JFileChooser(userHome); 
+          fileDialog.setMultiSelectionEnabled(false);
+          fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
+          fileDialog.setFileHidingEnabled(true);
+          if (signedRefs.size() == 1) {
+            fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVE));
+            fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
+            String mimeType = signedRefs.get(0).getMimeType();
+            MimeFilter mimeFilter = new MimeFilter(mimeType, messages);
+            fileDialog.setFileFilter(mimeFilter);
+            String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + MimeFilter.getExtension(mimeType);
+            fileDialog.setSelectedFile(new File(userHome, filename));
+          } else {
+            fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVEDIR));
+            fileDialog.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+          }
+          
+          //parent contentPane -> placed over applet
+          switch (fileDialog.showSaveDialog(fileDialog)) {
             case JFileChooser.APPROVE_OPTION:
-                File f = fileDialog.getSelectedFile();
-                if (f.exists()) {
-//                                    log.debug("hashDataInput file exists, overwrite?");
-                    String ovrwrt = messages.getString(MESSAGE_OVERWRITE);
-                    int overwrite = JOptionPane.showConfirmDialog(contentPane, MessageFormat.format(ovrwrt, filename), messages.getString(WINDOWTITLE_OVERWRITE), JOptionPane.OK_CANCEL_OPTION);
-                    if (overwrite != JOptionPane.OK_OPTION) {
-//                                        log.debug("User canceled overwrite HashDataInput, returning to SignaturePin dialog");
-                        okListener.actionPerformed(new ActionEvent(fileDialog, ActionEvent.ACTION_PERFORMED, okCommand));
-                        return;
-                    }
+              File f = fileDialog.getSelectedFile();
+              for (HashDataInput hashDataInput : signedRefs) {
+                String mimeType = hashDataInput.getMimeType();
+                String id = hashDataInput.getReferenceId();
+                File file;
+                if (f.isDirectory()) {
+                  String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + '_' + id + MimeFilter.getExtension(mimeType);
+                  file = new File(f, filename);
+                } else {
+                  file = f;
+                }
+                if (file.exists()) {
+                  String ovrwrt = messages.getString(MESSAGE_OVERWRITE);
+                  int overwrite = JOptionPane.showConfirmDialog(fileDialog, MessageFormat.format(ovrwrt, file), messages.getString(WINDOWTITLE_OVERWRITE), JOptionPane.OK_CANCEL_OPTION);
+                  if (overwrite != JOptionPane.OK_OPTION) {
+                    continue;
+                  }
                 }
                 if (log.isDebugEnabled()) {
-                    log.debug("Writing HashDataInput " + signedRef.getReferenceId() + " (" + signedRef.getMimeType() + ") to file " + f);
+                    log.debug("Writing HashDataInput " + id + " (" + mimeType + ") to file " + file);
                 }
                 FileOutputStream fos = null;
                 try {
-                    fos = new FileOutputStream(f);
+                    fos = new FileOutputStream(file);
                     BufferedOutputStream bos = new BufferedOutputStream(fos);
-                    InputStream hdi = signedRef.getHashDataInput();
+                    InputStream hdi = hashDataInput.getHashDataInput();
                     int b;
                     while ((b = hdi.read()) != -1) {
                         bos.write(b);
@@ -1134,7 +1200,7 @@ public class BKUGUI implements BKUGUIFacade {
                     bos.flush();
                     bos.close();
                 } catch (IOException ex) {
-                    log.error("Failed to write HashDataInput to file " + f + ": " + ex.getMessage());
+                    log.error("Failed to write HashDataInput to file " + file + ": " + ex.getMessage());
                     showErrorDialog("Failed to write signed reference to file: " + ex.getMessage(), null, null);
                     ex.printStackTrace();
                 } finally {
@@ -1142,11 +1208,15 @@ public class BKUGUI implements BKUGUIFacade {
                         fos.close();
                     } catch (IOException ex) {
                     }
-                }
+                }    
+              }  
+          }
+          log.debug("done saving hashdatainput");
+          okListener.actionPerformed(new ActionEvent(fileDialog, ActionEvent.ACTION_PERFORMED, okCommand));
         }
-        okListener.actionPerformed(new ActionEvent(fileDialog, ActionEvent.ACTION_PERFORMED, okCommand));
+      });
     }
-
+    
     @Override
     public void showWaitDialog(final String waitMessage) {
         SwingUtilities.invokeLater(new Runnable() {
@@ -1190,149 +1260,4 @@ public class BKUGUI implements BKUGUIFacade {
         return null;
     }
 
-    class PINDocument extends PlainDocument {
-
-        private PINSpec pinSpec;
-        private Pattern pinPattern;
-        private JButton enterButton;
-
-        public PINDocument(PINSpec pinSpec, JButton enterButton) {
-            this.pinSpec = pinSpec;
-            if (pinSpec.getRexepPattern() != null) {
-                pinPattern = Pattern.compile(pinSpec.getRexepPattern());
-            } else {
-                pinPattern = Pattern.compile(".");
-            }
-            this.enterButton = enterButton;
-        }
-
-        @Override
-        public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
-            if (pinSpec.getMaxLength() >= (getLength() + str.length())) {
-                boolean matches = true;
-                for (int i = 0; i < str.length(); i++) {
-                    Matcher m = pinPattern.matcher(str.substring(i, i + 1));
-                    if (!m.matches()) {
-                        matches = false;
-                    }
-                }
-                if (matches) {
-                    super.insertString(offs, str, a);
-                }
-            }
-            enterButton.setEnabled(getLength() >= pinSpec.getMinLength());
-        }
-
-        @Override
-        public void remove(int offs, int len) throws BadLocationException {
-            super.remove(offs, len);
-            enterButton.setEnabled(getLength() >= pinSpec.getMinLength());
-        }
-    }
-
-    class MimeFilter extends FileFilter {
-
-        protected String mimeType;
-
-        public MimeFilter(String mimeType) {
-            this.mimeType = mimeType;
-        }
-
-        @Override
-        public boolean accept(File f) {
-
-            if (f.isDirectory()) {
-                return true;
-            }
-
-            String ext = getExtension(f);
-            if ("text/xml".equals(mimeType)) {
-                return "xml".equalsIgnoreCase(ext);
-            } else if ("text/html".equals(mimeType)) {
-                return "html".equalsIgnoreCase(ext) || "htm".equalsIgnoreCase(ext);
-            } else if ("application/xhtml+xml".equals(mimeType)) {
-                return "xhtml".equalsIgnoreCase(ext);
-            } else if ("text/plain".equals(mimeType)) {
-                return "txt".equalsIgnoreCase(ext);
-            } else if ("application/pdf".equals(mimeType)) {
-                return "pdf".equalsIgnoreCase(ext);
-            } else {
-                return true;
-            }
-        }
-
-        private String getExtension(File f) {
-            String ext = null;
-            String s = f.getName();
-            int i = s.lastIndexOf('.');
-
-            if (i > 0 && i < s.length() - 1) {
-                ext = s.substring(i + 1).toLowerCase();
-            }
-            return ext;
-        }
-
-        @Override
-        public String getDescription() {
-            if ("text/xml".equals(mimeType)) {
-                return messages.getString(MIMETYPE_DESC_XML);
-            } else if ("text/html".equals(mimeType)) {
-                return messages.getString(MIMETYPE_DESC_HTML);
-            } else if ("application/xhtml+xml".equals(mimeType)) {
-                return messages.getString(MIMETYPE_DESC_XHTML);
-            } else if ("text/plain".equals(mimeType)) {
-                return messages.getString(MIMETYPE_DESC_TXT);
-            } else if ("application/pdf".equals(mimeType)) {
-                return messages.getString(MIMETYPE_DESC_PDF);
-            } else {
-                return messages.getString(MIMETYPE_DESC_BIN);
-            }
-        }
-
-        public String getExtension() {
-            if ("text/xml".equals(mimeType)) {
-                return ".xml";
-            } else if ("text/html".equals(mimeType)) {
-                return ".html";
-            } else if ("application/xhtml+xml".equals(mimeType)) {
-                return ".xhtml";
-            } else if ("text/plain".equals(mimeType)) {
-                return ".txt";
-            } else if ("application/pdf".equals(mimeType)) {
-                return ".pdf";
-            } else {
-                return ".bin";
-            }
-        }
-    }
-
-    class HashDataTableModel extends DefaultTableModel {
-
-        Class[] types = new Class[]{
-            java.lang.String.class, java.lang.Boolean.class
-        };
-        
-        public HashDataTableModel(List<HashDataInput> signedReferences) {
-            super(0, 2);
-            for (HashDataInput hashDataInput : signedReferences) {
-                addRow(new Object[]{hashDataInput.getReferenceId(), new Boolean(true)});
-            }
-        }
-
-        @Override
-        public Class getColumnClass(int columnIndex) {
-            return types [columnIndex];
-        }
-
-        public List<String> getSelectedReferenceIds() {
-            ArrayList<String> selection = new ArrayList<String>();
-            for (Object row : dataVector) {
-                if ((Boolean) ((Vector) row).elementAt(1)) {
-                    selection.add((String) ((Vector) row).elementAt(0));
-                }
-            }
-            return selection;
-        }
-        
-    }
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index f8b80556..f4b6325d 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -53,6 +53,8 @@ public interface BKUGUIFacade {
     
     public void showHashDataInputDialog(List<HashDataInput> signedReferences, ActionListener okListener, String actionCommand);
     
+//    public void showPlainTextHashDataInputDialog(String text, ActionListener saveListener, String saveCommand, ActionListener cancelListener, String cancelCommand);
+    
     public void showErrorDialog(String errorMsg, ActionListener okListener, String actionCommand);
     
     public void showErrorDialog(String errorMsg);
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
new file mode 100644
index 00000000..061a2849
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
@@ -0,0 +1,71 @@
+/*
+* 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.
+*/
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.stal.HashDataInput;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+import javax.swing.table.DefaultTableModel;
+
+/**
+ *
+ * @author clemens
+ */
+class HashDataTableModel extends DefaultTableModel {
+
+      protected List<HashDataInput> signedReferences;
+      
+      Class[] types = new Class[]{
+          java.lang.String.class, java.lang.Boolean.class
+      };
+        
+      public HashDataTableModel(List<HashDataInput> signedReferences) {
+          super(0, 2);
+          this.signedReferences = signedReferences;
+          for (HashDataInput hashDataInput : signedReferences) {
+            String desc = hashDataInput.getReferenceId() + " (" + hashDataInput.getMimeType() + ")";
+            addRow(new Object[]{desc, new Boolean(true)});
+          }
+      }
+
+      @Override
+      public Class getColumnClass(int columnIndex) {
+          return types [columnIndex];
+      }
+
+      public List<HashDataInput> getSelectedHashData() {
+        ArrayList<HashDataInput> selection = new ArrayList<HashDataInput>();
+        for (int i = 0; i < dataVector.size(); i++) {
+          if ((Boolean) ((Vector) dataVector.get(i)).elementAt(1)) {
+            selection.add(signedReferences.get(i));
+          }
+        }
+        return selection;
+      }
+
+//        public List<String> getSelectedReferenceIds() {
+//            ArrayList<String> selection = new ArrayList<String>();
+//            for (Object row : dataVector) {
+//                if ((Boolean) ((Vector) row).elementAt(1)) {
+//                    selection.add((String) ((Vector) row).elementAt(0));
+//                }
+//            }
+//            return selection;
+//        }
+        
+    }
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/MimeFilter.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/MimeFilter.java
new file mode 100644
index 00000000..6ee61a82
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/MimeFilter.java
@@ -0,0 +1,98 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package at.gv.egiz.bku.gui;
+
+import java.io.File;
+import java.util.ResourceBundle;
+import javax.swing.filechooser.FileFilter;
+
+/**
+ *
+ * @author clemens
+ */
+class MimeFilter extends FileFilter {
+
+  private static final String MIMETYPE_DESC_XML = "mimetype.desc.xml";
+  private static final String MIMETYPE_DESC_HTML = "mimetype.desc.html";
+  private static final String MIMETYPE_DESC_XHTML = "mimetype.desc.xhtml";
+  private static final String MIMETYPE_DESC_TXT = "mimetype.desc.txt";
+  private static final String MIMETYPE_DESC_PDF = "mimetype.desc.pdf";
+  private static final String MIMETYPE_DESC_BIN = "mimetype.desc.bin";
+
+  protected String mimeType;
+  protected ResourceBundle messages;
+
+  public MimeFilter(String mimeType, ResourceBundle messages) {
+    this.mimeType = mimeType;
+    this.messages = messages;
+  }
+
+  @Override
+  public boolean accept(File f) {
+
+    if (f.isDirectory()) {
+      return true;
+    }
+
+    String ext = getExtension(f);
+    if ("text/xml".equals(mimeType)) {
+      return "xml".equalsIgnoreCase(ext);
+    } else if ("text/html".equals(mimeType)) {
+      return "html".equalsIgnoreCase(ext) || "htm".equalsIgnoreCase(ext);
+    } else if ("application/xhtml+xml".equals(mimeType)) {
+      return "xhtml".equalsIgnoreCase(ext);
+    } else if ("text/plain".equals(mimeType)) {
+      return "txt".equalsIgnoreCase(ext);
+    } else if ("application/pdf".equals(mimeType)) {
+      return "pdf".equalsIgnoreCase(ext);
+    } else {
+      return true;
+    }
+  }
+
+  private String getExtension(File f) {
+    String ext = null;
+    String s = f.getName();
+    int i = s.lastIndexOf('.');
+
+    if (i > 0 && i < s.length() - 1) {
+      ext = s.substring(i + 1).toLowerCase();
+    }
+    return ext;
+  }
+
+  @Override
+  public String getDescription() {
+    if ("text/xml".equals(mimeType)) {
+      return messages.getString(MIMETYPE_DESC_XML);
+    } else if ("text/html".equals(mimeType)) {
+      return messages.getString(MIMETYPE_DESC_HTML);
+    } else if ("application/xhtml+xml".equals(mimeType)) {
+      return messages.getString(MIMETYPE_DESC_XHTML);
+    } else if ("text/plain".equals(mimeType)) {
+      return messages.getString(MIMETYPE_DESC_TXT);
+    } else if ("application/pdf".equals(mimeType)) {
+      return messages.getString(MIMETYPE_DESC_PDF);
+    } else {
+      return messages.getString(MIMETYPE_DESC_BIN);
+    }
+  }
+
+  public static String getExtension(String mimeType) {
+    if ("text/xml".equals(mimeType)) {
+      return ".xml";
+    } else if ("text/html".equals(mimeType)) {
+      return ".html";
+    } else if ("application/xhtml+xml".equals(mimeType)) {
+      return ".xhtml";
+    } else if ("text/plain".equals(mimeType)) {
+      return ".txt";
+    } else if ("application/pdf".equals(mimeType)) {
+      return ".pdf";
+    } else {
+      return ".bin";
+    }
+  }
+}
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
new file mode 100644
index 00000000..e8572742
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
@@ -0,0 +1,58 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.smcc.PINSpec;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.swing.JButton;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.PlainDocument;
+
+/**
+ *
+ * @author clemens
+ */
+class PINDocument extends PlainDocument {
+
+        private PINSpec pinSpec;
+        private Pattern pinPattern;
+        private JButton enterButton;
+
+        public PINDocument(PINSpec pinSpec, JButton enterButton) {
+            this.pinSpec = pinSpec;
+            if (pinSpec.getRexepPattern() != null) {
+                pinPattern = Pattern.compile(pinSpec.getRexepPattern());
+            } else {
+                pinPattern = Pattern.compile(".");
+            }
+            this.enterButton = enterButton;
+        }
+
+        @Override
+        public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
+            if (pinSpec.getMaxLength() >= (getLength() + str.length())) {
+                boolean matches = true;
+                for (int i = 0; i < str.length(); i++) {
+                    Matcher m = pinPattern.matcher(str.substring(i, i + 1));
+                    if (!m.matches()) {
+                        matches = false;
+                    }
+                }
+                if (matches) {
+                    super.insertString(offs, str, a);
+                }
+            }
+            enterButton.setEnabled(getLength() >= pinSpec.getMinLength());
+        }
+
+        @Override
+        public void remove(int offs, int len) throws BadLocationException {
+            super.remove(offs, len);
+            enterButton.setEnabled(getLength() >= pinSpec.getMinLength());
+        }
+    }
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index b651fa8d..a329ba86 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -23,6 +23,7 @@ title.retry=<html>Falscher PIN</html>
 title.wait=<html>Bitte warten</html>
 title.hashdata=<html>Signaturdaten</html>
 windowtitle.save=Signaturdaten speichern
+windowtitle.savedir=Signaturdaten in Verzeichnis speichern
 windowtitle.overwrite=Datei \u00FCberschreiben?
 message.wait=<html>Bitte warten...</html>
 message.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken</html>
@@ -34,16 +35,16 @@ message.retries=<html>Noch {0} Versuche</html>
 message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
 label.pin=<html>{0}:</html>
 label.pinsize=<html>({0} stellig)</html>
-error.hashdata=<html>Keine Signaturdaten verf\u00FCgbar</html>
+error.no.hashdata=<html>Keine Signaturdaten verf\u00FCgbar</html>
 button.ok=OK
 button.cancel=Abbrechen
 button.back=Zur\u00FCck
 button.sign=Signieren
 button.save=Speichern...
-mimetype.desc.xml=XML-Dateien (*.xml)
-mimetype.desc.html=HTML-Dateien (*.html, *.htm)
-mimetype.desc.xhtml=XHTML-Dateien (*.xhtml)
-mimetype.desc.txt=Textdateien (*.txt)
-mimetype.desc.pdf=Adobe PDF-Dateien (*.pdf)
-mimetype.desc.bin=Bin\u00E4rdateien (*.bin)
+mimetype.desc.xml=XML-Dateien (.xml)
+mimetype.desc.html=HTML-Dateien (.html, .htm)
+mimetype.desc.xhtml=XHTML-Dateien (.xhtml)
+mimetype.desc.txt=Textdateien (.txt)
+mimetype.desc.pdf=Adobe PDF-Dateien (.pdf)
+mimetype.desc.bin=Bin\u00E4rdateien (.bin)
 save.hashdatainput.prefix=Signaturdaten
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 4367f642..85f05435 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
@@ -1,19 +1,19 @@
 /*
-* 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.
-*/
+ * 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.
+ */
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
@@ -35,137 +35,137 @@ import java.util.List;
  */
 public class BKUGUIWorker implements Runnable {
 
-    BKUGUIFacade gui;
+  BKUGUIFacade gui;
 
-    public void init(BKUGUIFacade gui) {
-        this.gui = gui;
-    }
+  public void init(BKUGUIFacade gui) {
+    this.gui = gui;
+  }
 
-    @Override
-    public void run() {
+  @Override
+  public void run() {
 //        try {
 
-            final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Signatur-PIN");
-
-            
-            final ActionListener cancelListener = new ActionListener() {
-
-                public void actionPerformed(ActionEvent e) {
-                    System.out.println("CANCEL EVENT OCCURED: " + e);
-                }
-            };
-            ActionListener okListener = new ActionListener() {
-
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    System.out.println("OK EVENT OCCURED: " + e);
-                }
-            };
-            final ActionListener signListener = new ActionListener() {
-
-                public void actionPerformed(ActionEvent e) {
-                    System.out.println("SIGN EVENT OCCURED: " + e);
-                }
-            };
-            ActionListener hashdataListener = new ActionListener() {
-
-                public void actionPerformed(ActionEvent e) {
-                    System.out.println("HASHDATA EVENT OCCURED: " + e);
-                    ActionListener returnListener = new ActionListener() {
-
-                        @Override
-                        public void actionPerformed(ActionEvent e) {
-                            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", null, "hashdata");
-                        }
-                    };
-                    HashDataInput signedRef1 = new HashDataInput() {
-
-                        @Override
-                        public InputStream getHashDataInput() {
-                            return new ByteArrayInputStream("HashDataInput_001\n12345\n\tHello, world!\n12345\n\n12345\n6789\nblabla".getBytes());
-                        }
-
-                        @Override
-                        public String getMimeType() {
-                            return "text/plain";
-                        }
-
-                        @Override
-                        public String getReferenceId() {
-                            return "Reference-ref1-00000000000000000000001";
-                        }
-                    };
-                    HashDataInput signedRef2 = new HashDataInput() {
-
-                        @Override
-                        public InputStream getHashDataInput() {
-                            return new ByteArrayInputStream("<xml>HashDataInput_002</xml>".getBytes());
-                        }
-
-                        @Override
-                        public String getMimeType() {
-                            return "text/xml";
-                        }
-
-                        @Override
-                        public String getReferenceId() {
-                            return "Reference-ref2-00000000000000000000002";
-                        }
-                    };
-                    HashDataInput signedRef3 = new HashDataInput() {
-
-                        @Override
-                        public InputStream getHashDataInput() {
-                            return new ByteArrayInputStream("<xml>HashDataInput_003</xml>".getBytes());
-                        }
-
-                        @Override
-                        public String getMimeType() {
-                            return "text/xml";
-                        }
-
-                        @Override
-                        public String getReferenceId() {
-                            return "Reference-ref3-00000000000000000000003";
-                        }
-                    };
-                    HashDataInput signedRef4 = new HashDataInput() {
-
-                        @Override
-                        public InputStream getHashDataInput() {
-                            return new ByteArrayInputStream("<xml>HashDataInput_004</xml>".getBytes());
-                        }
-
-                        @Override
-                        public String getMimeType() {
-                            return "text/xml";
-                        }
-
-                        @Override
-                        public String getReferenceId() {
-                            return "ref4";
-                        }
-                    };
-                    
-                    //
-                    List<HashDataInput> signedRefs = new ArrayList();
-                    signedRefs.add(signedRef1);
+    final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Signatur-PIN");
+
+
+    final ActionListener cancelListener = new ActionListener() {
+
+      public void actionPerformed(ActionEvent e) {
+        System.out.println("CANCEL EVENT OCCURED: " + e);
+      }
+    };
+    ActionListener okListener = new ActionListener() {
+
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        System.out.println("OK EVENT OCCURED: " + e);
+      }
+    };
+    final ActionListener signListener = new ActionListener() {
+
+      public void actionPerformed(ActionEvent e) {
+        System.out.println("SIGN EVENT OCCURED: " + e);
+      }
+    };
+    ActionListener hashdataListener = new ActionListener() {
+
+      public void actionPerformed(ActionEvent e) {
+        System.out.println("HASHDATA EVENT OCCURED: " + e);
+        ActionListener returnListener = new ActionListener() {
+
+          @Override
+          public void actionPerformed(ActionEvent e) {
+            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", null, "hashdata");
+          }
+        };
+        HashDataInput signedRef1 = new HashDataInput() {
+
+          @Override
+          public InputStream getHashDataInput() {
+            return new ByteArrayInputStream("oialfx HashDataInput_001\n12345\n\tHello, world!\n12345\n\n12345\n6789\nblabla".getBytes());
+          }
+
+          @Override
+          public String getMimeType() {
+            return "text/plain";
+          }
+
+          @Override
+          public String getReferenceId() {
+            return "Reference-ref1-00000000000000000000001";
+          }
+        };
+        HashDataInput signedRef2 = new HashDataInput() {
+
+          @Override
+          public InputStream getHashDataInput() {
+            return new ByteArrayInputStream("<xml>HashDataInput_002</xml>".getBytes());
+          }
+
+          @Override
+          public String getMimeType() {
+            return "text/xml";
+          }
+
+          @Override
+          public String getReferenceId() {
+            return "Reference-ref2-00000000000000000000002";
+          }
+        };
+        HashDataInput signedRef3 = new HashDataInput() {
+
+          @Override
+          public InputStream getHashDataInput() {
+            return new ByteArrayInputStream("<xml>HashDataInput_003</xml>".getBytes());
+          }
+
+          @Override
+          public String getMimeType() {
+            return "text/xml";
+          }
+
+          @Override
+          public String getReferenceId() {
+            return "Reference-ref3-00000000000000000000003";
+          }
+        };
+        HashDataInput signedRef4 = new HashDataInput() {
+
+          @Override
+          public InputStream getHashDataInput() {
+            return new ByteArrayInputStream("<xml>HashDataInput_004</xml>".getBytes());
+          }
+
+          @Override
+          public String getMimeType() {
+            return "text/xml";
+          }
+
+          @Override
+          public String getReferenceId() {
+            return "ref4";
+          }
+        };
+
+        //
+        List<HashDataInput> signedRefs = new ArrayList();
+        signedRefs.add(signedRef1);
                     signedRefs.add(signedRef2);
                     signedRefs.add(signedRef3);
                     signedRefs.add(signedRef4);
 //                    signedRefs = Collections.singletonList(signedRef1);
-                    gui.showHashDataInputDialog(signedRefs, returnListener, "return");
-                }
-            };
-           
+        gui.showHashDataInputDialog(signedRefs, returnListener, "return");
+      }
+    };
+
 
 
 //        gui.showWelcomeDialog();
 //
 //        Thread.sleep(2000);
-        
+
 //            gui.showInsertCardDialog(cancelListener, "cancel");
-            
+
 //            Thread.sleep(2000);
 //            
 //            gui.showCardNotSupportedDialog(cancelListener, "cancel");
@@ -178,11 +178,11 @@ public class BKUGUIWorker implements Runnable {
 //            
 //            Thread.sleep(2000);
 //
-            
-            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+
+    gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
 
 //            Thread.sleep(2000);
-            
+
 //            gui.showSignaturePINRetryDialog(signPinSpec, 2, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
 //
 //            Thread.sleep(2000);
@@ -192,13 +192,13 @@ public class BKUGUIWorker implements Runnable {
 //            Thread.sleep(2000);
 //            
 //            gui.showErrorDialog("Testfehler occured"); 
-            
-            
+
+
 //            gui.showTextPlainHashDataInput("hallo,\n welt!", "12345", null, "cancel", null, "save");
 //            Thread.sleep(2000);
 
 //        } catch (InterruptedException ex) {
 //            ex.printStackTrace();
 //        }
-    }
+  }
 }
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index d31367a8..a50954cd 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -58,11 +58,13 @@
 			<version>1.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
-		<!--
-			dependency> <groupId>at.gv.egiz</groupId>
-			<artifactId>BKUApplet</artifactId> <version>1.0-SNAPSHOT</version>
-			<scope>provided</scope> </dependency
-		-->
+        <!-- build BKUApplet prior to BKUOnline -->
+        <dependency>
+          <groupId>at.gv.egiz</groupId>
+          <artifactId>BKUApplet</artifactId> 
+          <version>1.0-SNAPSHOT</version>
+          <scope>provided</scope> 
+        </dependency>
 		<!--
 			| see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
 		-->
@@ -177,4 +179,5 @@
 			</plugin>
 		</plugins>
 	</build>
+>>>>>>> .r33
 </project>
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index 1f84300a..d37d0551 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -47,6 +47,8 @@ import at.gv.egiz.stal.signedinfo.ObjectFactory;
 import at.gv.egiz.stal.signedinfo.ReferenceType;
 import at.gv.egiz.stal.signedinfo.SignedInfoType;
 import at.gv.egiz.stal.util.JCEAlgorithmNames;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -150,9 +152,6 @@ public class SignRequestHandler extends AbstractRequestHandler implements
                             hashDataInputs = getHashDataInputs(signedInfo.getReference());
                         }
                         gui.showHashDataInputDialog(hashDataInputs, this, "ok");
-                        waitForAction();
-                        gui.showSignaturePINDialog(spec, this, "sign", this, "cancel", this,
-                            "hashData");
                     } catch (Exception ex) {
                         //FIXME localize messages
                         log.error("Failed to obtain HashDataInputs: " + ex.getMessage());
@@ -178,6 +177,7 @@ public class SignRequestHandler extends AbstractRequestHandler implements
 
     /**
      * override by subclass
+     * @post-condition returned list != null
      * @return
      */
     protected List<HashDataInput> getHashDataInputs(List<ReferenceType> signedReferences) throws Exception {
-- 
cgit v1.2.3


From a288c99fa6955a2c9055b28dc1c805dacbe5fc93 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 15 Sep 2008 18:02:18 +0000
Subject: encoding

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@40 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 262 ++++++++++++++-------
 .../at/gv/egiz/bku/gui/HashDataTableModel.java     |  94 ++++----
 .../main/java/at/gv/egiz/bku/gui/MimeFilter.java   |  18 +-
 .../main/java/at/gv/egiz/bku/gui/PinDocument.java  |  19 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUITest.java   |   2 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |  24 +-
 6 files changed, 275 insertions(+), 144 deletions(-)

(limited to 'BKUCommonGUI')

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 584dba1a..5fb67982 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
@@ -23,10 +23,8 @@ package at.gv.egiz.bku.gui;
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.stal.HashDataInput;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Container;
 import java.awt.Cursor;
-import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -39,13 +37,10 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.MessageFormat;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import java.util.Vector;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.StringTokenizer;
 import javax.swing.GroupLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -59,15 +54,10 @@ 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.border.TitledBorder;
-import javax.swing.filechooser.FileFilter;
-import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
-import javax.swing.text.AttributeSet;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.PlainDocument;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -154,6 +144,7 @@ public class BKUGUI implements BKUGUIFacade {
 
             SwingUtilities.invokeAndWait(new Runnable() {
 
+                @Override
                 public void run() {
 
                     initIconPanel();
@@ -285,6 +276,7 @@ public class BKUGUI implements BKUGUIFacade {
     public void showLoginDialog(ActionListener loginListener, String actionCommand) {
         SwingUtilities.invokeLater(new Runnable() {
 
+      @Override
             public void run() {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
@@ -318,6 +310,7 @@ public class BKUGUI implements BKUGUIFacade {
     public void showWelcomeDialog() {
         SwingUtilities.invokeLater(new Runnable() {
 
+      @Override
             public void run() {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
@@ -352,6 +345,7 @@ public class BKUGUI implements BKUGUIFacade {
     public void showInsertCardDialog(final ActionListener cancelListener, final String cancelCommand) {
         SwingUtilities.invokeLater(new Runnable() {
 
+      @Override
             public void run() {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
@@ -388,6 +382,7 @@ public class BKUGUI implements BKUGUIFacade {
     public void showCardNotSupportedDialog(final ActionListener cancelListener, final String cancelCommand) {
         SwingUtilities.invokeLater(new Runnable() {
 
+      @Override
             public void run() {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
@@ -440,6 +435,7 @@ public class BKUGUI implements BKUGUIFacade {
     private void showCardPINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener okListener, final String okCommand, final ActionListener cancelListener, final String cancelCommand) {
         SwingUtilities.invokeLater(new Runnable() {
 
+      @Override
             public void run() {
 
                 mainPanel.removeAll();
@@ -599,6 +595,7 @@ public class BKUGUI implements BKUGUIFacade {
     private void showSignaturePINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener signListener, final String signCommand, final ActionListener cancelListener, final String cancelCommand, final ActionListener hashdataListener, final String hashdataCommand) {
         SwingUtilities.invokeLater(new Runnable() {
 
+      @Override
             public void run() {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
@@ -763,6 +760,7 @@ public class BKUGUI implements BKUGUIFacade {
     public void showErrorDialog(final String errorMsg, final ActionListener okListener, final String okCommand) {
         SwingUtilities.invokeLater(new Runnable() {
 
+      @Override
             public void run() {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
@@ -845,6 +843,50 @@ public class BKUGUI implements BKUGUIFacade {
       });
     }
 
+    @Override
+    public void showWaitDialog(final String waitMessage) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+      @Override
+            public void run() {
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+                titleLabel.setText(messages.getString(TITLE_WAIT));
+
+                JLabel waitMsgLabel = new JLabel();
+                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                if (waitMessage != null) {
+                    waitMsgLabel.setText("<html>" + waitMessage + "</html>");
+                } else {
+                    waitMsgLabel.setText("<html>" + messages.getString(MESSAGE_WAIT) + "</html>");
+                }
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(waitMsgLabel)
+                  .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(waitMsgLabel));
+
+                contentPanel.validate();
+            }
+        });
+    }
+
+    @Override
+    public char[] getPin() {
+        if (pinField != null) {
+            return pinField.getPassword();
+        }
+        return null;
+    }
+    
     @Override
     public void showHashDataInputDialog(final List<HashDataInput> signedReferences, final ActionListener okListener, final String okCommand) {
       
@@ -891,32 +933,6 @@ public class BKUGUI implements BKUGUIFacade {
       }
     }
     
-     private static String getText(HashDataInput hdi) {
-      ByteArrayOutputStream baos = null;
-      try {
-        InputStream hashDataIS = hdi.getHashDataInput();
-        if (hashDataIS == null) {
-          log.error("No HashDataInput stream for reference " + hdi.getReferenceId());
-          return null;
-        } else {
-          baos = new ByteArrayOutputStream(hashDataIS.available());
-          int c;
-          while ((c = hashDataIS.read()) != -1) {
-              baos.write(c);
-          }
-          return baos.toString("UTF-8");
-        }
-      } catch (IOException ex) {
-          log.error("Failed to read HashDataInput for reference " + hdi.getReferenceId() + ": " + ex.getMessage());
-          return null;
-      } finally {
-          try {
-              baos.close();
-          } catch (IOException ex) {
-          }
-      }
-    }
-
     private void showPlainTextHashDataInputDialog(final String hashDataText, final ActionListener saveListener, final String saveCommand, final ActionListener cancelListener, final String cancelCommand) {
       SwingUtilities.invokeLater(new Runnable() {
 
@@ -931,13 +947,16 @@ public class BKUGUI implements BKUGUIFacade {
           refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
           refIdLabel.setText(messages.getString(MESSAGE_HASHDATA)); //MessageFormat.format(refIdLabelPattern, new Object[]{refId}));
 
-          JScrollPane hashDataScrollPane = new JScrollPane();
           JTextArea hashDataTextArea = new JTextArea(hashDataText);
           hashDataTextArea.setEditable(false);
-          hashDataTextArea.setColumns(1);
-          hashDataTextArea.setRows(1);
+//          hashDataTextArea.setColumns(1);
+//          hashDataTextArea.setRows(1);
           hashDataTextArea.setFont(new Font(HASHDATA_FONT, hashDataTextArea.getFont().getStyle(), hashDataTextArea.getFont().getSize()));
-          hashDataScrollPane.setViewportView(hashDataTextArea);
+//          hashDataScrollPane.setViewportView(hashDataTextArea);
+//          hashDataScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); //HORIZONTAL_SCROLLBAR_NEVER);
+
+
+          JScrollPane hashDataScrollPane = new JScrollPane(hashDataTextArea);
 
           GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
           mainPanel.setLayout(mainPanelLayout);
@@ -946,16 +965,14 @@ public class BKUGUI implements BKUGUIFacade {
             mainPanelLayout.createSequentialGroup()
                   .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                       .addComponent(refIdLabel)
-                      .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                      .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE))
                   .addContainerGap());
 
           mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createSequentialGroup()
                   .addComponent(refIdLabel)
                   .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                  .addComponent(hashDataScrollPane, 0, GroupLayout.PREFERRED_SIZE, hashDataTextArea.getPreferredSize().height+3));
-
-
+                  .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
 
   //        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
   //        mainPanel.setLayout(mainPanelLayout);
@@ -1031,7 +1048,7 @@ public class BKUGUI implements BKUGUIFacade {
           selectCol.setMaxWidth(CHECKBOX_WIDTH);
 
 
-          hashDataTable.setPreferredScrollableViewportSize(mainPanel.getPreferredSize());
+//          hashDataTable.setPreferredScrollableViewportSize(mainPanel.getPreferredSize());
 
           JScrollPane hashDataScrollPane = new JScrollPane(hashDataTable);
 
@@ -1042,14 +1059,14 @@ public class BKUGUI implements BKUGUIFacade {
             mainPanelLayout.createSequentialGroup()
                   .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                       .addComponent(refIdLabel)
-                      .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                      .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE)) // GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                   .addContainerGap());
 
           mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createSequentialGroup()
                   .addComponent(refIdLabel)
                   .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                  .addComponent(hashDataScrollPane, 0, GroupLayout.PREFERRED_SIZE, hashDataTable.getPreferredSize().height+3));
+                  .addComponent(hashDataScrollPane, 0, 0, hashDataTable.getPreferredSize().height+3));
   //                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED));
 
 
@@ -1217,47 +1234,112 @@ public class BKUGUI implements BKUGUIFacade {
       });
     }
     
-    @Override
-    public void showWaitDialog(final String waitMessage) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            public void run() {
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                titleLabel.setText(messages.getString(TITLE_WAIT));
-
-                JLabel waitMsgLabel = new JLabel();
-                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                if (waitMessage != null) {
-                    waitMsgLabel.setText("<html>" + waitMessage + "</html>");
-                } else {
-                    waitMsgLabel.setText("<html>" + messages.getString(MESSAGE_WAIT) + "</html>");
-                }
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(waitMsgLabel)
-                  .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(waitMsgLabel));
-
-                contentPanel.validate();
-            }
-        });
-    }
-
-    @Override
-    public char[] getPin() {
-        if (pinField != null) {
-            return pinField.getPassword();
+    private static String getText(HashDataInput hdi) {
+      ByteArrayOutputStream baos = null;
+      try {
+        InputStream hashDataIS = hdi.getHashDataInput();
+        if (hashDataIS == null) {
+          log.error("No HashDataInput stream for reference " + hdi.getReferenceId());
+          return null;
+        } else {
+          baos = new ByteArrayOutputStream(hashDataIS.available());
+          int c;
+          while ((c = hashDataIS.read()) != -1) {
+              baos.write(c);
+          }
+          String encoding = hdi.getEncoding();
+          if (encoding == null) {
+            //default for URL-encoded
+            encoding = "UTF-8";
+          }
+          return baos.toString(encoding);
         }
-        return null;
+      } catch (IOException ex) {
+          log.error("Failed to read HashDataInput for reference " + hdi.getReferenceId() + ": " + ex.getMessage());
+          return null;
+      } finally {
+          try {
+              baos.close();
+          } catch (IOException ex) {
+          }
+      }
     }
-
+    
+//    private String parseToken(final char[] terminators) {
+//        char ch;
+//        i1 = pos;
+//        i2 = pos;
+//        while (hasChar()) {
+//            ch = chars[pos];
+//            if (isOneOf(ch, terminators)) {
+//                break;
+//            }
+//            i2++;
+//            pos++;
+//        }
+//        return getToken(false);
+//    }
+    
+//     private static String getCharset(String contentType) {
+//       
+//       StringTokenizer t = new StringTokenizer
+//       
+//       if (contentType == null) {
+//         return "UTF-8";
+//       }
+//       
+//       int pos = 0;
+//       int len = contentType.length();
+//       
+//       while (pos < len) {
+//         pos++;
+//         String paramName = parseToken(new char[] {
+//                    '=', separator });
+//       }
+//       
+//        HashMap params = new HashMap();
+//        this.chars = chars;
+//        this.pos = offset;
+//        this.len = length;
+//
+//        String paramName = null;
+//        String paramValue = null;
+//        while (hasChar()) {
+//            paramName = parseToken(new char[] {
+//                    '=', separator });
+//            paramValue = null;
+//            if (hasChar() && (chars[pos] == '=')) {
+//                pos++; // skip '='
+//                paramValue = parseQuotedToken(new char[] {
+//                        separator });
+//            }
+//            if (hasChar() && (chars[pos] == separator)) {
+//                pos++; // skip separator
+//            }
+//            if ((paramName != null) && (paramName.length() > 0)) {
+//                if (this.lowerCaseNames) {
+//                    paramName = paramName.toLowerCase();
+//                }
+//                params.put(paramName, paramValue);
+//            }
+//        }
+//        return params;
+//       
+//       
+//       
+//       Parser
+//      ParameterParser pf = new ParameterParser();
+//    pf.setLowerCaseNames(true);
+//    Map map = pf.parse(contentType, SEPERATOR);
+//    String retVal = (String) map.get(CHAR_SET);
+//    if ((retVal == null) && (replaceNullWithDefault)) {
+//      if (map.containsKey(APPLICATION_URL_ENCODED)) {
+//        // default charset for url encoded data
+//        return "UTF-8";
+//      }
+//      retVal = getDefaultCharset();
+//    }
+//    return retVal;
+//  }
+    
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
index 061a2849..1a833f48 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
@@ -1,19 +1,19 @@
 /*
-* 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.
-*/
+ * 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.
+ */
 package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.stal.HashDataInput;
@@ -28,37 +28,42 @@ import javax.swing.table.DefaultTableModel;
  */
 class HashDataTableModel extends DefaultTableModel {
 
-      protected List<HashDataInput> signedReferences;
-      
-      Class[] types = new Class[]{
-          java.lang.String.class, java.lang.Boolean.class
-      };
-        
-      public HashDataTableModel(List<HashDataInput> signedReferences) {
-          super(0, 2);
-          this.signedReferences = signedReferences;
-          for (HashDataInput hashDataInput : signedReferences) {
-            String desc = hashDataInput.getReferenceId() + " (" + hashDataInput.getMimeType() + ")";
-            addRow(new Object[]{desc, new Boolean(true)});
-          }
-      }
+  protected List<HashDataInput> signedReferences;
+  
+  protected Class[] types = new Class[]{
+    java.lang.String.class, java.lang.Boolean.class
+  };
 
-      @Override
-      public Class getColumnClass(int columnIndex) {
-          return types [columnIndex];
-      }
+  public HashDataTableModel(List<HashDataInput> signedReferences) {
+    super(0, 2);
+    this.signedReferences = signedReferences;
+    for (HashDataInput hashDataInput : signedReferences) {
+      String desc = hashDataInput.getReferenceId() + " (" + hashDataInput.getMimeType() + ")";
+      addRow(new Object[]{desc, new Boolean(true)});
+    }
+  }
 
-      public List<HashDataInput> getSelectedHashData() {
-        ArrayList<HashDataInput> selection = new ArrayList<HashDataInput>();
-        for (int i = 0; i < dataVector.size(); i++) {
-          if ((Boolean) ((Vector) dataVector.get(i)).elementAt(1)) {
-            selection.add(signedReferences.get(i));
-          }
-        }
-        return selection;
-      }
+  @Override
+  public Class getColumnClass(int columnIndex) {
+    return types[columnIndex];
+  }
 
-//        public List<String> getSelectedReferenceIds() {
+  @Override
+  public boolean isCellEditable(int rowIndex, int columnIndex) {
+    if (columnIndex == 1)
+      return true;
+    return false;
+  }
+
+  public List<HashDataInput> getSelectedHashData() {
+    ArrayList<HashDataInput> selection = new ArrayList<HashDataInput>();
+    for (int i = 0; i < dataVector.size(); i++) {
+      if ((Boolean) ((Vector) dataVector.get(i)).elementAt(1)) {
+        selection.add(signedReferences.get(i));
+      }
+    }
+    return selection;
+  }//        public List<String> getSelectedReferenceIds() {
 //            ArrayList<String> selection = new ArrayList<String>();
 //            for (Object row : dataVector) {
 //                if ((Boolean) ((Vector) row).elementAt(1)) {
@@ -67,5 +72,4 @@ class HashDataTableModel extends DefaultTableModel {
 //            }
 //            return selection;
 //        }
-        
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/MimeFilter.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/MimeFilter.java
index 6ee61a82..4b48081a 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/MimeFilter.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/MimeFilter.java
@@ -1,7 +1,19 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
+* 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.
+*/
 package at.gv.egiz.bku.gui;
 
 import java.io.File;
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
index e8572742..8ae9d7a3 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
@@ -1,8 +1,19 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
+* 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.
+*/
 package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.smcc.PINSpec;
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index a9c21a00..5f1bc8b2 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -39,7 +39,7 @@ public class BKUGUITest {
         JFrame testFrame = new JFrame("BKUGUITest");
         BKUGUI gui = new BKUGUI();
         Container contentPane = testFrame.getContentPane();
-        contentPane.setPreferredSize(new Dimension(500, 200));
+        contentPane.setPreferredSize(new Dimension(380, 150));
         gui.init(contentPane, null);
         BKUGUIWorker worker = new BKUGUIWorker();
         worker.init(gui);
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 85f05435..6cbc2cd1 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
@@ -82,7 +82,7 @@ public class BKUGUIWorker implements Runnable {
 
           @Override
           public InputStream getHashDataInput() {
-            return new ByteArrayInputStream("oialfx HashDataInput_001\n12345\n\tHello, world!\n12345\n\n12345\n6789\nblabla".getBytes());
+            return new ByteArrayInputStream("Ich bin ein einfacher Text mit Umlauten: öäüßéç@€\n123\n456\n\tHello, world!\n\nlkjsd\nnksdjf".getBytes());
           }
 
           @Override
@@ -94,6 +94,10 @@ public class BKUGUIWorker implements Runnable {
           public String getReferenceId() {
             return "Reference-ref1-00000000000000000000001";
           }
+          @Override
+          public String getEncoding() {
+            return "UTF-8";
+          }
         };
         HashDataInput signedRef2 = new HashDataInput() {
 
@@ -111,6 +115,10 @@ public class BKUGUIWorker implements Runnable {
           public String getReferenceId() {
             return "Reference-ref2-00000000000000000000002";
           }
+          @Override
+          public String getEncoding() {
+            return "UTF-8";
+          }
         };
         HashDataInput signedRef3 = new HashDataInput() {
 
@@ -128,6 +136,11 @@ public class BKUGUIWorker implements Runnable {
           public String getReferenceId() {
             return "Reference-ref3-00000000000000000000003";
           }
+          
+          @Override
+          public String getEncoding() {
+            return "UTF-8";
+          }
         };
         HashDataInput signedRef4 = new HashDataInput() {
 
@@ -145,6 +158,11 @@ public class BKUGUIWorker implements Runnable {
           public String getReferenceId() {
             return "ref4";
           }
+
+          @Override
+          public String getEncoding() {
+            return "UTF-8";
+          }
         };
 
         //
@@ -153,6 +171,10 @@ public class BKUGUIWorker implements Runnable {
                     signedRefs.add(signedRef2);
                     signedRefs.add(signedRef3);
                     signedRefs.add(signedRef4);
+//                    signedRefs.add(signedRef4);
+//                    signedRefs.add(signedRef4);
+//                    signedRefs.add(signedRef4);
+//                    signedRefs.add(signedRef4);
 //                    signedRefs = Collections.singletonList(signedRef1);
         gui.showHashDataInputDialog(signedRefs, returnListener, "return");
       }
-- 
cgit v1.2.3


From cf82096145bbdd548e388c1bc25f0e703b9b4624 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 17 Sep 2008 17:17:10 +0000
Subject: hashdatainput digest verification

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@44 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../bku/online/applet/WSSignRequestHandler.java    | 139 +++++++----
 .../gv/egiz/stal/impl/ByteArrayHashDataInput.java  |  58 +++++
 .../bku/local/stal/LocalSignRequestHandler.java    |  14 +-
 .../gv/egiz/stal/impl/ByteArrayHashDataInput.java  |  58 -----
 .../at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java  |   2 +-
 .../bku/smccstal/CashedHashDataInputResolver.java  |  27 ++
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   | 273 ++++++++++++++++-----
 7 files changed, 404 insertions(+), 167 deletions(-)
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
 delete mode 100644 STALService/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
 create mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/CashedHashDataInputResolver.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WSSignRequestHandler.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WSSignRequestHandler.java
index 5186de1a..6dae264c 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WSSignRequestHandler.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WSSignRequestHandler.java
@@ -16,15 +16,20 @@
  */
 package at.gv.egiz.bku.online.applet;
 
-import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.bku.smccstal.SMCCSTALRequestHandler;
 import at.gv.egiz.bku.smccstal.SignRequestHandler;
+import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
 import at.gv.egiz.stal.service.GetHashDataInputResponseType;
 import at.gv.egiz.stal.service.GetHashDataInputType;
 import at.gv.egiz.stal.service.STALPortType;
+import at.gv.egiz.stal.signedinfo.DigestMethodType;
 import at.gv.egiz.stal.signedinfo.ReferenceType;
+import java.security.DigestException;
+import java.security.MessageDigest;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -35,57 +40,101 @@ import org.apache.commons.logging.LogFactory;
  */
 public class WSSignRequestHandler extends SignRequestHandler {
 
-    private static final Log log = LogFactory.getLog(WSSignRequestHandler.class);
-    STALPortType stalPort;
-    String sessId;
+  private static final Log log = LogFactory.getLog(WSSignRequestHandler.class);
+  STALPortType stalPort;
+  String sessId;
 
-    public WSSignRequestHandler(String sessId, STALPortType stalPort) {
-        if (stalPort == null || sessId == null) {
-            throw new NullPointerException("STAL port must not be null");
-        }
-        this.sessId = sessId;
-        this.stalPort = stalPort;
+  public WSSignRequestHandler(String sessId, STALPortType stalPort) {
+    if (stalPort == null || sessId == null) {
+      throw new NullPointerException("STAL port must not be null");
     }
+    this.sessId = sessId;
+    this.stalPort = stalPort;
+  }
 
-    @Override
-    protected List<HashDataInput> getHashDataInputs(List<ReferenceType> dsigReferences) throws Exception {
-        GetHashDataInputType request = new GetHashDataInputType();
-        request.setSessionId(sessId);
-        for (ReferenceType dsigRef : dsigReferences) {
-            //don't get Manifest, QualifyingProperties, ...
-            if (dsigRef.getType() == null) {
-                String dsigRefId = dsigRef.getId();
-                if (dsigRefId != null) {
-                    GetHashDataInputType.Reference reference = new GetHashDataInputType.Reference();
-                    reference.setID(dsigRefId);
-                    request.getReference().add(reference);
-                } else {
-                    throw new Exception("Cannot get HashDataInput for dsig:Reference without Id attribute");
-                }
-            }
-        }
+  @Override
+  public List<HashDataInput> getCashedHashDataInputs(List<ReferenceType> signedReferences) throws Exception {
 
-        if (log.isDebugEnabled()) {
-            log.debug("Calling GetHashDataInput for session " + sessId);
-        }
-        GetHashDataInputResponseType response = stalPort.getHashDataInput(request);
-        ArrayList<HashDataInput> hashDataInputs = new ArrayList<HashDataInput>();
-        for (GetHashDataInputResponseType.Reference reference : response.getReference()) {
-            byte[] hdi = reference.getValue();
-            String id = reference.getID();
-            String mimeType = reference.getMimeType();
-            String encoding = reference.getEncoding();
+    GetHashDataInputType request = new GetHashDataInputType();
+    request.setSessionId(sessId);
+
+    HashMap<String, ReferenceType> idRefMap = new HashMap<String, ReferenceType>();
+    for (ReferenceType reference : signedReferences) {
+      //don't get Manifest, QualifyingProperties, ...
+      if (reference.getType() == null) {
+        String referenceId = reference.getId();
+        if (referenceId != null) {
+          idRefMap.put(referenceId, reference);
+          GetHashDataInputType.Reference ref = new GetHashDataInputType.Reference();
+          ref.setID(referenceId);
+          request.getReference().add(ref);
 
-            if (log.isDebugEnabled()) {
-                log.debug("Got HashDataInput " + id + " (" + mimeType + ";" + encoding + ")");
-            }
-            hashDataInputs.add(new ByteArrayHashDataInput(hdi, id, mimeType, encoding));
+        } else {
+          throw new Exception("Cannot resolve HashDataInput for reference without Id attribute");
         }
-        return hashDataInputs;
+      }
     }
 
-    @Override
-    public SMCCSTALRequestHandler newInstance() {
-        return new WSSignRequestHandler(this.sessId, this.stalPort);
+    if (log.isDebugEnabled()) {
+      log.debug("Calling GetHashDataInput for session " + sessId);
     }
+    GetHashDataInputResponseType response = stalPort.getHashDataInput(request);
+    ArrayList<HashDataInput> hashDataInputs = new ArrayList<HashDataInput>();
+
+    for (GetHashDataInputResponseType.Reference reference : response.getReference()) {
+
+      String id = reference.getID();
+      byte[] hdi = reference.getValue();
+      if (hdi == null) {
+        throw new Exception("Failed to resolve digest value for reference " + id);
+      }
+      String mimeType = reference.getMimeType();
+      String encoding = reference.getEncoding();
+
+      if (log.isDebugEnabled()) {
+        log.debug("Got HashDataInput " + id + " (" + mimeType + ";" + encoding + ")");
+      }
+
+      ReferenceType dsigRef = idRefMap.get(id);
+      DigestMethodType dm = dsigRef.getDigestMethod();
+      if (dm == null) {
+        throw new Exception("Failed to verify digest value for reference " + id + ": no digest algorithm");
+      }
+      //TODO 
+      String mdAlg = dm.getAlgorithm();
+      if ("http://www.w3.org/2000/09/xmldsig#sha1".equals(mdAlg))
+        mdAlg = "SHA-1";
+      else if ("http://www.w3.org/2001/04/xmlenc#sha256".equals(mdAlg))
+        mdAlg = "SHA-256";
+      else if ("http://www.w3.org/2001/04/xmlenc#sha224 ".equals(mdAlg))
+        mdAlg = "SHA-224";
+      else if ("http://www.w3.org/2001/04/xmldsig-more#sha224  ".equals(mdAlg))
+        mdAlg = "SHA-224";
+      else if ("http://www.w3.org/2001/04/xmldsig-more#sha384".equals(mdAlg))
+        mdAlg = "SHA-384";
+      else if ("http://www.w3.org/2001/04/xmlenc#sha512".equals(mdAlg))
+        mdAlg = "SHA-512";
+      else if ("http://www.w3.org/2001/04/xmldsig-more#md2 ".equals(mdAlg))
+        mdAlg = "MD2";
+      else if ("http://www.w3.org/2001/04/xmldsig-more#md5".equals(mdAlg))
+        mdAlg = "MD5";
+      else if ("http://www.w3.org/2001/04/xmlenc#ripemd160 ".equals(mdAlg))
+        mdAlg = "RipeMD-160";
+      MessageDigest md = MessageDigest.getInstance(mdAlg);
+      byte[] hdiDigest = md.digest(hdi);
+      if (log.isDebugEnabled())
+        log.debug("Comparing digest values... "); 
+      if (!Arrays.equals(hdiDigest, dsigRef.getDigestValue())) {
+        log.error("digest values differ: " + new String(hdiDigest) + ", " + new String(dsigRef.getDigestValue()));
+        throw new DigestException("Bad digest value for reference " + id + ": " + dsigRef.getDigestValue());
+      }
+      hashDataInputs.add(new ByteArrayHashDataInput(hdi, id, mimeType, encoding));
+    }
+    return hashDataInputs;
+  }
+
+  @Override
+  public SMCCSTALRequestHandler newInstance() {
+    return new WSSignRequestHandler(this.sessId, this.stalPort);
+  }
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java b/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
new file mode 100644
index 00000000..b0285345
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
@@ -0,0 +1,58 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.stal.impl;
+
+import at.gv.egiz.stal.HashDataInput;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+/**
+ *
+ * @author clemens
+ */
+public class ByteArrayHashDataInput implements HashDataInput {
+
+    protected byte[] hashData;
+    protected String id;
+    protected String mimeType;
+    protected String encoding;
+
+    public ByteArrayHashDataInput(byte[] hashData, String id, String mimeType, String encoding) {
+        if (hashData == null) {
+            throw new NullPointerException("HashDataInput not provided.");
+        }
+        this.hashData = hashData;
+        this.id = id;
+        this.mimeType = mimeType;
+        this.encoding = encoding;
+    }
+    
+    @Override
+    public String getReferenceId() {
+        return id;
+    }
+
+    @Override
+    public String getMimeType() {
+        return mimeType;
+    }
+
+    @Override
+    public InputStream getHashDataInput() {
+        return new ByteArrayInputStream(hashData);
+    }
+
+    /**
+     * may be null
+     * @return
+     */
+  @Override
+  public String getEncoding() {
+    return encoding;
+  }
+
+    
+}
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
index f8546e49..a288a716 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
@@ -29,7 +29,10 @@ import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
 import at.gv.egiz.stal.SignRequest;
+import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
 import at.gv.egiz.stal.signedinfo.ReferenceType;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
 
 /**
  * 
@@ -55,7 +58,7 @@ public class LocalSignRequestHandler extends SignRequestHandler {
   }
 
   @Override
-  protected List<HashDataInput> getHashDataInputs(
+  public List<HashDataInput> getCashedHashDataInputs(
       List<ReferenceType> dsigReferences) throws Exception {
     ArrayList<HashDataInput> result = new ArrayList<HashDataInput>();
     for (ReferenceType dsigRef : dsigReferences) {
@@ -65,7 +68,14 @@ public class LocalSignRequestHandler extends SignRequestHandler {
         if (dsigRefId != null) {
           for (HashDataInput hdi : hashDataInput) {
             if (hdi.getReferenceId().equals(dsigRefId)) {
-              result.add(hdi);
+              InputStream hdIs = hdi.getHashDataInput();
+              ByteArrayOutputStream baos = new ByteArrayOutputStream(hdIs.available());
+              int b;
+              while ((b = hdIs.read()) != -1) {
+                baos.write(b);
+              }
+              ByteArrayHashDataInput baHdi = new ByteArrayHashDataInput(baos.toByteArray(), hdi.getReferenceId(), hdi.getMimeType(), hdi.getEncoding());
+              result.add(baHdi);
             }
           }
         } else {
diff --git a/STALService/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java b/STALService/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
deleted file mode 100644
index b0285345..00000000
--- a/STALService/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package at.gv.egiz.stal.impl;
-
-import at.gv.egiz.stal.HashDataInput;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-/**
- *
- * @author clemens
- */
-public class ByteArrayHashDataInput implements HashDataInput {
-
-    protected byte[] hashData;
-    protected String id;
-    protected String mimeType;
-    protected String encoding;
-
-    public ByteArrayHashDataInput(byte[] hashData, String id, String mimeType, String encoding) {
-        if (hashData == null) {
-            throw new NullPointerException("HashDataInput not provided.");
-        }
-        this.hashData = hashData;
-        this.id = id;
-        this.mimeType = mimeType;
-        this.encoding = encoding;
-    }
-    
-    @Override
-    public String getReferenceId() {
-        return id;
-    }
-
-    @Override
-    public String getMimeType() {
-        return mimeType;
-    }
-
-    @Override
-    public InputStream getHashDataInput() {
-        return new ByteArrayInputStream(hashData);
-    }
-
-    /**
-     * may be null
-     * @return
-     */
-  @Override
-  public String getEncoding() {
-    return encoding;
-  }
-
-    
-}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
index 56c8340b..ac2b725c 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
@@ -45,7 +45,7 @@ public abstract class AbstractSMCCSTAL implements STAL {
 
   static {
     addRequestHandler(InfoboxReadRequest.class, new InfoBoxReadRequestHandler());
-    addRequestHandler(SignRequest.class, new SignRequestHandler());
+//    addRequestHandler(SignRequest.class, new SignRequestHandler());
   }
 
   /**
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/CashedHashDataInputResolver.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/CashedHashDataInputResolver.java
new file mode 100644
index 00000000..05af85d9
--- /dev/null
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/CashedHashDataInputResolver.java
@@ -0,0 +1,27 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.bku.smccstal;
+
+import at.gv.egiz.stal.HashDataInput;
+import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
+import at.gv.egiz.stal.signedinfo.ReferenceType;
+import java.security.DigestException;
+import java.util.List;
+import java.util.Set;
+
+/**
+ *
+ * @author clemens
+ */
+public interface CashedHashDataInputResolver {
+
+    /**
+     * implementations may verify the hashvalue 
+     * @post-condition returned list != null
+     * @return
+     */
+    List<HashDataInput> getCashedHashDataInputs(List<ReferenceType> signedReferences) throws DigestException, Exception; 
+}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index d37d0551..59eed55f 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -21,8 +21,6 @@ import java.io.InputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
@@ -43,21 +41,26 @@ import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
 import at.gv.egiz.stal.SignRequest;
 import at.gv.egiz.stal.SignResponse;
+import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
 import at.gv.egiz.stal.signedinfo.ObjectFactory;
 import at.gv.egiz.stal.signedinfo.ReferenceType;
 import at.gv.egiz.stal.signedinfo.SignedInfoType;
 import at.gv.egiz.stal.util.JCEAlgorithmNames;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.security.DigestException;
+import java.security.DigestInputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 
 /**
  * This class is NOT thread-safe. 
  * handleRequest() sets the SignedInfo which is used in providePIN.
  */
-public class SignRequestHandler extends AbstractRequestHandler implements
-  PINProvider {
+public abstract class SignRequestHandler extends AbstractRequestHandler implements
+  CashedHashDataInputResolver {
 
     private static Log log = LogFactory.getLog(SignRequestHandler.class);
     private static JAXBContext jaxbContext;
@@ -71,10 +74,10 @@ public class SignRequestHandler extends AbstractRequestHandler implements
         }
     }
     /** the SignedInfo of the current SignRequest */
-    protected SignedInfoType signedInfo;
-    protected List<HashDataInput> hashDataInputs;
+//    protected SignedInfoType signedInfo;
+//    protected List<ByteArrayHashDataInput> hashDataInputs;
     
-    private int retryCounter = 0;
+//    private int retryCounter = 0;
 
     @SuppressWarnings("unchecked")
     @Override
@@ -86,8 +89,7 @@ public class SignRequestHandler extends AbstractRequestHandler implements
                 Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
                 InputStream is = new ByteArrayInputStream(signReq.getSignedInfo());
                 JAXBElement<SignedInfoType> si = (JAXBElement<SignedInfoType>) unmarshaller.unmarshal(is);
-                signedInfo = si.getValue();
-                String signatureMethod = signedInfo.getSignatureMethod().getAlgorithm();
+                String signatureMethod = si.getValue().getSignatureMethod().getAlgorithm();
                 log.debug("Found signature method: " + signatureMethod);
                 String jceName = JCEAlgorithmNames.getJCEHashName(signatureMethod);
                 if (jceName == null) {
@@ -97,7 +99,7 @@ public class SignRequestHandler extends AbstractRequestHandler implements
                 MessageDigest md = MessageDigest.getInstance(jceName);
                 md.update(signReq.getSignedInfo());
                 KeyboxName kb = SignatureCard.KeyboxName.getKeyboxName(signReq.getKeyIdentifier());
-                byte[] resp = card.createSignature(md.digest(), kb, this);
+                byte[] resp = card.createSignature(md.digest(), kb, new STALPinProvider(si.getValue()));
                 if (resp == null) {
                     return new ErrorResponse(6001);
                 }
@@ -116,9 +118,7 @@ public class SignRequestHandler extends AbstractRequestHandler implements
             } catch (NoSuchAlgorithmException e) {
                 log.error(e);
                 return new ErrorResponse(1000);
-            } finally {
-                signedInfo = null;
-            }
+            } 
         } else {
             log.fatal("Got unexpected STAL request: " + request);
             return new ErrorResponse(1000);
@@ -130,59 +130,210 @@ public class SignRequestHandler extends AbstractRequestHandler implements
         return true;
     }
 
-    @Override
-    public String providePIN(PINSpec spec, int retries) {
-        if (retryCounter++ > 0) {
-            log.info("PIN wrong retrying ...");
-            gui.showSignaturePINRetryDialog(spec, retries, this, "sign", this,
-              "cancel", this, "hashData");
-        } else {
-            gui.showSignaturePINDialog(spec, this, "sign", this, "cancel", this,
-              "hashData");
-        }
-        do {
-            waitForAction();
-            if (actionCommand.equals("cancel")) {
-                return null;
-            } else if (actionCommand.equals("hashData")) {
-                if (signedInfo != null) {
-                    try {
-                        gui.showWaitDialog(null);
-                        if (hashDataInputs == null || hashDataInputs.size() == 0) {
-                            hashDataInputs = getHashDataInputs(signedInfo.getReference());
-                        }
-                        gui.showHashDataInputDialog(hashDataInputs, this, "ok");
-                    } catch (Exception ex) {
-                        //FIXME localize messages
-                        log.error("Failed to obtain HashDataInputs: " + ex.getMessage());
-                        gui.showErrorDialog("Failed to obtain HashDataInputs: " + ex.getMessage(), this, "ok");
-                    }
-                } else {
-                    //FIXME get all hashdatainputs
-                    gui.showErrorDialog("Failed to obtain HashDataInputs: No dsig:SignedInfo provided.", this, "ok");
-                }
-            } else if (actionCommand.equals("sign")) {
-                return new String(gui.getPin());
-            } else if (actionCommand.equals("ok")) {
-                gui.showSignaturePINDialog(spec, this, "sign", this, "cancel", this,
-                  "hashData");
-            }
-        } while (true);
-    }
+//    @Override
+//    public String providePIN(PINSpec spec, int retries) {
+//        if (retryCounter++ > 0) {
+//            log.info("PIN wrong retrying ...");
+//            gui.showSignaturePINRetryDialog(spec, retries, this, "sign", this,
+//              "cancel", this, "hashData");
+//        } else {
+//            gui.showSignaturePINDialog(spec, this, "sign", this, "cancel", this,
+//              "hashData");
+//        }
+//        do {
+//            waitForAction();
+//            if (actionCommand.equals("cancel")) {
+//                return null;
+//            } else if (actionCommand.equals("hashData")) {
+//                if (signedInfo != null) {
+//                    try {
+//                        gui.showWaitDialog(null);
+//                        if (hashDataInputs == null || hashDataInputs.size() == 0) {
+//                          HashMap<String, ReferenceType> signedReferences = new HashMap<String, ReferenceType>();
+//                          for (ReferenceType reference : signedInfo.getReference()) {
+//                            //don't get Manifest, QualifyingProperties, ...
+//                            if (reference.getType() == null) {
+//                              signedReferences.put(reference.getId(), reference);
+//                            }
+//                          }
+//                          hashDataInputs = getHashDataInputs(signedReferences.keySet());
+//                          for (HashDataInput hashDataInput : hashDataInputs) {
+//                            ReferenceType reference = signedReferences.get(hashDataInput.getReferenceId());
+//                            String algorithm = reference.getDigestMethod().getAlgorithm();
+//                            MessageDigest md = MessageDigest.getInstance(algorithm);
+//                            DigestInputStream dis = new DigestInputStream(hashDataInput.getHashDataInput(), md);
+//                            while(dis.read() != -1) ;
+//                            byte[] digestValue = md.digest();
+//                            boolean valid = reference.getDigestValue().equals(digestValue);
+//                          }
+//                        }
+//                        gui.showHashDataInputDialog(hashDataInputs, this, "ok");
+//                    } catch (Exception ex) {
+//                        //FIXME localize messages
+//                        log.error("Failed to obtain HashDataInputs: " + ex.getMessage());
+//                        gui.showErrorDialog("Failed to obtain HashDataInputs: " + ex.getMessage(), this, "ok");
+//                    }
+//                } else {
+//                    //FIXME get all hashdatainputs
+//                    gui.showErrorDialog("Failed to obtain HashDataInputs: No dsig:SignedInfo provided.", this, "ok");
+//                }
+//            } else if (actionCommand.equals("sign")) {
+//                return new String(gui.getPin());
+//            } else if (actionCommand.equals("ok")) {
+//                gui.showSignaturePINDialog(spec, this, "sign", this, "cancel", this,
+//                  "hashData");
+//            }
+//        } while (true);
+//    }
 
-    @Override
-    public SMCCSTALRequestHandler newInstance() {
-        return new SignRequestHandler();
-    }
+//    @Override
+//    public SMCCSTALRequestHandler newInstance() {
+//        return new SignRequestHandler();
+//    }
 
     /**
-     * override by subclass
+     * implementations may verify the hashvalue 
      * @post-condition returned list != null
      * @return
      */
-    protected List<HashDataInput> getHashDataInputs(List<ReferenceType> signedReferences) throws Exception {
-        //TODO
-        log.warn("Return empty HashDataInput");
-        return new ArrayList<HashDataInput>();
+    @Override
+    public abstract List<HashDataInput> getCashedHashDataInputs(List<ReferenceType> signedReferences) throws Exception; 
+//    {
+//        //TODO
+//        log.warn("Return empty HashDataInput");
+//        return new ArrayList<HashDataInput>();
+//    }
+
+    
+    
+//    protected void validateHashDataInputs(List<ReferenceType> signedReferences, List<HashDataInput> hashDataInputs) {
+//      if (hashDataInputs != null) {
+//
+//          Map<String, HashDataInput> hashDataIdMap = new HashMap<String, HashDataInput>();
+//          for (HashDataInput hdi : hashDataInputs) {
+//            if (log.isTraceEnabled()) {
+//              log.trace("Provided HashDataInput for reference " + hdi.getReferenceId());
+//            }
+//            hashDataIdMap.put(hdi.getReferenceId(), hdi);
+//          }
+//
+//          List<GetHashDataInputType.Reference> reqRefs = request.getReference();
+//          for (GetHashDataInputType.Reference reqRef : reqRefs) {
+//            String reqRefId = reqRef.getID();
+//            HashDataInput reqHdi = hashDataIdMap.get(reqRefId);
+//            if (reqHdi == null) {
+//              String msg = "Failed to resolve HashDataInput for reference " + reqRefId;
+//              log.error(msg);
+//              GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
+//              faultInfo.setErrorCode(1);
+//              faultInfo.setErrorMessage(msg);
+//              throw new GetHashDataInputFault(msg, faultInfo);
+//            }
+//
+//            InputStream hashDataIS = reqHdi.getHashDataInput();
+//            if (hashDataIS == null) {
+//              //HashDataInput not cached?
+//              String msg = "Failed to obtain HashDataInput for reference " + reqRefId + ", reference not cached";
+//              log.error(msg);
+//              GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
+//              faultInfo.setErrorCode(1);
+//              faultInfo.setErrorMessage(msg);
+//              throw new GetHashDataInputFault(msg, faultInfo);
+//            }
+//            ByteArrayOutputStream baos = null;
+//            try {
+//              if (log.isDebugEnabled()) {
+//                log.debug("Resolved HashDataInput " + reqRefId + " (" + reqHdi.getMimeType() + ";charset=" + reqHdi.getEncoding() + ")");
+//              }
+//              baos = new ByteArrayOutputStream(hashDataIS.available());
+//              int c;
+//              while ((c = hashDataIS.read()) != -1) {
+//                baos.write(c);
+//              }
+//              GetHashDataInputResponseType.Reference ref = new GetHashDataInputResponseType.Reference();
+//              ref.setID(reqRefId);
+//              ref.setMimeType(reqHdi.getMimeType());
+//              ref.setEncoding(reqHdi.getEncoding());
+//              ref.setValue(baos.toByteArray());
+//              response.getReference().add(ref);
+//            } catch (IOException ex) {
+//              String msg = "Failed to get HashDataInput for reference " + reqRefId;
+//              log.error(msg, ex);
+//              GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
+//              faultInfo.setErrorCode(1);
+//              faultInfo.setErrorMessage(msg);
+//              throw new GetHashDataInputFault(msg, faultInfo, ex);
+//            } finally {
+//              try {
+//                baos.close();
+//              } catch (IOException ex) {
+//              }
+//            }
+//          }
+//          return response;
+//        }
+//      for (ReferenceType reference : signedReferences) {
+//        String algorithm = reference.getDigestMethod().getAlgorithm();
+//        
+//      }
+//    }
+  
+  
+  /**
+   * cashes the HashDataInputs provided by SignRequestHandler.this.getHashDataInputs()
+   * (don't know whether outer class is LocalSignRequestHandler or WSSignRequestHandler, providing DataObjectHDI or ByteArrayHDI, resp)
+   */
+  class STALPinProvider implements PINProvider {
+    
+    protected SignedInfoType signedInfo;
+    protected List<HashDataInput> hashDataInputs;
+    private int retryCounter = 0;
+
+    public STALPinProvider(SignedInfoType signedInfo) {
+      this.signedInfo = signedInfo;
+    }
+  
+    @Override
+    public String providePIN(PINSpec spec, int retries) {
+    if (retryCounter++ > 0) {
+      log.info("PIN wrong retrying ...");
+      gui.showSignaturePINRetryDialog(spec, retries, SignRequestHandler.this, "sign", SignRequestHandler.this,
+        "cancel", SignRequestHandler.this, "hashData");
+    } else {
+      gui.showSignaturePINDialog(spec, SignRequestHandler.this, "sign", SignRequestHandler.this, "cancel", SignRequestHandler.this,
+        "hashData");
     }
+    do {
+      waitForAction();
+      if (actionCommand.equals("cancel")) {
+        return null;
+      } else if (actionCommand.equals("hashData")) {
+        if (signedInfo != null) {
+          try {
+            gui.showWaitDialog(null);
+            if (hashDataInputs == null || hashDataInputs.size() == 0) {
+              hashDataInputs = getCashedHashDataInputs(signedInfo.getReference());
+            }
+            gui.showHashDataInputDialog(hashDataInputs, SignRequestHandler.this, "ok");
+          } catch (DigestException ex) { 
+            log.error("Bad digest value: " + ex.getMessage());
+            gui.showErrorDialog(ex.getMessage());
+          } catch (Exception ex) {
+            //FIXME localize messages
+            log.error("Failed to obtain HashDataInputs: " + ex.getMessage());
+            gui.showErrorDialog("Failed to obtain HashDataInputs: " + ex.getMessage(), SignRequestHandler.this, "ok");
+          }
+        } else {
+          //FIXME get all hashdatainputs
+          gui.showErrorDialog("Failed to obtain HashDataInputs: No dsig:SignedInfo provided.", SignRequestHandler.this, "ok");
+        }
+      } else if (actionCommand.equals("sign")) {
+        return new String(gui.getPin());
+      } else if (actionCommand.equals("ok")) {
+        gui.showSignaturePINDialog(spec, SignRequestHandler.this, "sign", SignRequestHandler.this, "cancel", SignRequestHandler.this,
+          "hashData");
+      }
+    } while (true);
+  }
+  }
 }
-- 
cgit v1.2.3


From a20fb683943ce0893302b6dc25015c998cd9687f Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 18 Sep 2008 09:25:55 +0000
Subject: hashdatainput cached

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@46 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   |  6 +++--
 .../bku/local/stal/LocalSignRequestHandler.java    | 28 ++++++++++++++++------
 .../src/main/resources/commons-logging.properties  | 16 +++++++++++++
 BKULocal/src/main/resources/log4j.properties       |  2 +-
 .../slcommands/impl/DataObjectHashDataInput.java   |  6 +++--
 5 files changed, 46 insertions(+), 12 deletions(-)
 create mode 100644 BKULocal/src/main/resources/commons-logging.properties

(limited to 'BKUCommonGUI')

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 5fb67982..be4aeded 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
@@ -871,8 +871,10 @@ public class BKUGUI implements BKUGUIFacade {
                   .addComponent(waitMsgLabel)
                   .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
                 mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(waitMsgLabel));
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(waitMsgLabel)
+                  .addContainerGap());
 
                 contentPanel.validate();
             }
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
index a288a716..ca420f13 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
@@ -16,6 +16,7 @@
  */
 package at.gv.egiz.bku.local.stal;
 
+import at.gv.egiz.bku.slcommands.impl.DataObjectHashDataInput;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -68,14 +69,27 @@ public class LocalSignRequestHandler extends SignRequestHandler {
         if (dsigRefId != null) {
           for (HashDataInput hdi : hashDataInput) {
             if (hdi.getReferenceId().equals(dsigRefId)) {
-              InputStream hdIs = hdi.getHashDataInput();
-              ByteArrayOutputStream baos = new ByteArrayOutputStream(hdIs.available());
-              int b;
-              while ((b = hdIs.read()) != -1) {
-                baos.write(b);
+              if (hdi instanceof DataObjectHashDataInput) {
+                if (log.isTraceEnabled())
+                  log.trace("adding DataObjectHashDataInput");
+                result.add(hdi);
+              } else if (hdi instanceof ByteArrayHashDataInput) {
+                if (log.isTraceEnabled())
+                  log.trace("adding ByteArrayHashDataInput");
+                result.add(hdi);
+              } else {
+                if (log.isDebugEnabled())
+                  log.debug("provided HashDataInput not chaching enabled, creating ByteArrayHashDataInput");
+                
+                InputStream hdIs = hdi.getHashDataInput();
+                ByteArrayOutputStream baos = new ByteArrayOutputStream(hdIs.available());
+                int b;
+                while ((b = hdIs.read()) != -1) {
+                  baos.write(b);
+                }
+                ByteArrayHashDataInput baHdi = new ByteArrayHashDataInput(baos.toByteArray(), hdi.getReferenceId(), hdi.getMimeType(), hdi.getEncoding());
+                result.add(baHdi);
               }
-              ByteArrayHashDataInput baHdi = new ByteArrayHashDataInput(baos.toByteArray(), hdi.getReferenceId(), hdi.getMimeType(), hdi.getEncoding());
-              result.add(baHdi);
             }
           }
         } else {
diff --git a/BKULocal/src/main/resources/commons-logging.properties b/BKULocal/src/main/resources/commons-logging.properties
new file mode 100644
index 00000000..0d497b1b
--- /dev/null
+++ b/BKULocal/src/main/resources/commons-logging.properties
@@ -0,0 +1,16 @@
+# 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.
+
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
diff --git a/BKULocal/src/main/resources/log4j.properties b/BKULocal/src/main/resources/log4j.properties
index 49d763f8..3a730bac 100644
--- a/BKULocal/src/main/resources/log4j.properties
+++ b/BKULocal/src/main/resources/log4j.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # loglever DEBUG, appender STDOUT
-log4j.rootLogger=TRACE, STDOUT, file
+log4j.rootLogger=DEBUG, STDOUT, file
 
 # STDOUT appender
 log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/DataObjectHashDataInput.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/DataObjectHashDataInput.java
index 71b62911..0386bdd6 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/DataObjectHashDataInput.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/DataObjectHashDataInput.java
@@ -10,7 +10,9 @@ import at.gv.egiz.stal.HashDataInput;
 import java.io.InputStream;
 
 /**
- *
+ * DataObject-backed HashDataInput
+ * If <a href="XMLSignContext.html#Supported Properties">reference caching</a> is enabled,
+ * the hashdata input stream can be obtained repeatedly.
  * @author clemens
  */
 public class DataObjectHashDataInput implements HashDataInput {
@@ -34,7 +36,7 @@ public class DataObjectHashDataInput implements HashDataInput {
     }
 
     /**
-     * 
+     * may be called repeatedly
      * @return the pre-digested input stream if reference caching is enabled, null otherwise
      */
     @Override
-- 
cgit v1.2.3


From 12d4f22e52fba1f867571afbd539b532e2afe1b5 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 18 Sep 2008 09:48:56 +0000
Subject: wait message bug

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@47 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   |  8 +++---
 .../test/java/at/gv/egiz/bku/gui/BKUGUITest.java   |  2 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java | 29 ++++++++++++++--------
 3 files changed, 24 insertions(+), 15 deletions(-)

(limited to 'BKUCommonGUI')

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 be4aeded..449dfd61 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
@@ -835,7 +835,8 @@ public class BKUGUI implements BKUGUIFacade {
             .addComponent(errorMsgLabel)
             .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
           mainPanelLayout.setVerticalGroup(
-            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+            mainPanelLayout.createSequentialGroup()
+//            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
             .addComponent(errorMsgLabel));
 
           contentPanel.validate();
@@ -859,7 +860,7 @@ public class BKUGUI implements BKUGUIFacade {
                 if (waitMessage != null) {
                     waitMsgLabel.setText("<html>" + waitMessage + "</html>");
                 } else {
-                    waitMsgLabel.setText("<html>" + messages.getString(MESSAGE_WAIT) + "</html>");
+                    waitMsgLabel.setText(messages.getString(MESSAGE_WAIT));
                 }
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
@@ -873,8 +874,7 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
 //                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(waitMsgLabel)
-                  .addContainerGap());
+                  .addComponent(waitMsgLabel));
 
                 contentPanel.validate();
             }
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index 5f1bc8b2..2ea0c5a2 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
  */
 public class BKUGUITest {
 
-    @Ignore
+    @Test
     public void testBKUGUI() {
         JFrame testFrame = new JFrame("BKUGUITest");
         BKUGUI gui = new BKUGUI();
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 6cbc2cd1..909da4ad 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
@@ -43,7 +43,7 @@ public class BKUGUIWorker implements Runnable {
 
   @Override
   public void run() {
-//        try {
+        try {
 
     final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Signatur-PIN");
 
@@ -185,9 +185,18 @@ public class BKUGUIWorker implements Runnable {
 //        gui.showWelcomeDialog();
 //
 //        Thread.sleep(2000);
+        
+        gui.showWaitDialog(null);
+        
+        Thread.sleep(1000);
+        
+        gui.showWaitDialog("test");
+        
+        Thread.sleep(1000);
+          
 
 //            gui.showInsertCardDialog(cancelListener, "cancel");
-
+//
 //            Thread.sleep(2000);
 //            
 //            gui.showCardNotSupportedDialog(cancelListener, "cancel");
@@ -201,7 +210,7 @@ public class BKUGUIWorker implements Runnable {
 //            Thread.sleep(2000);
 //
 
-    gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+//    gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
 
 //            Thread.sleep(2000);
 
@@ -209,18 +218,18 @@ public class BKUGUIWorker implements Runnable {
 //
 //            Thread.sleep(2000);
 ////            
-//            gui.showErrorDialog("Testfehler occured", null, null);
-//            
-//            Thread.sleep(2000);
+            gui.showErrorDialog("Testfehler occured", null, null);
+            
+            Thread.sleep(2000);
 //            
-//            gui.showErrorDialog("Testfehler occured"); 
+            gui.showErrorDialog("Testfehler occured"); 
 
 
 //            gui.showTextPlainHashDataInput("hallo,\n welt!", "12345", null, "cancel", null, "save");
 //            Thread.sleep(2000);
 
-//        } catch (InterruptedException ex) {
-//            ex.printStackTrace();
-//        }
+        } catch (InterruptedException ex) {
+            ex.printStackTrace();
+        }
   }
 }
-- 
cgit v1.2.3


From 49dd625e2537b14b201d254ebef9745d9890a105 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 18 Sep 2008 09:50:10 +0000
Subject: wait message bug

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@48 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index 2ea0c5a2..5f1bc8b2 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
  */
 public class BKUGUITest {
 
-    @Test
+    @Ignore
     public void testBKUGUI() {
         JFrame testFrame = new JFrame("BKUGUITest");
         BKUGUI gui = new BKUGUI();
-- 
cgit v1.2.3


From fe648888843f3c3695f252d887357ec63edfee97 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 18 Sep 2008 15:49:51 +0000
Subject: wordwrap

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@50 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'BKUCommonGUI')

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 449dfd61..b94a58e8 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
@@ -956,7 +956,8 @@ public class BKUGUI implements BKUGUIFacade {
           hashDataTextArea.setFont(new Font(HASHDATA_FONT, hashDataTextArea.getFont().getStyle(), hashDataTextArea.getFont().getSize()));
 //          hashDataScrollPane.setViewportView(hashDataTextArea);
 //          hashDataScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); //HORIZONTAL_SCROLLBAR_NEVER);
-
+          hashDataTextArea.setLineWrap(true);
+          hashDataTextArea.setWrapStyleWord(true);
 
           JScrollPane hashDataScrollPane = new JScrollPane(hashDataTextArea);
 
-- 
cgit v1.2.3


From 1c4df47223a6d655b9fb7f46f807171ceda07ba7 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 23 Sep 2008 12:09:10 +0000
Subject: bitte warten...

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@56 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   |  12 +-
 BKUOnline/src/main/webapp/expired.html             |  23 +-
 smccSTAL/pom.xml                                   |   1 -
 .../bku/smccstal/InfoBoxReadRequestHandler.java    | 249 +++++++++++----------
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   |   1 +
 5 files changed, 146 insertions(+), 140 deletions(-)

(limited to 'BKUCommonGUI')

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 b94a58e8..0b68962c 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
@@ -400,7 +400,8 @@ 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));
+                    .addComponent(errorMsgLabel)
+                    .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
 //                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -777,10 +778,13 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(errorMsgLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(errorMsgLabel) //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+                  .addContainerGap());
                 mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(errorMsgLabel));
 
                 JButton okButton = new JButton();
diff --git a/BKUOnline/src/main/webapp/expired.html b/BKUOnline/src/main/webapp/expired.html
index 67ca94bc..2bb961f5 100644
--- a/BKUOnline/src/main/webapp/expired.html
+++ b/BKUOnline/src/main/webapp/expired.html
@@ -14,15 +14,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!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=ISO-8859-1">
-<title>Session Expired</title>
-</head>
-<body>
-    <p>
-    Ihre Sitzung ist abgelaufen. Ein neuer BKU request kann im <a href="HTTP-ohne.html">Requestformular</a> erstellt werden.
-    </p>
-</body>
+<!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=ISO-8859-1">
+<title>Session Expired</title>
+</head>
+<body>
+    <p>
+    Ihre Sitzung ist abgelaufen. 
+    <!--Ein neuer BKU request kann im <a href="HTTP-ohne.html">Requestformular</a> erstellt werden.-->
+    </p>
+</body>
 </html>
\ No newline at end of file
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 8b1a24b0..a053b419 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -11,7 +11,6 @@
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
     <version>1.0-SNAPSHOT</version>
-    <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
index 7dc2e202..25085b16 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
@@ -14,127 +14,128 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package at.gv.egiz.bku.smccstal;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.smcc.CancelledException;
-import at.gv.egiz.smcc.PINProvider;
-import at.gv.egiz.smcc.PINSpec;
-import at.gv.egiz.smcc.SignatureCard;
-import at.gv.egiz.smcc.SignatureCardException;
-import at.gv.egiz.stal.ErrorResponse;
-import at.gv.egiz.stal.InfoboxReadRequest;
-import at.gv.egiz.stal.InfoboxReadResponse;
-import at.gv.egiz.stal.STALRequest;
-import at.gv.egiz.stal.STALResponse;
-
-public class InfoBoxReadRequestHandler extends AbstractRequestHandler implements
-    PINProvider {
-
-  private static Log log = LogFactory.getLog(InfoBoxReadRequestHandler.class);
-
-  private int retryCounter = 0;
-
-  @Override
-  public STALResponse handleRequest(STALRequest request) {
-    if (request instanceof InfoboxReadRequest) {
-      InfoboxReadRequest infoBox = (InfoboxReadRequest) request;
-      try {
-        if (infoBox.getInfoboxIdentifier().equals("IdentityLink")) {
-          newSTALMessage("Message.RequestCaption", "Message.IdentityLink");
-          log.debug("Handling identitylink infobox");
-          byte[] resp = card.getInfobox(infoBox.getInfoboxIdentifier(), this,
-              infoBox.getDomainIdentifier());
-          if (resp == null) {
-            log.info("Got null as result->user cancelled");
-            return new ErrorResponse(6001);
-          } else {
-            try {
-              resp = DomainIdConverter.convertDomainId(resp, infoBox
-                  .getDomainIdentifier());
-            } catch (Exception e) {
-              log.error("Cannot convert domain specific id", e);
-              return new ErrorResponse(1000);
-            }
-          }
-          InfoboxReadResponse stalResp = new InfoboxReadResponse();
-          stalResp.setInfoboxValue(resp);
-          return stalResp;
-        } else if (SignatureCard.KeyboxName.CERITIFIED_KEYPAIR.equals(infoBox
-            .getInfoboxIdentifier())) {
-          newSTALMessage("Message.RequestCaption", "Message.CertifiedKeypair");
-          log.debug("Handling certified keypair infobox");
-          byte[] resp = card
-              .getCertificate(SignatureCard.KeyboxName.CERITIFIED_KEYPAIR);
-          if (resp == null) {
-            return new ErrorResponse(6001);
-          }
-          InfoboxReadResponse stalResp = new InfoboxReadResponse();
-          stalResp.setInfoboxValue(resp);
-          return stalResp;
-        } else if (SignatureCard.KeyboxName.SECURE_SIGNATURE_KEYPAIR
-            .equals(infoBox.getInfoboxIdentifier())) {
-          newSTALMessage("Message.RequestCaption",
-              "Message.SecureSignatureKeypair");
-          log.debug("Handling secure signature keypair infobox");
-          byte[] resp = card
-              .getCertificate(SignatureCard.KeyboxName.SECURE_SIGNATURE_KEYPAIR);
-          if (resp == null) {
-            return new ErrorResponse(6001);
-          }
-          InfoboxReadResponse stalResp = new InfoboxReadResponse();
-          stalResp.setInfoboxValue(resp);
-          return stalResp;
-        } else {
-          newSTALMessage("Message.RequestCaption", "Message.InfoboxReadRequest");
-          log.warn("Unknown infobox identifier: "
-              + infoBox.getInfoboxIdentifier() + " trying generic request");
-          byte[] resp = card.getInfobox(infoBox.getInfoboxIdentifier(), this,
-              infoBox.getDomainIdentifier());
-          if (resp == null) {
-            return new ErrorResponse(6001);
-          }
-          InfoboxReadResponse stalResp = new InfoboxReadResponse();
-          stalResp.setInfoboxValue(resp);
-          return stalResp;
-        }
-      } catch (CancelledException cx) {
-        log.debug("User cancelled request", cx);
-        return new ErrorResponse(6001);
-      } catch (SignatureCardException e) {
-        log.info("Error while reading infobox: " + e);
-        return new ErrorResponse(4000);
-      }
-    } else {
-      log.fatal("Got unexpected STAL request: " + request);
-      return new ErrorResponse(1000);
-    }
-  }
-
-  @Override
-  public boolean requireCard() {
-    return true;
-  }
-
-  @Override
-  public String providePIN(PINSpec spec, int retries) {
-    if (retryCounter++ > 0) {
-      log.info("PIN wrong retrying ...");
-      gui.showCardPINRetryDialog(spec, retries, this, "ok", this, "cancel");
-    } else {
-      gui.showCardPINDialog(spec, this, "ok", this, "cancel");
-    }
-    waitForAction();
-    if (actionCommand.equals("cancel")) {
-      return null;
-    }
-    return new String(gui.getPin());
-  }
-
-  @Override
-  public SMCCSTALRequestHandler newInstance() {
-    return new InfoBoxReadRequestHandler();
-  }
-}
+package at.gv.egiz.bku.smccstal;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINProvider;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.SignatureCard;
+import at.gv.egiz.smcc.SignatureCardException;
+import at.gv.egiz.stal.ErrorResponse;
+import at.gv.egiz.stal.InfoboxReadRequest;
+import at.gv.egiz.stal.InfoboxReadResponse;
+import at.gv.egiz.stal.STALRequest;
+import at.gv.egiz.stal.STALResponse;
+
+public class InfoBoxReadRequestHandler extends AbstractRequestHandler implements
+    PINProvider {
+
+  private static Log log = LogFactory.getLog(InfoBoxReadRequestHandler.class);
+
+  private int retryCounter = 0;
+
+  @Override
+  public STALResponse handleRequest(STALRequest request) {
+    if (request instanceof InfoboxReadRequest) {
+      InfoboxReadRequest infoBox = (InfoboxReadRequest) request;
+      try {
+        if (infoBox.getInfoboxIdentifier().equals("IdentityLink")) {
+          newSTALMessage("Message.RequestCaption", "Message.IdentityLink");
+          log.debug("Handling identitylink infobox");
+          byte[] resp = card.getInfobox(infoBox.getInfoboxIdentifier(), this,
+              infoBox.getDomainIdentifier());
+          if (resp == null) {
+            log.info("Got null as result->user cancelled");
+            return new ErrorResponse(6001);
+          } else {
+            try {
+              resp = DomainIdConverter.convertDomainId(resp, infoBox
+                  .getDomainIdentifier());
+            } catch (Exception e) {
+              log.error("Cannot convert domain specific id", e);
+              return new ErrorResponse(1000);
+            }
+          }
+          InfoboxReadResponse stalResp = new InfoboxReadResponse();
+          stalResp.setInfoboxValue(resp);
+          return stalResp;
+        } else if (SignatureCard.KeyboxName.CERITIFIED_KEYPAIR.equals(infoBox
+            .getInfoboxIdentifier())) {
+          newSTALMessage("Message.RequestCaption", "Message.CertifiedKeypair");
+          log.debug("Handling certified keypair infobox");
+          byte[] resp = card
+              .getCertificate(SignatureCard.KeyboxName.CERITIFIED_KEYPAIR);
+          if (resp == null) {
+            return new ErrorResponse(6001);
+          }
+          InfoboxReadResponse stalResp = new InfoboxReadResponse();
+          stalResp.setInfoboxValue(resp);
+          return stalResp;
+        } else if (SignatureCard.KeyboxName.SECURE_SIGNATURE_KEYPAIR
+            .equals(infoBox.getInfoboxIdentifier())) {
+          newSTALMessage("Message.RequestCaption",
+              "Message.SecureSignatureKeypair");
+          log.debug("Handling secure signature keypair infobox");
+          byte[] resp = card
+              .getCertificate(SignatureCard.KeyboxName.SECURE_SIGNATURE_KEYPAIR);
+          if (resp == null) {
+            return new ErrorResponse(6001);
+          }
+          InfoboxReadResponse stalResp = new InfoboxReadResponse();
+          stalResp.setInfoboxValue(resp);
+          return stalResp;
+        } else {
+          newSTALMessage("Message.RequestCaption", "Message.InfoboxReadRequest");
+          log.warn("Unknown infobox identifier: "
+              + infoBox.getInfoboxIdentifier() + " trying generic request");
+          byte[] resp = card.getInfobox(infoBox.getInfoboxIdentifier(), this,
+              infoBox.getDomainIdentifier());
+          if (resp == null) {
+            return new ErrorResponse(6001);
+          }
+          InfoboxReadResponse stalResp = new InfoboxReadResponse();
+          stalResp.setInfoboxValue(resp);
+          return stalResp;
+        }
+      } catch (CancelledException cx) {
+        log.debug("User cancelled request", cx);
+        return new ErrorResponse(6001);
+      } catch (SignatureCardException e) {
+        log.info("Error while reading infobox: " + e);
+        return new ErrorResponse(4000);
+      }
+    } else {
+      log.fatal("Got unexpected STAL request: " + request);
+      return new ErrorResponse(1000);
+    }
+  }
+
+  @Override
+  public boolean requireCard() {
+    return true;
+  }
+
+  @Override
+  public String providePIN(PINSpec spec, int retries) {
+    if (retryCounter++ > 0) {
+      log.info("PIN wrong retrying ...");
+      gui.showCardPINRetryDialog(spec, retries, this, "ok", this, "cancel");
+    } else {
+      gui.showCardPINDialog(spec, this, "ok", this, "cancel");
+    }
+    waitForAction();
+    gui.showWaitDialog(null);
+    if (actionCommand.equals("cancel")) {
+      return null;
+    }
+    return new String(gui.getPin());
+  }
+
+  @Override
+  public SMCCSTALRequestHandler newInstance() {
+    return new InfoBoxReadRequestHandler();
+  }
+}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index 59eed55f..8f380eec 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -305,6 +305,7 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
     }
     do {
       waitForAction();
+      gui.showWaitDialog(null);
       if (actionCommand.equals("cancel")) {
         return null;
       } else if (actionCommand.equals("hashData")) {
-- 
cgit v1.2.3


From 03f5ae9e9068168b294c042d68a58637e71a54ee Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 23 Sep 2008 14:09:02 +0000
Subject: bitte warten...

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@59 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java    | 2 +-
 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java              | 3 ++-
 smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
index cd96a481..465bde78 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
@@ -283,7 +283,7 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
         }
         break;
       case SMCCHelper.CARD_FOUND:
-        gui.showWaitDialog(null);
+//        gui.showWaitDialog(null);
         signatureCard = smccHelper.getSignatureCard(errorMessages.getLocale());
         return false;
       }
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 0b68962c..544b6eb3 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
@@ -246,7 +246,8 @@ public class BKUGUI implements BKUGUIFacade {
         headerPanelLayout.setHorizontalGroup(
           headerPanelLayout.createSequentialGroup()
 //          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
+            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
+            .addContainerGap());
         headerPanelLayout.setVerticalGroup(
           headerPanelLayout.createSequentialGroup()
 //          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index 8f380eec..0b297283 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -311,7 +311,7 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
       } else if (actionCommand.equals("hashData")) {
         if (signedInfo != null) {
           try {
-            gui.showWaitDialog(null);
+//            gui.showWaitDialog(null);
             if (hashDataInputs == null || hashDataInputs.size() == 0) {
               hashDataInputs = getCashedHashDataInputs(signedInfo.getReference());
             }
-- 
cgit v1.2.3


From ef04d747b03dc5159f7d284399dfcf637f4e97e3 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 24 Sep 2008 13:08:52 +0000
Subject: debugmessages

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@62 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 108 +++++++++++++++++----
 1 file changed, 91 insertions(+), 17 deletions(-)

(limited to 'BKUCommonGUI')

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 544b6eb3..749207ee 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
@@ -142,10 +142,14 @@ public class BKUGUI implements BKUGUIFacade {
 
         try {
 
+          log.debug("scheduling gui initialization");
+      
             SwingUtilities.invokeAndWait(new Runnable() {
 
                 @Override
                 public void run() {
+                  
+                  log.debug("initializing gui");
 
                     initIconPanel();
                     initContentPanel();
@@ -275,10 +279,16 @@ public class BKUGUI implements BKUGUIFacade {
 
     @Override
     public void showLoginDialog(ActionListener loginListener, String actionCommand) {
-        SwingUtilities.invokeLater(new Runnable() {
+      
+      log.debug("scheduling login dialog");
+        
+      SwingUtilities.invokeLater(new Runnable() {
 
-      @Override
+            @Override
             public void run() {
+              
+              log.debug("show login dialog");
+              
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
@@ -309,10 +319,16 @@ public class BKUGUI implements BKUGUIFacade {
 
     @Override
     public void showWelcomeDialog() {
+      
+      log.debug("scheduling welcome dialog");
+      
         SwingUtilities.invokeLater(new Runnable() {
 
-      @Override
+            @Override
             public void run() {
+              
+              log.debug("show welcome dialog");
+              
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
@@ -344,10 +360,16 @@ public class BKUGUI implements BKUGUIFacade {
 
     @Override
     public void showInsertCardDialog(final ActionListener cancelListener, final String cancelCommand) {
-        SwingUtilities.invokeLater(new Runnable() {
+      
+      log.debug("scheduling insert card dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
 
-      @Override
+            @Override
             public void run() {
+              
+              log.debug("show insert card dialog");
+      
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
@@ -381,12 +403,18 @@ public class BKUGUI implements BKUGUIFacade {
 
     @Override
     public void showCardNotSupportedDialog(final ActionListener cancelListener, final String cancelCommand) {
-        SwingUtilities.invokeLater(new Runnable() {
+        
+      log.debug("scheduling card not supported dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
 
-      @Override
+            @Override
             public void run() {
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
+                
+              log.debug("show card not supported dialog");
+                
+              mainPanel.removeAll();
+              buttonPanel.removeAll();
 
                 titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
 //                titleLabel.setForeground(defaultForground);
@@ -435,11 +463,16 @@ public class BKUGUI implements BKUGUIFacade {
     }
 
     private void showCardPINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener okListener, final String okCommand, final ActionListener cancelListener, final String cancelCommand) {
-        SwingUtilities.invokeLater(new Runnable() {
+        
+      log.debug("scheduling card-pin dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
 
-      @Override
+            @Override
             public void run() {
 
+              log.debug("show card-pin dialog");
+      
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
@@ -595,10 +628,16 @@ public class BKUGUI implements BKUGUIFacade {
     }
 
     private void showSignaturePINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener signListener, final String signCommand, final ActionListener cancelListener, final String cancelCommand, final ActionListener hashdataListener, final String hashdataCommand) {
-        SwingUtilities.invokeLater(new Runnable() {
 
-      @Override
+      log.debug("scheduling signature-pin dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
             public void run() {
+              
+              log.debug("show signature-pin dialog");
+      
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
@@ -760,10 +799,16 @@ public class BKUGUI implements BKUGUIFacade {
 
     @Override
     public void showErrorDialog(final String errorMsg, final ActionListener okListener, final String okCommand) {
-        SwingUtilities.invokeLater(new Runnable() {
+        
+      log.debug("scheduling error dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
 
-      @Override
+          @Override
             public void run() {
+
+                log.debug("show error dialog");
+                
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
@@ -816,10 +861,16 @@ public class BKUGUI implements BKUGUIFacade {
 
     @Override
     public void showErrorDialog(final String errorMsg) {
+      
+      log.debug("scheduling error  dialog");
+      
       SwingUtilities.invokeLater(new Runnable() {
 
         @Override
         public void run() {
+          
+          log.debug("show error dialog");
+      
           mainPanel.removeAll();
           buttonPanel.removeAll();
 
@@ -851,10 +902,16 @@ public class BKUGUI implements BKUGUIFacade {
 
     @Override
     public void showWaitDialog(final String waitMessage) {
-        SwingUtilities.invokeLater(new Runnable() {
+        
+      log.debug("scheduling wait dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
 
-      @Override
+            @Override
             public void run() {
+        
+              log.debug("show wait dialog");
+              
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
@@ -941,10 +998,16 @@ public class BKUGUI implements BKUGUIFacade {
     }
     
     private void showPlainTextHashDataInputDialog(final String hashDataText, final ActionListener saveListener, final String saveCommand, final ActionListener cancelListener, final String cancelCommand) {
+      
+      log.debug("scheduling plaintext hashdatainput dialog");
+      
       SwingUtilities.invokeLater(new Runnable() {
 
         @Override
         public void run() {
+          
+          log.debug("show plaintext hashdatainput dialog");
+      
           mainPanel.removeAll();
           buttonPanel.removeAll();
 
@@ -1032,10 +1095,16 @@ public class BKUGUI implements BKUGUIFacade {
     }
 
     private void showMultipleHashDataInputDialog(final TableModel signedReferences, final ActionListener cancelListener, final String cancelCommand, final ActionListener saveListener, final String saveCommand) {
+      
+      log.debug("scheduling multiple hashdatainput dialog");
+      
       SwingUtilities.invokeLater(new Runnable() {
 
         @Override
         public void run() {
+          
+          log.debug("show multiple hashdatainput dialog");
+          
           mainPanel.removeAll();
           buttonPanel.removeAll();
 
@@ -1166,10 +1235,15 @@ public class BKUGUI implements BKUGUIFacade {
     
     private void showSaveHashDataInputDialog(final List<HashDataInput> signedRefs, final ActionListener okListener, final String okCommand) {
       
+      log.debug("scheduling save hashdatainput dialog");
+      
       SwingUtilities.invokeLater(new Runnable() {
 
         @Override
         public void run() {
+          
+          log.debug("show save hashdatainput dialog");
+      
           String userHome = System.getProperty("user.home");
           
           JFileChooser fileDialog = new JFileChooser(userHome); 
-- 
cgit v1.2.3


From 8ccd9ab69dc74762567930f4c576a359502f1071 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 30 Sep 2008 16:37:59 +0000
Subject: showErrorDialog l10n

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@77 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/applet/BKUWorker.java    | 10 +++---
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 41 +++++++++++++---------
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java | 14 ++++++--
 .../at/gv/egiz/bku/gui/Messages.properties         | 11 +++++-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java | 33 +++++++++++------
 .../at/gv/egiz/bku/local/stal/BKUGuiProxy.java     |  8 ++---
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   |  7 ++--
 7 files changed, 81 insertions(+), 43 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
index a87b04c4..12eb9d00 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
@@ -126,7 +126,7 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
       log.fatal("Failed to call STAL service.", e);
       actionCommandList.clear();
       actionCommandList.add("ok");
-      gui.showErrorDialog(errorMessages.getString("failed.WS"));
+      gui.showErrorDialog(BKUGUIFacade.ERR_SERVICE_UNREACHABLE, new Object[] {e.getMessage()});
       try {
         waitForAction();
       } catch (InterruptedException e1) {
@@ -204,7 +204,7 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
       log.info("Done " + Thread.currentThread().getName());
     } catch (Exception ex) {
       log.error(ex.getMessage(), ex);
-      gui.showErrorDialog("Sorry, an internal error occured: " + ex.getMessage());
+      gui.showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, new Object[] {ex.getMessage()}); 
       try {
         waitForAction();
       } catch (InterruptedException e) {
@@ -279,8 +279,7 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
         case SMCCHelper.PC_SC_NOT_SUPPORTED:
           actionCommandList.clear();
           actionCommandList.add("ok");
-          gui.showErrorDialog(errorMessages.getString("nopcscsupport"), this,
-            "ok");
+          gui.showErrorDialog(BKUGUIFacade.ERR_NO_PCSC, null, this, "ok");
           try {
             waitForAction();
           } catch (InterruptedException e) {
@@ -290,8 +289,7 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
         case SMCCHelper.TERMINAL_NOT_PRESENT:
           actionCommandList.clear();
           actionCommandList.add("ok");
-          gui.showErrorDialog(errorMessages.getString("nocardterminal"), this,
-            "ok");
+          gui.showErrorDialog(BKUGUIFacade.ERR_NO_CARDTERMINAL,null,this,"ok");
           try {
             waitForAction();
           } catch (InterruptedException e) {
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 749207ee..b09669b8 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
@@ -41,6 +41,8 @@ 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;
@@ -94,7 +96,7 @@ public class BKUGUI implements BKUGUIFacade {
     private static final String MESSAGE_OVERWRITE = "message.overwrite";
     private static final String LABEL_PIN = "label.pin";
     private static final String LABEL_PINSIZE = "label.pinsize";
-    private static final String ERROR_NO_HASHDATA = "error.no.hashdata";
+//    private static final String ERROR_NO_HASHDATA = "error.no.hashdata";
     
     private static final String BUTTON_OK = "button.ok";
     private static final String BUTTON_CANCEL = "button.cancel";
@@ -798,7 +800,7 @@ public class BKUGUI implements BKUGUIFacade {
     }
 
     @Override
-    public void showErrorDialog(final String errorMsg, final ActionListener okListener, final String okCommand) {
+    public void showErrorDialog(final String errorMsgKey, final Object[] errorMsgParams, final ActionListener okListener, final String okCommand) {
         
       log.debug("scheduling error dialog");
       
@@ -815,9 +817,12 @@ public class BKUGUI implements BKUGUIFacade {
                 titleLabel.setText(messages.getString(TITLE_ERROR));
 //                titleLabel.setForeground(defaultForground);
 
+                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("<html>" + errorMsg + "</html>");
+                errorMsgLabel.setText(errorMsg);
                 errorMsgLabel.setForeground(ERROR_COLOR);
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
@@ -860,7 +865,7 @@ public class BKUGUI implements BKUGUIFacade {
     }
 
     @Override
-    public void showErrorDialog(final String errorMsg) {
+    public void showErrorDialog(final String errorMsgKey, final Object[] errorMsgParams) {
       
       log.debug("scheduling error  dialog");
       
@@ -877,10 +882,13 @@ public class BKUGUI implements BKUGUIFacade {
           titleLabel.setText(messages.getString(TITLE_ERROR));
 //                titleLabel.setForeground(defaultForground);
 
-          JLabel errorMsgLabel = new JLabel();
-          errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-          errorMsgLabel.setText("<html>" + errorMsg + "</html>");
-          errorMsgLabel.setForeground(ERROR_COLOR);
+          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);
 
           GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
           mainPanel.setLayout(mainPanelLayout);
@@ -955,7 +963,7 @@ public class BKUGUI implements BKUGUIFacade {
     public void showHashDataInputDialog(final List<HashDataInput> signedReferences, final ActionListener okListener, final String okCommand) {
       
       if (signedReferences == null) {
-        showErrorDialog(messages.getString(ERROR_NO_HASHDATA), okListener, okCommand);
+        showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {"No SignedReferences provided"}, okListener, okCommand);
       }
       
       if (signedReferences.size() == 1) {
@@ -971,11 +979,12 @@ public class BKUGUI implements BKUGUIFacade {
                     showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
                 }
             };
-            String hashDataText = getText(signedReferences.get(0));
-            if (hashDataText != null) {
+            
+            try {
+              String hashDataText = getText(signedReferences.get(0));
               showPlainTextHashDataInputDialog(hashDataText, saveHashDataListener, "save", okListener, okCommand);
-            } else {
-              showErrorDialog(messages.getString(ERROR_NO_HASHDATA), okListener, okCommand);
+            } catch (IOException ex) {
+              showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {ex.getMessage()}, okListener, okCommand);
             }
           
           } else {
@@ -1300,7 +1309,7 @@ public class BKUGUI implements BKUGUIFacade {
                     bos.close();
                 } catch (IOException ex) {
                     log.error("Failed to write HashDataInput to file " + file + ": " + ex.getMessage());
-                    showErrorDialog("Failed to write signed reference to file: " + ex.getMessage(), null, null);
+                    showErrorDialog(ERR_WRITE_HASHDATA, new Object[] {ex.getMessage()}, null, null);
                     ex.printStackTrace();
                 } finally {
                     try {
@@ -1316,7 +1325,7 @@ public class BKUGUI implements BKUGUIFacade {
       });
     }
     
-    private static String getText(HashDataInput hdi) {
+    private static String getText(HashDataInput hdi) throws IOException {
       ByteArrayOutputStream baos = null;
       try {
         InputStream hashDataIS = hdi.getHashDataInput();
@@ -1338,7 +1347,7 @@ public class BKUGUI implements BKUGUIFacade {
         }
       } catch (IOException ex) {
           log.error("Failed to read HashDataInput for reference " + hdi.getReferenceId() + ": " + ex.getMessage());
-          return null;
+          throw ex; 
       } finally {
           try {
               baos.close();
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index f4b6325d..32eb4c3e 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -23,7 +23,15 @@ import java.awt.event.ActionListener;
 import java.util.List;
 
 public interface BKUGUIFacade {
-    
+  
+  public static final String ERR_UNKNOWN = "error.unknown";
+  public static final String ERR_SERVICE_UNREACHABLE = "error.ws.unreachable";
+  public static final String ERR_NO_PCSC = "error.pcsc";
+  public static final String ERR_NO_CARDTERMINAL = "error.cardterminal";
+  public static final String ERR_NO_HASHDATA = "error.no.hashdata";
+  public static final String ERR_WRITE_HASHDATA = "error.write.hashdata";
+  public static final String ERR_INVALID_HASH = "error.invalid.hash";
+  
     public void init(Container contentPane, String localeString);
     
     public void showWelcomeDialog(); 
@@ -55,7 +63,7 @@ public interface BKUGUIFacade {
     
 //    public void showPlainTextHashDataInputDialog(String text, ActionListener saveListener, String saveCommand, ActionListener cancelListener, String cancelCommand);
     
-    public void showErrorDialog(String errorMsg, ActionListener okListener, String actionCommand);
+    public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams, ActionListener okListener, String actionCommand);
     
-    public void showErrorDialog(String errorMsg);
+    public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams);
 }
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index a329ba86..79e23859 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -35,7 +35,6 @@ message.retries=<html>Noch {0} Versuche</html>
 message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
 label.pin=<html>{0}:</html>
 label.pinsize=<html>({0} stellig)</html>
-error.no.hashdata=<html>Keine Signaturdaten verf\u00FCgbar</html>
 button.ok=OK
 button.cancel=Abbrechen
 button.back=Zur\u00FCck
@@ -48,3 +47,13 @@ mimetype.desc.txt=Textdateien (.txt)
 mimetype.desc.pdf=Adobe PDF-Dateien (.pdf)
 mimetype.desc.bin=Bin\u00E4rdateien (.bin)
 save.hashdatainput.prefix=Signaturdaten
+
+# Error Messages
+error.no.hashdata=<html>Keine Signaturdaten verf\u00FCgbar: {0}</html>
+error.write.hashdata=<html>Die Signaturdaten konnten nicht gespeichert werden: {0}</html>
+error.invalid.hash=<html>Die Signaturdaten sind ung\u00FCltig: {0}</html>
+error.ws.unreachable=<html>Das Web-Service ist nicht erreichbar: {0}</html>
+error.pcsc=<html>Java(TM) scheint keine PC/SC Schnittstelle f\u00FCr den Smartcard-Zugriff zur Verf\u00FCgung zu stellen.</html>
+error.cardterminal=<html>Es konnte kein Smartcard-Leser gefunden werden.<p>Entweder ist kein Leser angeschlossen oder kein PC/SC Treiber installiert.</p></html>
+error.unknown=<html>Leider trat ein Fehler auf: {0}</html>
+error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
\ No newline at end of file
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 909da4ad..0641bf58 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
@@ -186,13 +186,13 @@ public class BKUGUIWorker implements Runnable {
 //
 //        Thread.sleep(2000);
         
-        gui.showWaitDialog(null);
-        
-        Thread.sleep(1000);
-        
-        gui.showWaitDialog("test");
-        
-        Thread.sleep(1000);
+//        gui.showWaitDialog(null);
+//        
+//        Thread.sleep(1000);
+//        
+//        gui.showWaitDialog("test");
+//        
+//        Thread.sleep(1000);
           
 
 //            gui.showInsertCardDialog(cancelListener, "cancel");
@@ -218,11 +218,24 @@ public class BKUGUIWorker implements Runnable {
 //
 //            Thread.sleep(2000);
 ////            
-            gui.showErrorDialog("Testfehler occured", null, null);
-            
+//            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("Testfehler occured"); 
+            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");
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
index c543c8ca..22ab1d6f 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
@@ -65,16 +65,16 @@ public class BKUGuiProxy implements BKUGUIFacade {
   }
 
   @Override
-  public void showErrorDialog(String errorMsg, ActionListener okListener,
+  public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams, ActionListener okListener,
       String actionCommand) {
     showDialog();
-    delegate.showErrorDialog(errorMsg, okListener, actionCommand);
+    delegate.showErrorDialog(errorMsgKey, errorMsgParams, okListener, actionCommand);
   }
 
   @Override
-  public void showErrorDialog(String errorMsg) {
+  public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams) {
     showDialog();
-    delegate.showErrorDialog(errorMsg);
+    delegate.showErrorDialog(errorMsgKey, errorMsgParams);
   }
 
   @Override
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index 0b297283..7d994392 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -16,6 +16,7 @@
  */
 package at.gv.egiz.bku.smccstal;
 
+import at.gv.egiz.bku.gui.BKUGUIFacade;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.security.MessageDigest;
@@ -318,15 +319,15 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
             gui.showHashDataInputDialog(hashDataInputs, SignRequestHandler.this, "ok");
           } catch (DigestException ex) { 
             log.error("Bad digest value: " + ex.getMessage());
-            gui.showErrorDialog(ex.getMessage());
+            gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH, new Object[] {ex.getMessage()});
           } catch (Exception ex) {
             //FIXME localize messages
             log.error("Failed to obtain HashDataInputs: " + ex.getMessage());
-            gui.showErrorDialog("Failed to obtain HashDataInputs: " + ex.getMessage(), SignRequestHandler.this, "ok");
+            gui.showErrorDialog(BKUGUIFacade.ERR_NO_HASHDATA, new Object[] {ex.getMessage()}, SignRequestHandler.this, "ok");
           }
         } else {
           //FIXME get all hashdatainputs
-          gui.showErrorDialog("Failed to obtain HashDataInputs: No dsig:SignedInfo provided.", SignRequestHandler.this, "ok");
+          gui.showErrorDialog(BKUGUIFacade.ERR_NO_HASHDATA, new Object[] {"No dsig:SignedInfo provided"}, SignRequestHandler.this, "ok");
         }
       } else if (actionCommand.equals("sign")) {
         return new String(gui.getPin());
-- 
cgit v1.2.3


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

(limited to 'BKUCommonGUI')

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


From a8d050168ad30c59087d9b8f7b399f0ffbb671d8 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 9 Oct 2008 07:54:29 +0000
Subject: SimpleGUI (one button)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@88 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/src/test/resources/appletTest.html       |    2 +-
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   |    2 +-
 .../java/at/gv/egiz/bku/gui/BKUGUIFactory.java     |   32 +-
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    | 1451 ++++++++++++++++++++
 .../at/gv/egiz/bku/gui/Messages.properties         |    4 +-
 5 files changed, 1471 insertions(+), 20 deletions(-)
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
index 3b944a40..5b10d6b5 100644
--- a/BKUApplet/src/test/resources/appletTest.html
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -19,7 +19,7 @@
     <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>
+              width=190 height=130>
               <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"/>
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 24cc2601..636a9fef 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
@@ -429,7 +429,7 @@ public class BKUGUI implements BKUGUIFacade {
 
                 JLabel insertCardMsgLabel = new JLabel();
                 insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                insertCardMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD));
+                insertCardMsgLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED)); //MESSAGE_INSERTCARD));
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
index 478b949b..5124914a 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
@@ -14,19 +14,19 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package at.gv.egiz.bku.gui;
-
-public class BKUGUIFactory {
-  private static BKUGUIFactory instance = new BKUGUIFactory();
-
-  private BKUGUIFactory() {
-  }
-
-  protected BKUGUIFacade createNewGUI() {
-    return new BKUGUI();
-  }
-
-  public static BKUGUIFacade createGUI() {
-    return instance.createNewGUI();
-  }
-}
+package at.gv.egiz.bku.gui;
+
+public class BKUGUIFactory {
+  private static BKUGUIFactory instance = new BKUGUIFactory();
+
+  private BKUGUIFactory() {
+  }
+
+  protected BKUGUIFacade createNewGUI() {
+    return new SimpleGUI();
+  }
+
+  public static BKUGUIFacade createGUI() {
+    return instance.createNewGUI();
+  }
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
new file mode 100644
index 00000000..b7d86d05
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -0,0 +1,1451 @@
+/*
+ * 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.
+ */
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.stal.HashDataInput;
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Cursor;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.MessageFormat;
+import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
+import javax.swing.GroupLayout;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPasswordField;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.LayoutStyle;
+import javax.swing.SwingUtilities;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableModel;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author clemens
+ */
+public class SimpleGUI implements BKUGUIFacade {
+    
+    private static final Log log = LogFactory.getLog(SimpleGUI.class);
+    public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
+    public static final String LOGO_RESOURCE = "/images/logo.png";
+    public static final String HASHDATA_FONT = "Monospaced";
+    public static final Color ERROR_COLOR = Color.RED;
+    public static final Color HYPERLINK_COLOR = Color.BLUE;
+    private static final String TITLE_WELCOME = "title.welcome";
+    private static final String TITLE_INSERTCARD = "title.insertcard";
+    private static final String TITLE_CARD_NOT_SUPPORTED = "title.cardnotsupported";
+    private static final String TITLE_CARDPIN = "title.cardpin";
+    private static final String TITLE_SIGN = "title.sign";
+    private static final String TITLE_ERROR = "title.error";
+    private static final String TITLE_RETRY = "title.retry";
+    private static final String TITLE_WAIT = "title.wait";
+    private static final String TITLE_HASHDATA = "title.hashdata";
+    private static final String WINDOWTITLE_SAVE = "windowtitle.save";
+    private static final String WINDOWTITLE_SAVEDIR = "windowtitle.savedir";
+    private static final String WINDOWTITLE_OVERWRITE = "windowtitle.overwrite";
+    private static final String MESSAGE_WAIT = "message.wait";
+    private static final String MESSAGE_INSERTCARD = "message.insertcard";
+    private static final String MESSAGE_HASHDATALINK = "message.hashdatalink";
+    private static final String MESSAGE_HASHDATA = "message.hashdata";
+    private static final String MESSAGE_HASHDATALIST = "message.hashdatalist";
+    private static final String MESSAGE_RETRIES = "message.retries";
+    private static final String MESSAGE_OVERWRITE = "message.overwrite";
+    private static final String LABEL_PIN = "label.pin";
+    private static final String LABEL_PINSIZE = "label.pinsize";
+//    private static final String ERROR_NO_HASHDATA = "error.no.hashdata";
+    
+    private static final String BUTTON_OK = "button.ok";
+    private static final String BUTTON_CANCEL = "button.cancel";
+    private static final String BUTTON_BACK = "button.back";
+    private static final String BUTTON_SIGN = "button.sign";
+    private static final String BUTTON_SAVE = "button.save";
+    private static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
+    protected Container contentPane;
+    protected ResourceBundle messages;
+    /** left and right side main panels */
+//    protected JPanel iconPanel;
+    protected JPanel contentPanel;
+    /** right side content panels and layouts */
+//    protected JPanel headerPanel;
+    protected JPanel mainPanel;
+    protected JPanel buttonPanel;
+    /** right side fixed labels  */
+//    protected JLabel titleLabel;
+    /** remember the pinfield to return to worker */
+    protected JPasswordField pinField;
+
+//    protected JButton okButton;
+//    protected JButton cancelButton;
+//    protected JButton signButton;
+//    protected JButton saveButton;
+//    protected JButton backButton;
+    protected int buttonSize;
+    
+    private static final int CHECKBOX_WIDTH = new JCheckBox().getPreferredSize().width;
+    
+    /**
+     * @param contentPane
+     * @param localeString may be null
+     */
+    @Override
+    public void init(final Container contentPane, String localeString) {
+
+        if (localeString != null) {
+            messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, new Locale(localeString));
+        } else {
+            messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
+        }
+
+        this.contentPane = contentPane;
+
+        try {
+
+          log.debug("scheduling gui initialization");
+      
+            SwingUtilities.invokeAndWait(new Runnable() {
+
+                @Override
+                public void run() {
+                  
+                  log.debug("initializing gui");
+
+//                    initIconPanel();
+                    initContentPanel();
+
+                    GroupLayout layout = new GroupLayout(contentPane);
+                    contentPane.setLayout(layout);
+                    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) {
+            throw new RuntimeException("Failed to init GUI: " + ex.getMessage());
+        }
+    }
+
+//    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();
+        mainPanel = new JPanel();
+        buttonPanel = new JPanel();
+
+//        headerPanel.setBorder(new TitledBorder("header"));
+//        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));
+        
+        JButton b = new JButton();
+//        b.setText(messages.getString(BUTTON_CANCEL));
+//        if (b.getPreferredSize().width > buttonSize)
+//            buttonSize = b.getPreferredSize().width;
+        b.setText(messages.getString(BUTTON_OK));
+        if (b.getPreferredSize().width > buttonSize)
+            buttonSize = b.getPreferredSize().width;
+        b.setText(messages.getString(BUTTON_SIGN));
+        if (b.getPreferredSize().width > buttonSize)
+            buttonSize = b.getPreferredSize().width;
+        b.setText(messages.getString(BUTTON_BACK));
+        if (b.getPreferredSize().width > buttonSize)
+            buttonSize = b.getPreferredSize().width;
+//        b.setText(messages.getString(BUTTON_SAVE));
+//        if (b.getPreferredSize().width > buttonSize)
+//            buttonSize = b.getPreferredSize().width;
+        
+//        if (cancelButton.getPreferredSize().width > buttonSize)
+//            buttonSize = cancelButton.getPreferredSize().width;
+//        if (signButton.getPreferredSize().width > buttonSize)
+//            buttonSize = signButton.getPreferredSize().width;
+//        if (backButton.getPreferredSize().width > buttonSize)
+//            buttonSize = backButton.getPreferredSize().width;
+//        if (saveButton.getPreferredSize().width > buttonSize)
+//            buttonSize = saveButton.getPreferredSize().width;
+
+        
+//        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));
+
+
+        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.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(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)
+            .addContainerGap()); //);
+    }
+
+    @Override
+    public void showLoginDialog(ActionListener loginListener, String actionCommand) {
+      
+      log.debug("scheduling login dialog");
+        
+      SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+              
+              log.debug("show login dialog");
+              
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+//                titleLabel.setText(messages.getString(TITLE_ERROR));
+
+                JLabel waitMsgLabel = new JLabel();
+                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                waitMsgLabel.setText("<html>LoginDialog not supported yet.</html>");
+                waitMsgLabel.setForeground(ERROR_COLOR);
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(waitMsgLabel));
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(waitMsgLabel));
+
+                contentPanel.validate();
+            }
+        });
+    }
+
+    @Override
+    public void showWelcomeDialog() {
+      
+      log.debug("scheduling welcome dialog");
+      
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+              
+              log.debug("show welcome dialog");
+              
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+//                titleLabel.setText(messages.getString(TITLE_WELCOME));
+
+                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);
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(welcomeMsgLabel));
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(welcomeMsgLabel));
+
+                contentPanel.validate();
+
+            }
+        });
+    }
+
+    @Override
+    public void showInsertCardDialog(final ActionListener cancelListener, final String cancelCommand) {
+      
+      log.debug("scheduling insert card dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+              
+              log.debug("show insert card dialog");
+      
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+//                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);
+//                cancelButton.setActionCommand(cancelCommand);
+//
+//                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+//                buttonPanel.setLayout(buttonPanelLayout);
+//
+//                buttonPanelLayout.setHorizontalGroup(
+//                  buttonPanelLayout.createSequentialGroup()
+//                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+//                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+//                buttonPanelLayout.setVerticalGroup(
+//                  buttonPanelLayout.createSequentialGroup()
+//                    .addComponent(cancelButton));
+
+                contentPanel.validate();
+            }
+        });
+    }
+
+    /**
+     * only difference to showInsertCard: title text: card not supported
+     * @param cancelListener
+     * @param cancelCommand
+     */
+    @Override
+    public void showCardNotSupportedDialog(final ActionListener cancelListener, final String cancelCommand) {
+        
+      log.debug("scheduling card not supported dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                
+              log.debug("show card not supported dialog");
+                
+              mainPanel.removeAll();
+              buttonPanel.removeAll();
+
+//                titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
+
+                JLabel insertCardMsgLabel = new JLabel();
+                insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                insertCardMsgLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED)); //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);
+//                cancelButton.setActionCommand(cancelCommand);
+//
+//                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+//                buttonPanel.setLayout(buttonPanelLayout);
+//
+//                buttonPanelLayout.setHorizontalGroup(
+//                  buttonPanelLayout.createSequentialGroup()
+//                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+//                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+//                buttonPanelLayout.setVerticalGroup(
+//                  buttonPanelLayout.createSequentialGroup()
+//                    .addComponent(cancelButton));
+                
+                contentPanel.validate();
+            }
+        });
+    }
+
+    private void showCardPINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener okListener, final String okCommand, final ActionListener cancelListener, final String cancelCommand) {
+        
+      log.debug("scheduling card-pin dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+
+              log.debug("show card-pin dialog");
+      
+                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));
+//                }
+
+//                JButton cancelButton = new JButton();
+//                cancelButton.setText(messages.getString(BUTTON_CANCEL));
+//                cancelButton.setActionCommand(cancelCommand);
+//                cancelButton.addActionListener(cancelListener);
+
+                JButton okButton = new JButton();
+                okButton.setText(messages.getString(BUTTON_OK));
+                okButton.setEnabled(false);
+                okButton.setActionCommand(okCommand);
+                okButton.addActionListener(okListener);
+
+                JLabel cardPinLabel = new JLabel();
+                cardPinLabel.setFont(cardPinLabel.getFont().deriveFont(cardPinLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                String pinLabel = messages.getString(LABEL_PIN);
+                cardPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
+
+//                JPasswordField cardPINField = new JPasswordField();
+                pinField = new JPasswordField();
+                pinField.setText("");
+                pinField.setDocument(new PINDocument(pinSpec, okButton));
+                pinField.setActionCommand(okCommand);
+                pinField.addActionListener(new ActionListener() {
+
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        if (pinField.getPassword().length >= pinSpec.getMinLength()) {
+                            okListener.actionPerformed(e);
+                        }
+                    }
+                });
+
+                JLabel infoLabel = new JLabel();
+                if (numRetries < 0) {
+                    infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                    String pinsizePattern = messages.getString(LABEL_PINSIZE);
+                    String pinSize = String.valueOf(pinSpec.getMinLength());
+                    if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+                        pinSize += "-" + pinSpec.getMaxLength();
+                    }
+                    infoLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                } else {
+                    infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
+                    infoLabel.setForeground(ERROR_COLOR);
+                }
+
+//                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+//                mainPanel.setLayout(mainPanelLayout);
+//
+//                mainPanelLayout.setHorizontalGroup(
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//                  .addGroup(mainPanelLayout.createSequentialGroup() //                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//                  //                  .addComponent(hashDataLabel)
+//                  //                  .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
+//                  .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) //RELATED)
+//                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) //TRAILING)
+//                  .addComponent(infoLabel) //, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)
+//                  .addComponent(pinField, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)) //))
+//                  .addContainerGap()));
+//
+//                mainPanelLayout.setVerticalGroup(
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addContainerGap() //                  .addComponent(hashDataLabel).addGap(14, 14, 14)
+//                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) //, false)
+//                  .addComponent(cardPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
+//                  .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
+//                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(infoLabel).addGap(cardPinLabel.getFont().getSize()))); //10, 10, 10)));
+//
+//                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+//                buttonPanel.setLayout(buttonPanelLayout);
+//
+//                buttonPanelLayout.setHorizontalGroup(
+//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(okButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
+//                buttonPanelLayout.setVerticalGroup(
+//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(okButton).addComponent(cancelButton)));
+
+                
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
+                    .addGroup(mainPanelLayout.createSequentialGroup()
+                        .addComponent(cardPinLabel, 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()
+//                        .addComponent(hashDataLabel)
+//                        .addGap(hashDataLabel.getFont().getSize())
+                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(cardPinLabel)
+                            .addComponent(pinField))
+                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(infoLabel));
+//                        .addGap(signPinLabel.getFont().getSize())); 
+
+                
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                buttonPanelLayout.setHorizontalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+                buttonPanelLayout.setVerticalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                    .addComponent(okButton));
+
+//                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+//                buttonPanel.setLayout(buttonPanelLayout);
+//
+//                buttonPanelLayout.setHorizontalGroup(
+//                  buttonPanelLayout.createSequentialGroup()
+//                        .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));
+//                buttonPanelLayout.setVerticalGroup(
+//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
+//                        .addComponent(okButton)
+//                        .addComponent(cancelButton)); 
+
+                pinField.requestFocusInWindow();
+                contentPanel.validate();
+
+            }
+        });
+    }
+
+    @Override
+    public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
+        showCardPINDialog(pinSpec, -1, okListener, okCommand, cancelListener, cancelCommand);
+    }
+
+    @Override
+    public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
+        showCardPINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand);
+    }
+
+    @Override
+    public void showSignaturePINDialog(PINSpec pinSpec, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
+        showSignaturePINDialog(pinSpec, -1, signListener, signCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
+    }
+
+    @Override
+    public void showSignaturePINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
+        showSignaturePINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
+    }
+
+    private void showSignaturePINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener signListener, final String signCommand, final ActionListener cancelListener, final String cancelCommand, final ActionListener hashdataListener, final String hashdataCommand) {
+
+      log.debug("scheduling signature-pin dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+              
+              log.debug("show signature-pin dialog");
+      
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+//                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));
+//                cancelButton.setActionCommand(cancelCommand);
+//                cancelButton.addActionListener(cancelListener);
+
+                JButton signButton = new JButton();
+                signButton.setText(messages.getString(BUTTON_SIGN));
+                signButton.setEnabled(false);
+                signButton.setActionCommand(signCommand);
+                signButton.addActionListener(signListener);
+
+                JLabel signPinLabel = new JLabel();
+                signPinLabel.setFont(signPinLabel.getFont().deriveFont(signPinLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                String pinLabel = messages.getString(LABEL_PIN);
+                signPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
+
+                pinField = new JPasswordField();
+                pinField.setText("");
+                pinField.setDocument(new PINDocument(pinSpec, signButton));
+                pinField.setActionCommand(signCommand);
+                pinField.addActionListener(new ActionListener() {
+
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        if (pinField.getPassword().length >= pinSpec.getMinLength()) {
+                            signListener.actionPerformed(e);
+                        }
+                    }
+                });
+
+                //pinsize or error label
+                JLabel infoLabel = new JLabel();
+                infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                if (numRetries < 0) {
+                    String pinsizePattern = messages.getString(LABEL_PINSIZE);
+                    String pinSize = String.valueOf(pinSpec.getMinLength());
+                    if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+                        pinSize += "-" + pinSpec.getMaxLength();
+                    }
+                    infoLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                } else {
+                    infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
+                    infoLabel.setForeground(ERROR_COLOR);
+                }
+
+                JLabel hashDataLabel = new JLabel();
+                hashDataLabel.setFont(hashDataLabel.getFont().deriveFont(hashDataLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                hashDataLabel.setText(messages.getString(MESSAGE_HASHDATALINK));
+                hashDataLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                hashDataLabel.setForeground(HYPERLINK_COLOR);
+                hashDataLabel.addMouseListener(new MouseAdapter() {
+
+                    @Override
+                    public void mouseClicked(MouseEvent me) {
+                        ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
+                        hashdataListener.actionPerformed(e);
+                    }
+                });
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                mainPanelLayout.setHorizontalGroup(
+                  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()
+                        .addComponent(hashDataLabel)
+                        .addGap(hashDataLabel.getFont().getSize())
+                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(signPinLabel)
+                            .addComponent(pinField))
+                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(infoLabel));
+//                        .addGap(signPinLabel.getFont().getSize())); 
+
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                buttonPanelLayout.setHorizontalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(signButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+                buttonPanelLayout.setVerticalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                    .addComponent(signButton));
+
+//                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+//                buttonPanel.setLayout(buttonPanelLayout);
+//
+//                buttonPanelLayout.setHorizontalGroup(
+//                  buttonPanelLayout.createSequentialGroup()
+//                        .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));
+//                buttonPanelLayout.setVerticalGroup(
+//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
+//                        .addComponent(signButton)
+//                        .addComponent(cancelButton)); 
+
+                pinField.requestFocusInWindow();
+                contentPanel.validate();
+
+            }//            private ParallelGroup createMainGroup(GroupLayout mainPanelLayout, JLabel hashDataLabel, JLabel signPinLabel, JLabel pinSizeLabel, JLabel errorLabel) {
+//                ParallelGroup mainGroup = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+//                mainGroup.addComponent(hashDataLabel);
+//                if (errorLabel != null) {
+//                    mainGroup.addComponent(errorLabel);
+//                }
+//                mainGroup.addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
+//                                                                    .addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE)
+//                                                                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+//                                                                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
+//                                                                                                .addComponent(pinSizeLabel)
+//                                                                                                .addComponent(pinField, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)));
+//                return mainGroup;
+//            }
+//            private GroupLayout.SequentialGroup createVerticalMainGroup(GroupLayout mainPanelLayout, JLabel hashDataLabel, JLabel signPinLabel, JLabel pinSizeLabel, JLabel errorLabel) {
+//                GroupLayout.SequentialGroup mainGroup = mainPanelLayout.createSequentialGroup();
+//                mainGroup.addComponent(hashDataLabel)
+//                    .addGap(hashDataLabel.getFont().getSize()); //14, 14, 14)
+//                    
+//                if (errorLabel != null) {
+//                    mainGroup.addComponent(errorLabel)
+//                      .addGap(errorLabel.getFont().getSize());
+//                }
+//                mainGroup.addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE, false)
+//                        .addComponent(signPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
+//                        .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
+//                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+//                    .addComponent(pinSizeLabel)
+//                    .addGap(signPinLabel.getFont().getSize());
+//                
+//                return mainGroup;
+////                mainPanelLayout.createSequentialGroup()
+////                    .addComponent(hashDataLabel)
+////                    .addGap(hashDataLabel.getFont().getSize()) //14, 14, 14)
+////                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE, false)
+////                        .addComponent(signPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
+////                        .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
+////                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+////                    .addComponent(pinSizeLabel)
+////                    .addGap(signPinLabel.getFont().getSize())
+////                    
+////                    
+//            }
+        });
+    }
+
+    @Override
+    public void showErrorDialog(final String errorMsgKey, final Object[] errorMsgParams, final ActionListener okListener, final String okCommand) {
+        
+      log.debug("scheduling error dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+          @Override
+            public void run() {
+
+                log.debug("show error dialog");
+                
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+//                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);
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(errorMsgLabel));
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(errorMsgLabel));
+
+                JButton okButton = new JButton();
+                okButton.setText(messages.getString(BUTTON_OK));
+                okButton.setActionCommand(okCommand);
+                okButton.addActionListener(okListener);
+
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                buttonPanelLayout.setHorizontalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+                buttonPanelLayout.setVerticalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                    .addComponent(okButton));
+
+                contentPanel.validate();
+            }
+        });
+    }
+
+    @Override
+    public void showErrorDialog(final String errorMsgKey, final Object[] errorMsgParams) {
+      
+      log.debug("scheduling error  dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+        @Override
+        public void run() {
+          
+          log.debug("show error dialog");
+      
+          mainPanel.removeAll();
+          buttonPanel.removeAll();
+
+//          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);
+
+          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+          mainPanel.setLayout(mainPanelLayout);
+
+          mainPanelLayout.setHorizontalGroup(
+            mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+            .addComponent(errorMsgLabel));
+          mainPanelLayout.setVerticalGroup(
+            mainPanelLayout.createSequentialGroup()
+//            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+            .addComponent(errorMsgLabel));
+
+          contentPanel.validate();
+        }
+      });
+    }
+
+    @Override
+    public void showWaitDialog(final String waitMessage) {
+        
+      log.debug("scheduling wait dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+        
+              log.debug("show wait dialog");
+              
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+//                titleLabel.setText(messages.getString(TITLE_WAIT));
+
+                JLabel waitMsgLabel = new JLabel();
+                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                if (waitMessage != null) {
+                    waitMsgLabel.setText("<html>" + waitMessage + "</html>");
+                } else {
+                    waitMsgLabel.setText(messages.getString(MESSAGE_WAIT));
+                }
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(waitMsgLabel));
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createSequentialGroup()
+//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(waitMsgLabel));
+
+                contentPanel.validate();
+            }
+        });
+    }
+
+    @Override
+    public char[] getPin() {
+        if (pinField != null) {
+            return pinField.getPassword();
+        }
+        return null;
+    }
+    
+    @Override
+    public void showHashDataInputDialog(final List<HashDataInput> signedReferences, final ActionListener okListener, final String okCommand) {
+      
+      if (signedReferences == null) {
+        showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {"No SignedReferences provided"}, okListener, okCommand);
+      }
+      
+      if (signedReferences.size() == 1) {
+
+//          final HashDataInput signedRef = signedReferences.get(0);
+          
+          if ("text/plain".equals(signedReferences.get(0).getMimeType())) {
+            
+            ActionListener saveHashDataListener = new ActionListener() {
+
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
+                }
+            };
+            
+            try {
+              String hashDataText = getText(signedReferences.get(0));
+              showPlainTextHashDataInputDialog(hashDataText, saveHashDataListener, "save", okListener, okCommand);
+            } catch (IOException ex) {
+              showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {ex.getMessage()}, okListener, okCommand);
+            }
+          
+          } else {
+            showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
+          }
+          
+      } else {
+
+        final HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
+
+        ActionListener saveHashDataListener = new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+              showSaveHashDataInputDialog(tableModel.getSelectedHashData(), okListener, okCommand);
+            }
+        };
+        showMultipleHashDataInputDialog(tableModel, okListener, okCommand, saveHashDataListener, "save");
+      }
+    }
+    
+    private void showPlainTextHashDataInputDialog(final String hashDataText, final ActionListener saveListener, final String saveCommand, final ActionListener cancelListener, final String cancelCommand) {
+      
+      log.debug("scheduling plaintext hashdatainput dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+        @Override
+        public void run() {
+          
+          log.debug("show plaintext hashdatainput dialog");
+      
+          mainPanel.removeAll();
+          buttonPanel.removeAll();
+
+//          titleLabel.setText(messages.getString(TITLE_HASHDATA));
+
+          JLabel refIdLabel = new JLabel();
+          refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+          refIdLabel.setText(messages.getString(MESSAGE_HASHDATA)); //MessageFormat.format(refIdLabelPattern, new Object[]{refId}));
+
+          JTextArea hashDataTextArea = new JTextArea(hashDataText);
+          hashDataTextArea.setEditable(false);
+//          hashDataTextArea.setColumns(1);
+//          hashDataTextArea.setRows(1);
+          hashDataTextArea.setFont(new Font(HASHDATA_FONT, hashDataTextArea.getFont().getStyle(), hashDataTextArea.getFont().getSize()));
+//          hashDataScrollPane.setViewportView(hashDataTextArea);
+//          hashDataScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); //HORIZONTAL_SCROLLBAR_NEVER);
+          hashDataTextArea.setLineWrap(true);
+          hashDataTextArea.setWrapStyleWord(true);
+
+          JScrollPane hashDataScrollPane = new JScrollPane(hashDataTextArea);
+
+          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+          mainPanel.setLayout(mainPanelLayout);
+
+          mainPanelLayout.setHorizontalGroup(
+             mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(refIdLabel)
+                      .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
+
+          mainPanelLayout.setVerticalGroup(
+            mainPanelLayout.createSequentialGroup()
+                  .addComponent(refIdLabel)
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                  .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
+
+  //        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+  //        mainPanel.setLayout(mainPanelLayout);
+  //
+  //        mainPanelLayout.setHorizontalGroup(
+  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(refIdLabel).addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)).addContainerGap()));
+  //
+  //        mainPanelLayout.setVerticalGroup(
+  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addComponent(refIdLabel).addGap(refIdLabel.getFont().getSize()).addComponent(hashDataScrollPane).addGap(refIdLabel.getFont().getSize())));
+
+          JButton backButton = new JButton();
+          backButton.setText(messages.getString(BUTTON_BACK));
+          backButton.setActionCommand(cancelCommand);
+          backButton.addActionListener(cancelListener);
+
+//          JButton saveButton = new JButton();
+//          saveButton.setText(messages.getString(BUTTON_SAVE));
+//          saveButton.setActionCommand(saveCommand);
+//          saveButton.addActionListener(saveListener);
+
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                buttonPanelLayout.setHorizontalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+                buttonPanelLayout.setVerticalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                    .addComponent(backButton));
+
+//          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+//          buttonPanel.setLayout(buttonPanelLayout);
+//
+//          buttonPanelLayout.setHorizontalGroup(
+//            buttonPanelLayout.createSequentialGroup()
+//                  .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));
+//          buttonPanelLayout.setVerticalGroup(
+//            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
+//                  .addComponent(saveButton)
+//                  .addComponent(backButton)); 
+
+
+  //        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+  //        buttonPanel.setLayout(buttonPanelLayout);
+  //
+  //        buttonPanelLayout.setHorizontalGroup(
+  //          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(saveButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
+  //        buttonPanelLayout.setVerticalGroup(
+  //          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(cancelButton)));
+
+          contentPanel.validate();
+        }
+      });
+    }
+
+    private void showMultipleHashDataInputDialog(final TableModel signedReferences, final ActionListener cancelListener, final String cancelCommand, final ActionListener saveListener, final String saveCommand) {
+      
+      log.debug("scheduling multiple hashdatainput dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+        @Override
+        public void run() {
+          
+          log.debug("show multiple hashdatainput dialog");
+          
+          mainPanel.removeAll();
+          buttonPanel.removeAll();
+
+//          titleLabel.setText(messages.getString(TITLE_HASHDATA));
+
+          JLabel refIdLabel = new JLabel();
+          refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+          String refIdLabelPattern = messages.getString(MESSAGE_HASHDATALIST);
+          refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{signedReferences.getRowCount()}));
+
+          JTable hashDataTable = new JTable();
+          hashDataTable.setModel(signedReferences);
+          hashDataTable.setTableHeader(null);
+  //        hashDataTable.setShowVerticalLines(false);
+  //        hashDataTable.setRowSelectionAllowed(false);
+          TableColumn selectCol = hashDataTable.getColumnModel().getColumn(1);
+          selectCol.setMinWidth(CHECKBOX_WIDTH);
+          selectCol.setMaxWidth(CHECKBOX_WIDTH);
+
+
+//          hashDataTable.setPreferredScrollableViewportSize(mainPanel.getPreferredSize());
+
+          JScrollPane hashDataScrollPane = new JScrollPane(hashDataTable);
+
+          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+          mainPanel.setLayout(mainPanelLayout);
+
+          mainPanelLayout.setHorizontalGroup(
+            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(refIdLabel)
+                      .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
+
+          mainPanelLayout.setVerticalGroup(
+            mainPanelLayout.createSequentialGroup()
+                  .addComponent(refIdLabel)
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                  .addComponent(hashDataScrollPane, 0, 0, hashDataTable.getPreferredSize().height+3));
+  //                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED));
+
+
+
+  //        
+  //        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+  //        mainPanel.setLayout(mainPanelLayout);
+  //
+  //        mainPanelLayout.setHorizontalGroup(
+  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+  //            .addGroup(mainPanelLayout.createSequentialGroup()
+  //                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+  //                    .addComponent(refIdLabel)
+  //                    .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE))
+  //                    .addContainerGap()));
+  //
+  //        mainPanelLayout.setVerticalGroup(
+  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+  //          .addGroup(mainPanelLayout.createSequentialGroup()
+  //            .addComponent(refIdLabel)
+  //            .addGap(refIdLabel.getFont().getSize())
+  //            .addComponent(hashDataScrollPane)
+  //            .addGap(refIdLabel.getFont().getSize())));
+
+
+
+
+
+
+
+
+
+
+
+
+  //        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+  //        buttonPanel.setLayout(buttonPanelLayout);
+  //
+  //        buttonPanelLayout.setHorizontalGroup(
+  //          buttonPanelLayout.createSequentialGroup()
+  ////          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+  ////            .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
+  //                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+  //                .addComponent(saveButton)
+  //                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+  //                .addComponent(cancelButton)
+  //                .addContainerGap()); //);
+  //        buttonPanelLayout.setVerticalGroup(
+  //          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+  //          .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
+  //            .addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+  //                .addComponent(saveButton)
+  //                .addComponent(cancelButton))
+  //            .addContainerGap()));
+
+
+          JButton backButton = new JButton();
+          backButton.setText(messages.getString(BUTTON_BACK));
+          backButton.setActionCommand(cancelCommand);
+          backButton.addActionListener(cancelListener);
+
+//          JButton saveButton = new JButton();
+//          saveButton.setText(messages.getString(BUTTON_SAVE));
+//          saveButton.setActionCommand(saveCommand);
+//          saveButton.addActionListener(saveListener);
+
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                buttonPanelLayout.setHorizontalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+                buttonPanelLayout.setVerticalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                    .addComponent(backButton));
+          
+          
+//          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+//          buttonPanel.setLayout(buttonPanelLayout);
+//
+//          buttonPanelLayout.setHorizontalGroup(
+//            buttonPanelLayout.createSequentialGroup()
+//                  .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));
+//          buttonPanelLayout.setVerticalGroup(
+//            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
+//                  .addComponent(saveButton)
+//                  .addComponent(backButton)); 
+
+          contentPanel.validate();
+        }
+      });
+    }
+
+//    private DisposableFileChooser fileDialog;
+    
+    private void showSaveHashDataInputDialog(final List<HashDataInput> signedRefs, final ActionListener okListener, final String okCommand) {
+      
+      log.debug("scheduling save hashdatainput dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+        @Override
+        public void run() {
+          
+          log.debug("show save hashdatainput dialog");
+      
+          String userHome = System.getProperty("user.home");
+          
+          JFileChooser fileDialog = new JFileChooser(userHome); 
+          fileDialog.setMultiSelectionEnabled(false);
+          fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
+          fileDialog.setFileHidingEnabled(true);
+          if (signedRefs.size() == 1) {
+            fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVE));
+            fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
+            String mimeType = signedRefs.get(0).getMimeType();
+            MimeFilter mimeFilter = new MimeFilter(mimeType, messages);
+            fileDialog.setFileFilter(mimeFilter);
+            String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + MimeFilter.getExtension(mimeType);
+            fileDialog.setSelectedFile(new File(userHome, filename));
+          } else {
+            fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVEDIR));
+            fileDialog.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+          }
+          
+          //parent contentPane -> placed over applet
+          switch (fileDialog.showSaveDialog(fileDialog)) {
+            case JFileChooser.APPROVE_OPTION:
+              File f = fileDialog.getSelectedFile();
+              for (HashDataInput hashDataInput : signedRefs) {
+                String mimeType = hashDataInput.getMimeType();
+                String id = hashDataInput.getReferenceId();
+                File file;
+                if (f.isDirectory()) {
+                  String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + '_' + id + MimeFilter.getExtension(mimeType);
+                  file = new File(f, filename);
+                } else {
+                  file = f;
+                }
+                if (file.exists()) {
+                  String ovrwrt = messages.getString(MESSAGE_OVERWRITE);
+                  int overwrite = JOptionPane.showConfirmDialog(fileDialog, MessageFormat.format(ovrwrt, file), messages.getString(WINDOWTITLE_OVERWRITE), JOptionPane.OK_CANCEL_OPTION);
+                  if (overwrite != JOptionPane.OK_OPTION) {
+                    continue;
+                  }
+                }
+                if (log.isDebugEnabled()) {
+                    log.debug("Writing HashDataInput " + id + " (" + mimeType + ") to file " + file);
+                }
+                FileOutputStream fos = null;
+                try {
+                    fos = new FileOutputStream(file);
+                    BufferedOutputStream bos = new BufferedOutputStream(fos);
+                    InputStream hdi = hashDataInput.getHashDataInput();
+                    int b;
+                    while ((b = hdi.read()) != -1) {
+                        bos.write(b);
+                    }
+                    bos.flush();
+                    bos.close();
+                } catch (IOException ex) {
+                    log.error("Failed to write HashDataInput to file " + file + ": " + ex.getMessage());
+                    showErrorDialog(ERR_WRITE_HASHDATA, new Object[] {ex.getMessage()}, null, null);
+                    ex.printStackTrace();
+                } finally {
+                    try {
+                        fos.close();
+                    } catch (IOException ex) {
+                    }
+                }    
+              }  
+          }
+          log.debug("done saving hashdatainput");
+          okListener.actionPerformed(new ActionEvent(fileDialog, ActionEvent.ACTION_PERFORMED, okCommand));
+        }
+      });
+    }
+    
+    private static String getText(HashDataInput hdi) throws IOException {
+      ByteArrayOutputStream baos = null;
+      try {
+        InputStream hashDataIS = hdi.getHashDataInput();
+        if (hashDataIS == null) {
+          log.error("No HashDataInput stream for reference " + hdi.getReferenceId());
+          return null;
+        } else {
+          baos = new ByteArrayOutputStream(hashDataIS.available());
+          int c;
+          while ((c = hashDataIS.read()) != -1) {
+              baos.write(c);
+          }
+          String encoding = hdi.getEncoding();
+          if (encoding == null) {
+            //default for URL-encoded
+            encoding = "UTF-8";
+          }
+          return baos.toString(encoding);
+        }
+      } catch (IOException ex) {
+          log.error("Failed to read HashDataInput for reference " + hdi.getReferenceId() + ": " + ex.getMessage());
+          throw ex; 
+      } finally {
+          try {
+              baos.close();
+          } catch (IOException ex) {
+          }
+      }
+    }
+    
+//    private String parseToken(final char[] terminators) {
+//        char ch;
+//        i1 = pos;
+//        i2 = pos;
+//        while (hasChar()) {
+//            ch = chars[pos];
+//            if (isOneOf(ch, terminators)) {
+//                break;
+//            }
+//            i2++;
+//            pos++;
+//        }
+//        return getToken(false);
+//    }
+    
+//     private static String getCharset(String contentType) {
+//       
+//       StringTokenizer t = new StringTokenizer
+//       
+//       if (contentType == null) {
+//         return "UTF-8";
+//       }
+//       
+//       int pos = 0;
+//       int len = contentType.length();
+//       
+//       while (pos < len) {
+//         pos++;
+//         String paramName = parseToken(new char[] {
+//                    '=', separator });
+//       }
+//       
+//        HashMap params = new HashMap();
+//        this.chars = chars;
+//        this.pos = offset;
+//        this.len = length;
+//
+//        String paramName = null;
+//        String paramValue = null;
+//        while (hasChar()) {
+//            paramName = parseToken(new char[] {
+//                    '=', separator });
+//            paramValue = null;
+//            if (hasChar() && (chars[pos] == '=')) {
+//                pos++; // skip '='
+//                paramValue = parseQuotedToken(new char[] {
+//                        separator });
+//            }
+//            if (hasChar() && (chars[pos] == separator)) {
+//                pos++; // skip separator
+//            }
+//            if ((paramName != null) && (paramName.length() > 0)) {
+//                if (this.lowerCaseNames) {
+//                    paramName = paramName.toLowerCase();
+//                }
+//                params.put(paramName, paramValue);
+//            }
+//        }
+//        return params;
+//       
+//       
+//       
+//       Parser
+//      ParameterParser pf = new ParameterParser();
+//    pf.setLowerCaseNames(true);
+//    Map map = pf.parse(contentType, SEPERATOR);
+//    String retVal = (String) map.get(CHAR_SET);
+//    if ((retVal == null) && (replaceNullWithDefault)) {
+//      if (map.containsKey(APPLICATION_URL_ENCODED)) {
+//        // default charset for url encoded data
+//        return "UTF-8";
+//      }
+//      retVal = getDefaultCharset();
+//    }
+//    return retVal;
+//  }
+    
+}
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 79e23859..a2b5e0df 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -28,10 +28,10 @@ windowtitle.overwrite=Datei \u00FCberschreiben?
 message.wait=<html>Bitte warten...</html>
 message.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken</html>
 message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen...</a></html>
-message.hashdata=<html>Ein textuelles Signaturdatenobjekt:</html> 
+message.hashdata=<html>Ein Signaturdatenobjekt:</html> 
 #message.hashdata=<html>Referenz Id: {0}</html>
 message.hashdatalist=<html>{0} Signaturdatenobjekte:</html>
-message.retries=<html>Noch {0} Versuche</html>
+message.retries=<html>Noch {0} Versuch(e)</html>
 message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
 label.pin=<html>{0}:</html>
 label.pinsize=<html>({0} stellig)</html>
-- 
cgit v1.2.3


From f993d336e51b9f7898aeeff2e5ae6785066d1e5b Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 9 Oct 2008 16:23:52 +0000
Subject: demo integration beta1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@94 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/hs_err_pid32072.log                      | 453 +++++++++++++++++++++
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |  17 +-
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   |   7 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   3 +-
 .../main/java/at/gv/egiz/bku/gui/ImagePanel.java   |  37 ++
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    |  38 +-
 .../at/gv/egiz/bku/gui/Messages.properties         |   2 +-
 BKUCommonGUI/src/main/resources/images/mocca.png   | Bin 0 -> 1450 bytes
 .../src/main/resources/images/mocca_default.png    | Bin 0 -> 1287 bytes
 .../src/main/resources/images/mocca_tiny.png       | Bin 0 -> 1025 bytes
 .../test/java/at/gv/egiz/bku/gui/BKUGUITest.java   |   2 +-
 BKUOnline/src/main/webapp/META-INF/context.xml     |   1 +
 BKUOnline/src/main/webapp/appletPage.jsp           |   2 +-
 BKUOnline/src/main/webapp/index.html               |   2 -
 14 files changed, 542 insertions(+), 22 deletions(-)
 create mode 100644 BKUApplet/hs_err_pid32072.log
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java
 create mode 100644 BKUCommonGUI/src/main/resources/images/mocca.png
 create mode 100644 BKUCommonGUI/src/main/resources/images/mocca_default.png
 create mode 100644 BKUCommonGUI/src/main/resources/images/mocca_tiny.png

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/hs_err_pid32072.log b/BKUApplet/hs_err_pid32072.log
new file mode 100644
index 00000000..cf86d1c5
--- /dev/null
+++ b/BKUApplet/hs_err_pid32072.log
@@ -0,0 +1,453 @@
+#
+# An unexpected error has been detected by Java Runtime Environment:
+#
+#  SIGBUS (0x7) at pc=0xb7bcbc53, pid=32072, tid=3033660304
+#
+# Java VM: Java HotSpot(TM) Client VM (10.0-b22 mixed mode, sharing linux-x86)
+# Problematic frame:
+# C  [libzip.so+0xbc53]
+#
+# If you would like to submit a bug report, please visit:
+#   http://java.sun.com/webapps/bugreport/crash.jsp
+# The crash happened outside the Java Virtual Machine in native code.
+# See problematic frame for where to report the bug.
+#
+
+---------------  T H R E A D  ---------------
+
+Current thread (0xb4faa400):  JavaThread "Thread-2" [_thread_in_native, id=32091, stack(0xb4ccf000,0xb4d20000)]
+
+siginfo:si_signo=SIGBUS: si_errno=0, si_code=2 (BUS_ADRERR), si_addr=0xb5804fc0
+
+Registers:
+EAX=0x080576a8, EBX=0xb7bd07bc, ECX=0xb5803000, EDX=0x0002d000
+ESP=0xb4d1dc10, EBP=0xb4d1dc38, ESI=0xb5804fa3, EDI=0x0839b310
+EIP=0xb7bcbc53, CR2=0xb5804fc0, EFLAGS=0x00210286
+
+Top of Stack: (sp=0xb4d1dc10)
+0xb4d1dc10:   00000030 b4fa9370 b4fa9378 b4fa9764
+0xb4d1dc20:   08057568 08057568 b7bcbc0b b7bd07bc
+0xb4d1dc30:   0828f3cc 00000000 b4d1dc68 b7bcc00b
+0xb4d1dc40:   080576a8 0828f3cc 00000000 00000000
+0xb4d1dc50:   b4faa400 00000004 87c67713 b7bd07bc
+0xb4d1dc60:   b4d1dcb0 b4faa4f4 b4d1e0d8 b7bc31b9
+0xb4d1dc70:   080576a8 b4d1dcb0 00000025 00000025
+0xb4d1dc80:   b4d1dcb0 6c706d69 49554765 2e303124 
+
+Instructions: (pc=0xb7bcbc53)
+0xb7bcbc43:   8b 70 04 8b 45 08 8b 48 10 8b 50 1c 01 ce 29 d6
+0xb7bcbc53:   0f b6 46 1d 0f b6 56 1c c1 e0 08 09 c2 89 55 f0 
+
+Stack: [0xb4ccf000,0xb4d20000],  sp=0xb4d1dc10,  free space=315k
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+C  [libzip.so+0xbc53]
+C  [libzip.so+0xc00b]  ZIP_GetEntry+0x10b
+C  [libzip.so+0x31b9]  Java_java_util_zip_ZipFile_getEntry+0xc9
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+J  sun.misc.URLClassPath$JarLoader.getResource(Ljava/lang/String;Z)Lsun/misc/Resource;
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::StubRoutines (1)
+V  [libjvm.so+0x21c5cd]
+V  [libjvm.so+0x310748]
+V  [libjvm.so+0x21c460]
+V  [libjvm.so+0x272313]
+C  [libjava.so+0xaa5c]  Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2+0x3c
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::StubRoutines (1)
+V  [libjvm.so+0x21c5cd]
+V  [libjvm.so+0x310748]
+V  [libjvm.so+0x21c0f1]
+V  [libjvm.so+0x21c1da]
+V  [libjvm.so+0x375867]
+V  [libjvm.so+0x374305]
+V  [libjvm.so+0x373377]
+V  [libjvm.so+0x373082]
+V  [libjvm.so+0x1bc043]
+V  [libjvm.so+0x20c8e6]
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::StubRoutines (1)
+V  [libjvm.so+0x21c5cd]
+V  [libjvm.so+0x310748]
+V  [libjvm.so+0x21bee0]
+V  [libjvm.so+0x21bf6d]
+V  [libjvm.so+0x28c175]
+V  [libjvm.so+0x391f8d]
+V  [libjvm.so+0x3113f9]
+C  [libpthread.so.0+0x54fb]
+
+Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+J  sun.misc.URLClassPath$JarLoader.getResource(Ljava/lang/String;Z)Lsun/misc/Resource;
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::StubRoutines (1)
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::StubRoutines (1)
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::Interpreter
+v  ~BufferBlob::StubRoutines (1)
+
+---------------  P R O C E S S  ---------------
+
+Java Threads: ( => current thread )
+  0xb5702400 JavaThread "Thread-3" [_thread_blocked, id=32217, stack(0xb4c7e000,0xb4ccf000)]
+=>0xb4faa400 JavaThread "Thread-2" [_thread_in_native, id=32091, stack(0xb4ccf000,0xb4d20000)]
+  0x0828e400 JavaThread "AWT-EventQueue-1" [_thread_blocked, id=32089, stack(0xb4eaf000,0xb4f00000)]
+  0xb57b9400 JavaThread "TimerQueue" daemon [_thread_blocked, id=32088, stack(0xb4dd5000,0xb4e26000)]
+  0xb4f8a400 JavaThread "DestroyJavaVM" [_thread_blocked, id=32073, stack(0xb7c43000,0xb7c94000)]
+  0xb57a1400 JavaThread "AWT-EventQueue-0" [_thread_blocked, id=32086, stack(0xb507f000,0xb50d0000)]
+  0xb57a0800 JavaThread "AWT-Shutdown" [_thread_blocked, id=32085, stack(0xb50d0000,0xb5121000)]
+  0xb5792000 JavaThread "AWT-XAWT" daemon [_thread_in_native, id=32082, stack(0xb520c000,0xb525d000)]
+  0xb5751000 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=32081, stack(0xb5285000,0xb52d6000)]
+  0xb5700c00 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=32079, stack(0xb5823000,0xb5874000)]
+  0x0808c000 JavaThread "CompilerThread0" daemon [_thread_blocked, id=32078, stack(0xb5874000,0xb58f5000)]
+  0x0808ac00 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=32077, stack(0xb58f5000,0xb5946000)]
+  0x08081c00 JavaThread "Finalizer" daemon [_thread_blocked, id=32076, stack(0xb598c000,0xb59dd000)]
+  0x08080c00 JavaThread "Reference Handler" daemon [_thread_blocked, id=32075, stack(0xb59dd000,0xb5a2e000)]
+
+Other Threads:
+  0x0807f400 VMThread [stack: 0xb5a2e000,0xb5aaf000] [id=32074]
+  0xb570a400 WatcherThread [stack: 0xb567f000,0xb5700000] [id=32080]
+
+VM state:not at safepoint (normal execution)
+
+VM Mutex/Monitor currently owned by a thread: None
+
+Heap
+ def new generation   total 960K, used 512K [0x8bfe0000, 0x8c0e0000, 0x8c4c0000)
+  eden space 896K,  50% used [0x8bfe0000, 0x8c050378, 0x8c0c0000)
+  from space 64K, 100% used [0x8c0d0000, 0x8c0e0000, 0x8c0e0000)
+  to   space 64K,   0% used [0x8c0c0000, 0x8c0c0000, 0x8c0d0000)
+ tenured generation   total 4096K, used 3837K [0x8c4c0000, 0x8c8c0000, 0x8ffe0000)
+   the space 4096K,  93% used [0x8c4c0000, 0x8c87f6a0, 0x8c87f800, 0x8c8c0000)
+ compacting perm gen  total 12288K, used 6940K [0x8ffe0000, 0x90be0000, 0x93fe0000)
+   the space 12288K,  56% used [0x8ffe0000, 0x906a7308, 0x906a7400, 0x90be0000)
+    ro space 8192K,  73% used [0x93fe0000, 0x945c34a0, 0x945c3600, 0x947e0000)
+    rw space 12288K,  58% used [0x947e0000, 0x94ed8668, 0x94ed8800, 0x953e0000)
+
+Dynamic libraries:
+06000000-0641b000 r-xp 00000000 08:02 1085428    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/client/libjvm.so
+0641b000-06435000 rwxp 0041a000 08:02 1085428    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/client/libjvm.so
+06435000-06855000 rwxp 06435000 00:00 0 
+08048000-08052000 r-xp 00000000 08:02 1085534    /usr/lib/jvm/java-6-sun-1.6.0.06/bin/appletviewer
+08052000-08053000 rwxp 00009000 08:02 1085534    /usr/lib/jvm/java-6-sun-1.6.0.06/bin/appletviewer
+08053000-083f5000 rwxp 08053000 00:00 0          [heap]
+8bfe0000-8c0e0000 rwxp 8bfe0000 00:00 0 
+8c0e0000-8c4c0000 rwxp 8c0e0000 00:00 0 
+8c4c0000-8c8c0000 rwxp 8c4c0000 00:00 0 
+8c8c0000-8ffe0000 rwxp 8c8c0000 00:00 0 
+8ffe0000-90be0000 rwxp 8ffe0000 00:00 0 
+90be0000-93fe0000 rwxp 90be0000 00:00 0 
+93fe0000-945c4000 r-xs 00001000 08:02 1081430    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/client/classes.jsa
+945c4000-947e0000 rwxp 945c4000 00:00 0 
+947e0000-94ed9000 rwxp 005e5000 08:02 1081430    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/client/classes.jsa
+94ed9000-953e0000 rwxp 94ed9000 00:00 0 
+953e0000-954b9000 rwxp 00cde000 08:02 1081430    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/client/classes.jsa
+954b9000-957e0000 rwxp 954b9000 00:00 0 
+957e0000-957e4000 r-xs 00db7000 08:02 1081430    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/client/classes.jsa
+957e4000-95be0000 rwxp 957e4000 00:00 0 
+b4c7e000-b4c81000 ---p b4c7e000 00:00 0 
+b4c81000-b4ccf000 rwxp b4c81000 00:00 0 
+b4ccf000-b4cd2000 ---p b4ccf000 00:00 0 
+b4cd2000-b4d20000 rwxp b4cd2000 00:00 0 
+b4d20000-b4d23000 r-xs 00000000 08:02 3560016    /var/cache/fontconfig/5e10083637a12ecd1bff191eb66bfa2f-x86.cache-2
+b4d23000-b4d29000 r-xs 00000000 08:02 3560014    /var/cache/fontconfig/945677eb7aeaf62f1d50efc3fb3ec7d8-x86.cache-2
+b4d29000-b4d2c000 r-xs 00000000 08:02 3560019    /var/cache/fontconfig/e383d7ea5fbe662a33d9b44caf393297-x86.cache-2
+b4d2c000-b4d31000 r-xs 00000000 08:02 3560011    /var/cache/fontconfig/bddabcf04192498a6a74911686fc6962-x86.cache-2
+b4d31000-b4d34000 r-xs 00000000 08:02 3556212    /var/cache/fontconfig/a46337af8a0b4c9b317ad981ec3bdf87-x86.cache-2
+b4d34000-b4d35000 r-xs 00000000 08:02 3560013    /var/cache/fontconfig/fd9505950c048a77dc4b710eb6a628ed-x86.cache-2
+b4d35000-b4d37000 r-xs 00000000 08:02 3560021    /var/cache/fontconfig/ddc79d3ea06a7c6ffa86ede85f3bb5df-x86.cache-2
+b4d37000-b4d38000 r-xs 00000000 08:02 3560164    /var/cache/fontconfig/e3fa16a14183b06aa45b3e009278fd14-x86.cache-2
+b4d38000-b4d39000 r-xs 00000000 08:02 3560125    /var/cache/fontconfig/e7071f4a29fa870f4323321c154eba04-x86.cache-2
+b4d39000-b4d3a000 r-xs 00000000 08:02 3560023    /var/cache/fontconfig/a2ab74764b07279e7c36ddb1d302cf26-x86.cache-2
+b4d3a000-b4d3e000 r-xs 00000000 08:02 3560003    /var/cache/fontconfig/921a30a17f0be15c70ac14043cb7a739-x86.cache-2
+b4d3e000-b4d3f000 r-xs 00000000 08:02 3560018    /var/cache/fontconfig/c69f04ab05004e31a6d5e715764f16d8-x86.cache-2
+b4d3f000-b4d40000 r-xs 00000000 08:02 3560008    /var/cache/fontconfig/4c73fe0c47614734b17d736dbde7580a-x86.cache-2
+b4d40000-b4d42000 r-xs 00000000 08:02 3560007    /var/cache/fontconfig/646addb8444faa74ee138aa00ab0b6a0-x86.cache-2
+b4d42000-b4d45000 r-xs 00000000 08:02 3560006    /var/cache/fontconfig/a755afe4a08bf5b97852ceb7400b47bc-x86.cache-2
+b4d45000-b4d47000 r-xs 00000000 08:02 3560015    /var/cache/fontconfig/20bd79ad97094406f7d1b9654bfbd926-x86.cache-2
+b4d47000-b4d49000 r-xs 00000000 08:02 3560009    /var/cache/fontconfig/9c0624108b9a2ae8552f664125be8356-x86.cache-2
+b4d49000-b4d50000 r-xs 00000000 08:02 3560004    /var/cache/fontconfig/6d41288fd70b0be22e8c3a91e032eec0-x86.cache-2
+b4d50000-b4d53000 r-xs 00000000 08:02 3560012    /var/cache/fontconfig/de156ccd2eddbdc19d37a45b8b2aac9c-x86.cache-2
+b4d53000-b4d55000 r-xs 00000000 08:02 3556204    /var/cache/fontconfig/da1bd5ca8443ffe22927a23ce431d198-x86.cache-2
+b4d55000-b4d5d000 r-xs 00000000 08:02 3560169    /var/cache/fontconfig/e3de0de479f42330eadf588a55fb5bf4-x86.cache-2
+b4d5d000-b4d65000 r-xs 00000000 08:02 2409868    /var/cache/fontconfig/0f34bcd4b6ee430af32735b75db7f02b-x86.cache-2
+b4d65000-b4d66000 r-xs 00000000 08:02 3560126    /var/cache/fontconfig/4794a0821666d79190d59a36cb4f44b5-x86.cache-2
+b4d66000-b4d88000 r-xs 00000000 08:02 1392718    /var/cache/fontconfig/365b55f210c0a22e9a19e35191240f32-x86.cache-2
+b4d88000-b4d8a000 r-xs 00000000 08:02 3560017    /var/cache/fontconfig/2c5ba8142dffc8bf0377700342b8ca1a-x86.cache-2
+b4d8a000-b4d8d000 r-xs 00000000 08:02 3560022    /var/cache/fontconfig/de9486f0b47a4d768a594cb4198cb1c6-x86.cache-2
+b4d8d000-b4d94000 r-xs 00000000 08:02 3556202    /var/cache/fontconfig/d52a8644073d54c13679302ca1180695-x86.cache-2
+b4d94000-b4d99000 r-xs 00000000 08:02 3558093    /var/cache/fontconfig/105b9c7e6f0a4f82d8c9b6e39c52c6f9-x86.cache-2
+b4d99000-b4d9c000 r-xs 00000000 08:02 3560677    /var/cache/fontconfig/6386b86020ecc1ef9690bb720a13964f-x86.cache-2
+b4d9c000-b4da7000 r-xs 00000000 08:02 3556115    /var/cache/fontconfig/089dead882dea3570ffc31a9898cfb69-x86.cache-2
+b4da7000-b4db4000 r-xs 00000000 08:02 2409873    /var/cache/fontconfig/e13b20fdb08344e0e664864cc2ede53d-x86.cache-2
+b4dd5000-b4dd8000 ---p b4dd5000 00:00 0 
+b4dd8000-b4e26000 rwxp b4dd8000 00:00 0 
+b4e3b000-b4e46000 rwxs 00000000 00:09 1831534605  /SYSV00000000 (deleted)
+b4e46000-b4e47000 r--s 0000f000 00:11 751021     /var/run/pcscd/pcscd.pub
+b4e47000-b4e48000 r--s 0000e000 00:11 751021     /var/run/pcscd/pcscd.pub
+b4e48000-b4e49000 r--s 0000d000 00:11 751021     /var/run/pcscd/pcscd.pub
+b4e49000-b4e4a000 r--s 0000c000 00:11 751021     /var/run/pcscd/pcscd.pub
+b4e4a000-b4e4b000 r--s 0000b000 00:11 751021     /var/run/pcscd/pcscd.pub
+b4e4b000-b4e4c000 r--s 0000a000 00:11 751021     /var/run/pcscd/pcscd.pub
+b4e4c000-b4e4d000 r--s 00009000 00:11 751021     /var/run/pcscd/pcscd.pub
+b4e4d000-b4e4e000 r--s 00008000 00:11 751021     /var/run/pcscd/pcscd.pub
+b4e4e000-b4e4f000 r--s 00007000 00:11 751021     /var/run/pcscd/pcscd.pub
+b4e4f000-b4e50000 r--s 00006000 00:11 751021     /var/run/pcscd/pcscd.pub
+b4e50000-b4e51000 r--s 00005000 00:11 751021     /var/run/pcscd/pcscd.pub
+b4e51000-b4e52000 r--s 00004000 00:11 751021     /var/run/pcscd/pcscd.pub
+b4e52000-b4e5a000 r-xp 00000000 08:02 901283     /usr/lib/libpcsclite.so.1.0.0
+b4e5a000-b4e5b000 rwxp 00008000 08:02 901283     /usr/lib/libpcsclite.so.1.0.0
+b4e5b000-b4e5d000 r-xp 00000000 08:02 1085449    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libj2pcsc.so
+b4e5d000-b4e5e000 rwxp 00001000 08:02 1085449    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libj2pcsc.so
+b4e5e000-b4e61000 rwxp b4e5e000 00:00 0 
+b4e61000-b4eaf000 rwxp b4e61000 00:00 0 
+b4eaf000-b4eb2000 ---p b4eaf000 00:00 0 
+b4eb2000-b4fd2000 rwxp b4eb2000 00:00 0 
+b4fd2000-b5000000 ---p b4fd2000 00:00 0 
+b5000000-b5001000 r--s 00003000 00:11 751021     /var/run/pcscd/pcscd.pub
+b5001000-b5004000 r-xs 00027000 08:02 1086682    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/ext/sunjce_provider.jar
+b5004000-b5036000 rwxp b5004000 00:00 0 
+b5036000-b503a000 r-xs 00000000 08:02 3555788    /var/cache/fontconfig/4a195c91033ef4528a35b4a1ac51414e-x86.cache-2
+b503a000-b5048000 r-xs 00000000 08:02 3557818    /var/cache/fontconfig/865f88548240fee46819705c6468c165-x86.cache-2
+b5048000-b504f000 r-xs 00110000 08:02 1065527    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/resources.jar
+b504f000-b5077000 rwxp b504f000 00:00 0 
+b5077000-b507e000 r-xp 00000000 08:02 1085443    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libnio.so
+b507e000-b507f000 rwxp 00006000 08:02 1085443    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libnio.so
+b507f000-b5082000 ---p b507f000 00:00 0 
+b5082000-b50d0000 rwxp b5082000 00:00 0 
+b50d0000-b50d3000 ---p b50d0000 00:00 0 
+b50d3000-b5121000 rwxp b50d3000 00:00 0 
+b5121000-b5124000 r-xs 00000000 08:02 3560016    /var/cache/fontconfig/5e10083637a12ecd1bff191eb66bfa2f-x86.cache-2
+b5124000-b512a000 r-xs 00000000 08:02 3560014    /var/cache/fontconfig/945677eb7aeaf62f1d50efc3fb3ec7d8-x86.cache-2
+b512a000-b512d000 r-xs 00000000 08:02 3560019    /var/cache/fontconfig/e383d7ea5fbe662a33d9b44caf393297-x86.cache-2
+b512d000-b5132000 r-xs 00000000 08:02 3560011    /var/cache/fontconfig/bddabcf04192498a6a74911686fc6962-x86.cache-2
+b5132000-b5135000 r-xs 00000000 08:02 3556212    /var/cache/fontconfig/a46337af8a0b4c9b317ad981ec3bdf87-x86.cache-2
+b5135000-b5136000 r-xs 00000000 08:02 3560013    /var/cache/fontconfig/fd9505950c048a77dc4b710eb6a628ed-x86.cache-2
+b5136000-b5138000 r-xs 00000000 08:02 3560021    /var/cache/fontconfig/ddc79d3ea06a7c6ffa86ede85f3bb5df-x86.cache-2
+b5138000-b5139000 r-xs 00000000 08:02 3560164    /var/cache/fontconfig/e3fa16a14183b06aa45b3e009278fd14-x86.cache-2
+b5139000-b513a000 r-xs 00000000 08:02 3560125    /var/cache/fontconfig/e7071f4a29fa870f4323321c154eba04-x86.cache-2
+b513a000-b513b000 r-xs 00000000 08:02 3560023    /var/cache/fontconfig/a2ab74764b07279e7c36ddb1d302cf26-x86.cache-2
+b513b000-b513f000 r-xs 00000000 08:02 3560003    /var/cache/fontconfig/921a30a17f0be15c70ac14043cb7a739-x86.cache-2
+b513f000-b5140000 r-xs 00000000 08:02 3560018    /var/cache/fontconfig/c69f04ab05004e31a6d5e715764f16d8-x86.cache-2
+b5140000-b5141000 r-xs 00000000 08:02 3560008    /var/cache/fontconfig/4c73fe0c47614734b17d736dbde7580a-x86.cache-2
+b5141000-b5143000 r-xs 00000000 08:02 3560007    /var/cache/fontconfig/646addb8444faa74ee138aa00ab0b6a0-x86.cache-2
+b5143000-b5146000 r-xs 00000000 08:02 3560006    /var/cache/fontconfig/a755afe4a08bf5b97852ceb7400b47bc-x86.cache-2
+b5146000-b5148000 r-xs 00000000 08:02 3560015    /var/cache/fontconfig/20bd79ad97094406f7d1b9654bfbd926-x86.cache-2
+b5148000-b514a000 r-xs 00000000 08:02 3560009    /var/cache/fontconfig/9c0624108b9a2ae8552f664125be8356-x86.cache-2
+b514a000-b5151000 r-xs 00000000 08:02 3560004    /var/cache/fontconfig/6d41288fd70b0be22e8c3a91e032eec0-x86.cache-2
+b5151000-b5154000 r-xs 00000000 08:02 3560012    /var/cache/fontconfig/de156ccd2eddbdc19d37a45b8b2aac9c-x86.cache-2
+b5154000-b5156000 r-xs 00000000 08:02 3556204    /var/cache/fontconfig/da1bd5ca8443ffe22927a23ce431d198-x86.cache-2
+b5156000-b515e000 r-xs 00000000 08:02 3560169    /var/cache/fontconfig/e3de0de479f42330eadf588a55fb5bf4-x86.cache-2
+b515e000-b5166000 r-xs 00000000 08:02 2409868    /var/cache/fontconfig/0f34bcd4b6ee430af32735b75db7f02b-x86.cache-2
+b5166000-b5167000 r-xs 00000000 08:02 3560126    /var/cache/fontconfig/4794a0821666d79190d59a36cb4f44b5-x86.cache-2
+b5167000-b5189000 r-xs 00000000 08:02 1392718    /var/cache/fontconfig/365b55f210c0a22e9a19e35191240f32-x86.cache-2
+b5189000-b518b000 r-xs 00000000 08:02 3560017    /var/cache/fontconfig/2c5ba8142dffc8bf0377700342b8ca1a-x86.cache-2
+b518b000-b518e000 r-xs 00000000 08:02 3560022    /var/cache/fontconfig/de9486f0b47a4d768a594cb4198cb1c6-x86.cache-2
+b518e000-b5195000 r-xs 00000000 08:02 3556202    /var/cache/fontconfig/d52a8644073d54c13679302ca1180695-x86.cache-2
+b5195000-b519a000 r-xs 00000000 08:02 3558093    /var/cache/fontconfig/105b9c7e6f0a4f82d8c9b6e39c52c6f9-x86.cache-2
+b519a000-b519d000 r-xs 00000000 08:02 3560677    /var/cache/fontconfig/6386b86020ecc1ef9690bb720a13964f-x86.cache-2
+b519d000-b51a8000 r-xs 00000000 08:02 3556115    /var/cache/fontconfig/089dead882dea3570ffc31a9898cfb69-x86.cache-2
+b51a8000-b51b5000 r-xs 00000000 08:02 2409873    /var/cache/fontconfig/e13b20fdb08344e0e664864cc2ede53d-x86.cache-2
+b51b5000-b51bb000 r-xs 00091000 08:02 1065704    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/jsse.jar
+b51bb000-b51be000 rwxp b51bb000 00:00 0 
+b51be000-b520c000 rwxp b51be000 00:00 0 
+b520c000-b520f000 ---p b520c000 00:00 0 
+b520f000-b525d000 rwxp b520f000 00:00 0 
+b525d000-b5264000 r-xp 00000000 08:02 1343649    /usr/lib/libXrender.so.1.3.0
+b5264000-b5265000 rwxp 00007000 08:02 1343649    /usr/lib/libXrender.so.1.3.0
+b5265000-b526d000 r-xp 00000000 08:02 1343710    /usr/lib/libXcursor.so.1.0.2
+b526d000-b526e000 rwxp 00007000 08:02 1343710    /usr/lib/libXcursor.so.1.0.2
+b526e000-b526f000 r--s 00002000 00:11 751021     /var/run/pcscd/pcscd.pub
+b526f000-b5271000 r-xs 00017000 08:02 4065150    /home/clemens/workspace/mocca/BKUApplet/target/test-libs/iaik_jce_me4se-3.04.jar
+b5271000-b5284000 r-xp 00000000 08:02 1085442    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libnet.so
+b5284000-b5285000 rwxp 00013000 08:02 1085442    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libnet.so
+b5285000-b5288000 ---p b5285000 00:00 0 
+b5288000-b52d6000 rwxp b5288000 00:00 0 
+b52d6000-b5354000 r-xp 00000000 08:02 1085586    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libfontmanager.so
+b5354000-b535e000 rwxp 0007e000 08:02 1085586    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libfontmanager.so
+b535e000-b5363000 rwxp b535e000 00:00 0 
+b5363000-b536a000 r-xp 00000000 08:02 1343653    /usr/lib/libXi.so.6.0.0
+b536a000-b536b000 rwxp 00006000 08:02 1343653    /usr/lib/libXi.so.6.0.0
+b536b000-b5378000 r-xp 00000000 08:02 902010     /usr/lib/libXext.so.6.4.0
+b5378000-b5379000 rwxp 0000d000 08:02 902010     /usr/lib/libXext.so.6.4.0
+b5379000-b53ba000 r-xp 00000000 08:02 1085581    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/xawt/libmawt.so
+b53ba000-b53bd000 rwxp 00040000 08:02 1085581    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/xawt/libmawt.so
+b53bd000-b5438000 r-xp 00000000 08:02 1085578    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libawt.so
+b5438000-b543f000 rwxp 0007b000 08:02 1085578    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libawt.so
+b543f000-b5463000 rwxp b543f000 00:00 0 
+b5463000-b54c2000 r-xs 00b89000 08:02 1085573    /usr/lib/jvm/java-6-sun-1.6.0.06/lib/tools.jar
+b54c2000-b54f4000 rwxp b54c2000 00:00 0 
+b54f4000-b567f000 r-xs 02df0000 08:02 1065570    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/rt.jar
+b567f000-b5680000 ---p b567f000 00:00 0 
+b5680000-b5800000 rwxp b5680000 00:00 0 
+b5800000-b5801000 r--s 00001000 00:11 751021     /var/run/pcscd/pcscd.pub
+b5801000-b5803000 r-xs 0000d000 08:02 4065123    /home/clemens/workspace/mocca/BKUApplet/target/test-libs/commons-logging-1.1.1.jar
+b5803000-b5807000 r-xs 0002d000 08:02 4050367    /home/clemens/workspace/mocca/BKUApplet/target/BKUApplet-1.0-SNAPSHOT.jar
+b5807000-b580b000 r-xp 00000000 08:02 1343688    /usr/lib/libXtst.so.6.1.0
+b580b000-b580c000 rwxp 00003000 08:02 1343688    /usr/lib/libXtst.so.6.1.0
+b580c000-b5810000 r-xp 00000000 08:02 905383     /usr/lib/libXfixes.so.3.1.0
+b5810000-b5811000 rwxp 00003000 08:02 905383     /usr/lib/libXfixes.so.3.1.0
+b5811000-b5815000 r-xs 00000000 08:02 3555788    /var/cache/fontconfig/4a195c91033ef4528a35b4a1ac51414e-x86.cache-2
+b5815000-b5823000 r-xs 00000000 08:02 3557818    /var/cache/fontconfig/865f88548240fee46819705c6468c165-x86.cache-2
+b5823000-b5826000 ---p b5823000 00:00 0 
+b5826000-b5874000 rwxp b5826000 00:00 0 
+b5874000-b5877000 ---p b5874000 00:00 0 
+b5877000-b58f5000 rwxp b5877000 00:00 0 
+b58f5000-b58f8000 ---p b58f5000 00:00 0 
+b58f8000-b5946000 rwxp b58f8000 00:00 0 
+b5946000-b594d000 r-xs 00000000 08:02 912666     /usr/lib/gconv/gconv-modules.cache
+b594d000-b598c000 r-xp 00000000 08:02 2162962    /usr/lib/locale/de_AT.utf8/LC_CTYPE
+b598c000-b598f000 ---p b598c000 00:00 0 
+b598f000-b59dd000 rwxp b598f000 00:00 0 
+b59dd000-b59e0000 ---p b59dd000 00:00 0 
+b59e0000-b5a2e000 rwxp b59e0000 00:00 0 
+b5a2e000-b5a2f000 ---p b5a2e000 00:00 0 
+b5a2f000-b5abd000 rwxp b5a2f000 00:00 0 
+b5abd000-b5ad7000 rwxp b5abd000 00:00 0 
+b5ad7000-b5ada000 rwxp b5ad7000 00:00 0 
+b5ada000-b5af5000 rwxp b5ada000 00:00 0 
+b5af5000-b5af6000 rwxp b5af5000 00:00 0 
+b5af6000-b5af7000 rwxp b5af6000 00:00 0 
+b5af7000-b5afa000 rwxp b5af7000 00:00 0 
+b5afa000-b5b15000 rwxp b5afa000 00:00 0 
+b5b15000-b5b1b000 rwxp b5b15000 00:00 0 
+b5b1b000-b5b35000 rwxp b5b1b000 00:00 0 
+b5b35000-b5b46000 rwxp b5b35000 00:00 0 
+b5b46000-b5bc0000 rwxp b5b46000 00:00 0 
+b5bc0000-b5d10000 rwxp b5bc0000 00:00 0 
+b5d10000-b7bc0000 rwxp b5d10000 00:00 0 
+b7bc0000-b7bcf000 r-xp 00000000 08:02 1085437    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libzip.so
+b7bcf000-b7bd1000 rwxp 0000e000 08:02 1085437    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libzip.so
+b7bd1000-b7bf4000 r-xp 00000000 08:02 1085434    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libjava.so
+b7bf4000-b7bf6000 rwxp 00023000 08:02 1085434    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libjava.so
+b7bf6000-b7bff000 r-xp 00000000 08:02 2785878    /lib/tls/i686/cmov/libnss_files-2.7.so
+b7bff000-b7c01000 rwxp 00008000 08:02 2785878    /lib/tls/i686/cmov/libnss_files-2.7.so
+b7c01000-b7c09000 r-xp 00000000 08:02 2785986    /lib/tls/i686/cmov/libnss_nis-2.7.so
+b7c09000-b7c0b000 rwxp 00007000 08:02 2785986    /lib/tls/i686/cmov/libnss_nis-2.7.so
+b7c0b000-b7c1f000 r-xp 00000000 08:02 2785874    /lib/tls/i686/cmov/libnsl-2.7.so
+b7c1f000-b7c21000 rwxp 00013000 08:02 2785874    /lib/tls/i686/cmov/libnsl-2.7.so
+b7c21000-b7c23000 rwxp b7c21000 00:00 0 
+b7c23000-b7c24000 r--s 00000000 00:11 751021     /var/run/pcscd/pcscd.pub
+b7c24000-b7c25000 r-xs 00000000 08:02 3556750    /var/cache/fontconfig/4c599c202bc5c08e2d34565a40eac3b2-x86.cache-2
+b7c25000-b7c26000 r-xs 00000000 08:02 3556750    /var/cache/fontconfig/4c599c202bc5c08e2d34565a40eac3b2-x86.cache-2
+b7c26000-b7c31000 r-xp 00000000 08:02 1085433    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libverify.so
+b7c31000-b7c32000 rwxp 0000b000 08:02 1085433    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libverify.so
+b7c32000-b7c3a000 rwxs 00000000 08:02 1328188    /tmp/hsperfdata_clemens/32072
+b7c3a000-b7c41000 r-xp 00000000 08:02 2786023    /lib/tls/i686/cmov/librt-2.7.so
+b7c41000-b7c43000 rwxp 00006000 08:02 2786023    /lib/tls/i686/cmov/librt-2.7.so
+b7c43000-b7c46000 ---p b7c43000 00:00 0 
+b7c46000-b7c94000 rwxp b7c46000 00:00 0 
+b7c94000-b7cb7000 r-xp 00000000 08:02 2785871    /lib/tls/i686/cmov/libm-2.7.so
+b7cb7000-b7cb9000 rwxp 00023000 08:02 2785871    /lib/tls/i686/cmov/libm-2.7.so
+b7cb9000-b7cba000 rwxp b7cb9000 00:00 0 
+b7cba000-b7cbe000 r-xp 00000000 08:02 905230     /usr/lib/libXdmcp.so.6.0.0
+b7cbe000-b7cbf000 rwxp 00003000 08:02 905230     /usr/lib/libXdmcp.so.6.0.0
+b7cbf000-b7cc1000 r-xp 00000000 08:02 901311     /usr/lib/libXau.so.6.0.0
+b7cc1000-b7cc2000 rwxp 00001000 08:02 901311     /usr/lib/libXau.so.6.0.0
+b7cc2000-b7cd9000 r-xp 00000000 08:02 901194     /usr/lib/libxcb.so.1.0.0
+b7cd9000-b7cda000 rwxp 00016000 08:02 901194     /usr/lib/libxcb.so.1.0.0
+b7cda000-b7cdb000 rwxp b7cda000 00:00 0 
+b7cdb000-b7cdc000 r-xp 00000000 08:02 901196     /usr/lib/libxcb-xlib.so.0.0.0
+b7cdc000-b7cdd000 rwxp 00000000 08:02 901196     /usr/lib/libxcb-xlib.so.0.0.0
+b7cdd000-b7e26000 r-xp 00000000 08:02 2785863    /lib/tls/i686/cmov/libc-2.7.so
+b7e26000-b7e27000 r-xp 00149000 08:02 2785863    /lib/tls/i686/cmov/libc-2.7.so
+b7e27000-b7e29000 rwxp 0014a000 08:02 2785863    /lib/tls/i686/cmov/libc-2.7.so
+b7e29000-b7e2c000 rwxp b7e29000 00:00 0 
+b7e2c000-b7e2e000 r-xp 00000000 08:02 2785869    /lib/tls/i686/cmov/libdl-2.7.so
+b7e2e000-b7e30000 rwxp 00001000 08:02 2785869    /lib/tls/i686/cmov/libdl-2.7.so
+b7e30000-b7e37000 r-xp 00000000 08:02 1085436    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/jli/libjli.so
+b7e37000-b7e39000 rwxp 00006000 08:02 1085436    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/jli/libjli.so
+b7e39000-b7f1d000 r-xp 00000000 08:02 901308     /usr/lib/libX11.so.6.2.0
+b7f1d000-b7f20000 rwxp 000e4000 08:02 901308     /usr/lib/libX11.so.6.2.0
+b7f20000-b7f21000 rwxp b7f20000 00:00 0 
+b7f21000-b7f35000 r-xp 00000000 08:02 2786020    /lib/tls/i686/cmov/libpthread-2.7.so
+b7f35000-b7f37000 rwxp 00013000 08:02 2786020    /lib/tls/i686/cmov/libpthread-2.7.so
+b7f37000-b7f3e000 rwxp b7f37000 00:00 0 
+b7f3e000-b7f45000 r-xp 00000000 08:02 2785875    /lib/tls/i686/cmov/libnss_compat-2.7.so
+b7f45000-b7f47000 rwxp 00006000 08:02 2785875    /lib/tls/i686/cmov/libnss_compat-2.7.so
+b7f47000-b7f4d000 r-xp 00000000 08:02 1085422    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/native_threads/libhpi.so
+b7f4d000-b7f4e000 rwxp 00006000 08:02 1085422    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/native_threads/libhpi.so
+b7f4e000-b7f4f000 rwxp b7f4e000 00:00 0 
+b7f4f000-b7f50000 r-xp b7f4f000 00:00 0 
+b7f50000-b7f52000 rwxp b7f50000 00:00 0 
+b7f52000-b7f53000 r-xp b7f52000 00:00 0          [vdso]
+b7f53000-b7f6d000 r-xp 00000000 08:02 2786582    /lib/ld-2.7.so
+b7f6d000-b7f6f000 rwxp 00019000 08:02 2786582    /lib/ld-2.7.so
+bfaac000-bfac1000 rwxp bffeb000 00:00 0          [stack]
+
+VM Arguments:
+jvm_args: -Dapplication.home=/usr/lib/jvm/java-6-sun-1.6.0.06 
+java_command: sun.applet.Main target/test-classes/appletTest.html
+Launcher Type: SUN_STANDARD
+
+Environment Variables:
+JAVA_HOME=/usr/lib/jvm/java-6-sun
+PATH=/home/clemens/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games
+LD_LIBRARY_PATH=/usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/client:/usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.06/jre/../lib/i386
+SHELL=/bin/bash
+DISPLAY=:0
+
+Signal Handlers:
+SIGSEGV: [libjvm.so+0x3be710], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGBUS: [libjvm.so+0x3be710], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGFPE: [libjvm.so+0x30f810], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGPIPE: [libjvm.so+0x30f810], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGXFSZ: [libjvm.so+0x30f810], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGILL: [libjvm.so+0x30f810], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000
+SIGUSR2: [libjvm.so+0x311850], sa_mask[0]=0x00000000, sa_flags=0x10000004
+SIGHUP: [libjvm.so+0x3115f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGINT: [libjvm.so+0x3115f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGTERM: [libjvm.so+0x3115f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGQUIT: [libjvm.so+0x3115f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+
+
+---------------  S Y S T E M  ---------------
+
+OS:lenny/sid
+
+uname:Linux 2.6.24-19-generic #1 SMP Fri Jul 11 23:41:49 UTC 2008 i686
+libc:glibc 2.7 NPTL 2.7 
+rlimit: STACK 8192k, CORE 0k, NPROC 16381, NOFILE 1024, AS infinity
+load average:0.84 0.39 0.22
+
+CPU:total 2 (1 cores per cpu, 2 threads per core) family 15 model 4 stepping 3, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ht
+
+Memory: 4k page, physical 2075432k(62584k free), swap 1542200k(1502244k free)
+
+vm_info: Java HotSpot(TM) Client VM (10.0-b22) for linux-x86 JRE (1.6.0_06-b02), built on Mar 25 2008 00:39:19 by "java_re" with gcc 3.2.1-7a (J2SE release)
+
+time: Thu Oct  9 12:01:31 2008
+elapsed time: 55 seconds
+
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 34dd9bbd..6a781729 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -16,9 +16,12 @@
  */
 package at.gv.egiz.bku.online.applet;
 
+import java.net.MalformedURLException;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.net.ssl.HttpsURLConnection;
 import javax.swing.JApplet;
 
@@ -27,6 +30,7 @@ import org.apache.commons.logging.LogFactory;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.BKUGUIFactory;
+import java.net.URL;
 
 /**
  * Note: all swing code is executed by the event dispatch thread (see
@@ -40,6 +44,8 @@ public class BKUApplet extends JApplet {
     public final static String LOGO_URL_KEY = "LogoURL";
     public final static String WSDL_URL = "WSDL_URL";
     public final static String SESSION_ID = "SessionID";
+    public static final String BACKGROUND_PARAM = "background";
+    
     protected ResourceBundle resourceBundle;
     protected BKUWorker worker;
     protected Thread workerThread;
@@ -58,8 +64,17 @@ public class BKUApplet extends JApplet {
         } else {
             resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE_BASE);
         }
+        String backgroundString = getMyAppletParameter(BACKGROUND_PARAM);
+        URL background = null;
+        if (backgroundString != null) {
+          try {
+            background = new URL(backgroundString);
+          } catch (MalformedURLException ex) {
+            log.warn(ex.getMessage() + ", using default background");
+          }
+        }
         BKUGUIFacade gui = BKUGUIFactory.createGUI();
-        gui.init(getContentPane(), localeString);
+        gui.init(getContentPane(), localeString, background);
         worker = new BKUWorker(gui, this, resourceBundle);
     }
 
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 636a9fef..53ec1088 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
@@ -36,6 +36,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.text.MessageFormat;
 import java.util.List;
 import java.util.Locale;
@@ -127,7 +128,7 @@ public class BKUGUI implements BKUGUIFacade {
      * @param localeString may be null
      */
     @Override
-    public void init(final Container contentPane, String localeString) {
+    public void init(final Container contentPane, String localeString, final URL background) {
 
         if (localeString != null) {
             messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, new Locale(localeString));
@@ -149,7 +150,7 @@ public class BKUGUI implements BKUGUIFacade {
                   log.debug("initializing gui");
 
 //                    initIconPanel();
-                    initContentPanel();
+                    initContentPanel(background);
 
                     GroupLayout layout = new GroupLayout(contentPane);
                     contentPane.setLayout(layout);
@@ -189,7 +190,7 @@ public class BKUGUI implements BKUGUIFacade {
 //                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)); //);
 //    }
 
-    protected void initContentPanel() {
+    protected void initContentPanel(URL background) {
 
         contentPanel = new JPanel();
 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 32eb4c3e..4925e7fa 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -20,6 +20,7 @@ import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.smcc.PINSpec;
 import java.awt.Container;
 import java.awt.event.ActionListener;
+import java.net.URL;
 import java.util.List;
 
 public interface BKUGUIFacade {
@@ -32,7 +33,7 @@ public interface BKUGUIFacade {
   public static final String ERR_WRITE_HASHDATA = "error.write.hashdata";
   public static final String ERR_INVALID_HASH = "error.invalid.hash";
   
-    public void init(Container contentPane, String localeString);
+    public void init(Container contentPane, String localeString, URL background);
     
     public void showWelcomeDialog(); 
     
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java
new file mode 100644
index 00000000..e9c270ce
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java
@@ -0,0 +1,37 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import java.awt.Graphics;
+import java.awt.Image;
+import java.net.URL;
+import javax.swing.ImageIcon;
+import javax.swing.JPanel;
+
+/**
+ *
+ * @author clemens
+ */
+public class ImagePanel extends JPanel {
+
+  protected Image backgroundImg;
+
+  public ImagePanel(URL background) {
+    this(new ImageIcon(background).getImage());
+  }
+  
+  public ImagePanel(Image img) {
+    this.backgroundImg = img;
+    this.setOpaque(false);
+  }
+  
+  @Override
+  public void paintComponent(Graphics g) {
+    super.paintComponent(g);
+    g.drawImage(backgroundImg, 0, this.getHeight() - backgroundImg.getHeight(null), null);
+  }
+    
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index b7d86d05..8e32d67e 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -36,6 +36,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.text.MessageFormat;
 import java.util.List;
 import java.util.Locale;
@@ -53,6 +54,7 @@ import javax.swing.JTable;
 import javax.swing.JTextArea;
 import javax.swing.LayoutStyle;
 import javax.swing.SwingUtilities;
+import javax.swing.border.TitledBorder;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
 import org.apache.commons.logging.Log;
@@ -66,7 +68,7 @@ public class SimpleGUI implements BKUGUIFacade {
     
     private static final Log log = LogFactory.getLog(SimpleGUI.class);
     public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
-    public static final String LOGO_RESOURCE = "/images/logo.png";
+    public static final String DEFAULT_BACKGROUND = "/images/mocca_default.png"; //logo.png";
     public static final String HASHDATA_FONT = "Monospaced";
     public static final Color ERROR_COLOR = Color.RED;
     public static final Color HYPERLINK_COLOR = Color.BLUE;
@@ -121,13 +123,13 @@ public class SimpleGUI implements BKUGUIFacade {
     protected int buttonSize;
     
     private static final int CHECKBOX_WIDTH = new JCheckBox().getPreferredSize().width;
-    
+
     /**
      * @param contentPane
      * @param localeString may be null
      */
     @Override
-    public void init(final Container contentPane, String localeString) {
+    public void init(final Container contentPane, String localeString, final URL background) {
 
         if (localeString != null) {
             messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, new Locale(localeString));
@@ -149,7 +151,7 @@ public class SimpleGUI implements BKUGUIFacade {
                   log.debug("initializing gui");
 
 //                    initIconPanel();
-                    initContentPanel();
+                    initContentPanel(background);
 
                     GroupLayout layout = new GroupLayout(contentPane);
                     contentPane.setLayout(layout);
@@ -189,13 +191,20 @@ public class SimpleGUI implements BKUGUIFacade {
 //                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)); //);
 //    }
 
-    protected void initContentPanel() {
+    protected void initContentPanel(URL background) {
 
-        contentPanel = new JPanel();
+      if (background == null) {
+        background = this.getClass().getResource(DEFAULT_BACKGROUND);
+      }
+        contentPanel = new ImagePanel(background);
 
+//        contentPanel.setBorder(new TitledBorder("content"));
+        
 //        headerPanel = new JPanel();
         mainPanel = new JPanel();
-        buttonPanel = new JPanel();
+        mainPanel.setOpaque(false);
+        buttonPanel = new JPanel(); // new ImagePanel(LOGO_RESOURCE); //new JPanel();
+        buttonPanel.setOpaque(false);
 
 //        headerPanel.setBorder(new TitledBorder("header"));
 //        mainPanel.setBorder(new TitledBorder("main"));
@@ -487,13 +496,14 @@ public class SimpleGUI implements BKUGUIFacade {
 //                cancelButton.addActionListener(cancelListener);
 
                 JButton okButton = new JButton();
+                okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
                 okButton.setText(messages.getString(BUTTON_OK));
                 okButton.setEnabled(false);
                 okButton.setActionCommand(okCommand);
                 okButton.addActionListener(okListener);
 
                 JLabel cardPinLabel = new JLabel();
-                cardPinLabel.setFont(cardPinLabel.getFont().deriveFont(cardPinLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                cardPinLabel.setFont(cardPinLabel.getFont().deriveFont(cardPinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 String pinLabel = messages.getString(LABEL_PIN);
                 cardPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
 
@@ -513,8 +523,8 @@ public class SimpleGUI implements BKUGUIFacade {
                 });
 
                 JLabel infoLabel = new JLabel();
+                infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD, infoLabel.getFont().getSize()-2));
                 if (numRetries < 0) {
-                    infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                     String pinsizePattern = messages.getString(LABEL_PINSIZE);
                     String pinSize = String.valueOf(pinSpec.getMinLength());
                     if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
@@ -658,13 +668,14 @@ public class SimpleGUI implements BKUGUIFacade {
 //                cancelButton.addActionListener(cancelListener);
 
                 JButton signButton = new JButton();
+                signButton.setFont(signButton.getFont().deriveFont(signButton.getFont().getStyle() & ~java.awt.Font.BOLD));
                 signButton.setText(messages.getString(BUTTON_SIGN));
                 signButton.setEnabled(false);
                 signButton.setActionCommand(signCommand);
                 signButton.addActionListener(signListener);
 
                 JLabel signPinLabel = new JLabel();
-                signPinLabel.setFont(signPinLabel.getFont().deriveFont(signPinLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                signPinLabel.setFont(signPinLabel.getFont().deriveFont(signPinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 String pinLabel = messages.getString(LABEL_PIN);
                 signPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
 
@@ -684,7 +695,7 @@ public class SimpleGUI implements BKUGUIFacade {
 
                 //pinsize or error label
                 JLabel infoLabel = new JLabel();
-                infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD, infoLabel.getFont().getSize()-2));
                 if (numRetries < 0) {
                     String pinsizePattern = messages.getString(LABEL_PINSIZE);
                     String pinSize = String.valueOf(pinSpec.getMinLength());
@@ -721,7 +732,7 @@ public class SimpleGUI implements BKUGUIFacade {
                           .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(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                       .addComponent(infoLabel));
 
                 mainPanelLayout.setVerticalGroup(
@@ -847,6 +858,7 @@ public class SimpleGUI implements BKUGUIFacade {
                   .addComponent(errorMsgLabel));
 
                 JButton okButton = new JButton();
+                okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
                 okButton.setText(messages.getString(BUTTON_OK));
                 okButton.setActionCommand(okCommand);
                 okButton.addActionListener(okListener);
@@ -1062,6 +1074,7 @@ public class SimpleGUI implements BKUGUIFacade {
   //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addComponent(refIdLabel).addGap(refIdLabel.getFont().getSize()).addComponent(hashDataScrollPane).addGap(refIdLabel.getFont().getSize())));
 
           JButton backButton = new JButton();
+          backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle() & ~java.awt.Font.BOLD));
           backButton.setText(messages.getString(BUTTON_BACK));
           backButton.setActionCommand(cancelCommand);
           backButton.addActionListener(cancelListener);
@@ -1215,6 +1228,7 @@ public class SimpleGUI implements BKUGUIFacade {
 
 
           JButton backButton = new JButton();
+          backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle() & ~java.awt.Font.BOLD));
           backButton.setText(messages.getString(BUTTON_BACK));
           backButton.setActionCommand(cancelCommand);
           backButton.addActionListener(cancelListener);
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index a2b5e0df..abed420f 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -34,7 +34,7 @@ message.hashdatalist=<html>{0} Signaturdatenobjekte:</html>
 message.retries=<html>Noch {0} Versuch(e)</html>
 message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
 label.pin=<html>{0}:</html>
-label.pinsize=<html>({0} stellig)</html>
+label.pinsize=<html>{0} stellig</html>
 button.ok=OK
 button.cancel=Abbrechen
 button.back=Zur\u00FCck
diff --git a/BKUCommonGUI/src/main/resources/images/mocca.png b/BKUCommonGUI/src/main/resources/images/mocca.png
new file mode 100644
index 00000000..881a65c1
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/images/mocca.png differ
diff --git a/BKUCommonGUI/src/main/resources/images/mocca_default.png b/BKUCommonGUI/src/main/resources/images/mocca_default.png
new file mode 100644
index 00000000..349d9ff0
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/images/mocca_default.png differ
diff --git a/BKUCommonGUI/src/main/resources/images/mocca_tiny.png b/BKUCommonGUI/src/main/resources/images/mocca_tiny.png
new file mode 100644
index 00000000..1f125d9b
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/images/mocca_tiny.png differ
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index 5f1bc8b2..308be642 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -40,7 +40,7 @@ public class BKUGUITest {
         BKUGUI gui = new BKUGUI();
         Container contentPane = testFrame.getContentPane();
         contentPane.setPreferredSize(new Dimension(380, 150));
-        gui.init(contentPane, null);
+        gui.init(contentPane, null, null);
         BKUGUIWorker worker = new BKUGUIWorker();
         worker.init(gui);
         testFrame.pack();
diff --git a/BKUOnline/src/main/webapp/META-INF/context.xml b/BKUOnline/src/main/webapp/META-INF/context.xml
index 3568c9ec..cd11ce8e 100644
--- a/BKUOnline/src/main/webapp/META-INF/context.xml
+++ b/BKUOnline/src/main/webapp/META-INF/context.xml
@@ -16,3 +16,4 @@
   limitations under the License.
 -->
 <Context path="/bkuonline"/>
+<!--Context path="/"/-->
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp
index 59dc2ad5..11f46dca 100644
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ b/BKUOnline/src/main/webapp/appletPage.jsp
@@ -42,7 +42,7 @@
 			height :<%= height %>
 		};
 		var parameters = {
-			background : <%= backgroundImg %>,
+			background : '<%= backgroundImg %>',
 			WSDL_URL :'../stal?wsdl',
 			SessionID : '<%= session.getId() %>',
 			redirectURL : '../bkuResult'
diff --git a/BKUOnline/src/main/webapp/index.html b/BKUOnline/src/main/webapp/index.html
index bf8b3ae0..8f1a338e 100644
--- a/BKUOnline/src/main/webapp/index.html
+++ b/BKUOnline/src/main/webapp/index.html
@@ -49,8 +49,6 @@
 <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>
-- 
cgit v1.2.3


From 255269ab17404fa1249c257e88815cbbee6e0d0f Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 13 Oct 2008 12:53:57 +0000
Subject: ExternalDisplaySignRequestHandler

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@105 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |   1 +
 .../at/gv/egiz/bku/online/applet/BKUWorker.java    |  32 +++-
 .../applet/ExternalDisplaySignRequestHandler.java  |  45 +++++
 .../online/applet/SignRequestHandlerFactory.java   |  21 +++
 .../bku/online/applet/WSSignRequestHandler.java    | 168 -------------------
 .../applet/WebServiceSignRequestHandler.java       | 167 ++++++++++++++++++
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   1 +
 .../at/gv/egiz/bku/gui/Messages.properties         |   1 +
 .../src/main/resources/images/chipperling_only.png | Bin 0 -> 3291 bytes
 .../main/resources/images/mocca_chipperling.png    | Bin 0 -> 4103 bytes
 .../bku/local/stal/LocalSignRequestHandler.java    |  93 +++++++----
 BKUOnline/src/main/webapp/appletPage.jsp           |   1 +
 .../bku/smccstal/CashedHashDataInputResolver.java  |  27 ---
 .../gv/egiz/bku/smccstal/HashDataInputDisplay.java |  30 ++++
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   | 186 ++++++---------------
 15 files changed, 407 insertions(+), 366 deletions(-)
 create mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalDisplaySignRequestHandler.java
 create mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/SignRequestHandlerFactory.java
 delete mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WSSignRequestHandler.java
 create mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WebServiceSignRequestHandler.java
 create mode 100644 BKUCommonGUI/src/main/resources/images/chipperling_only.png
 create mode 100644 BKUCommonGUI/src/main/resources/images/mocca_chipperling.png
 delete mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/CashedHashDataInputResolver.java
 create mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/HashDataInputDisplay.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index ab38c163..32c4feaa 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -46,6 +46,7 @@ public class BKUApplet extends JApplet {
     public final static String LOCALE_PARAM_KEY = "Locale";
     public final static String LOGO_URL_KEY = "LogoURL";
     public final static String WSDL_URL = "WSDL_URL";
+    public final static String HASHDATA_URL = "HashDataURL";
     public final static String SESSION_ID = "SessionID";
     public static final String BACKGROUND_PARAM = "background";
     
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
index fbf74162..d5ba4e40 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
@@ -46,6 +46,7 @@ import at.gv.egiz.stal.service.types.ErrorResponseType;
 import at.gv.egiz.stal.service.types.RequestType;
 import at.gv.egiz.stal.service.types.ResponseType;
 import at.gv.egiz.stal.util.STALTranslator;
+import java.applet.AppletContext;
 
 public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
     ActionListener, SMCCSTALRequestHandler {
@@ -54,6 +55,7 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
   protected BKUGUIFacade gui;
   protected BKUApplet parent;
   private STALPortType stalPort;
+  private URL hashDataURL;
   protected List<String> actionCommandList = new ArrayList<String>();
   protected Boolean actionPerformed = false;
   protected boolean finished = false;
@@ -115,13 +117,30 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
     STALService stal = new STALService(wsdlURL, endpointName);
     return stal.getSTALPort();
   }
+  
+  private URL getHashDataURL() throws MalformedURLException {
+    String hashDataParam = parent.getMyAppletParameter(BKUApplet.HASHDATA_URL);
+    URL codebase = parent.getCodeBase();
+    if (hashDataParam != null) {
+      try {
+        return new URL(codebase, hashDataParam);
+//        log.debug("Found HashDataInputServlet URL: " + hashDataURL);
+      } catch (MalformedURLException ex) {
+        log.fatal("Paremeter " + BKUApplet.HASHDATA_URL + " is not a vailid URL.", ex);
+        throw new MalformedURLException(ex.getMessage());
+      }
+    } else {
+      log.fatal("Paremeter " + BKUApplet.HASHDATA_URL + " not set");
+      throw new MalformedURLException(BKUApplet.HASHDATA_URL + " not set");
+    }
+  }
 
   @Override
   public void run() {
     gui.showWelcomeDialog();
     try {
       stalPort = getSTALPort();
-
+      hashDataURL = getHashDataURL();
     } catch (Exception e) {
       log.fatal("Failed to call STAL service.", e);
       actionCommandList.clear();
@@ -135,14 +154,21 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
       }
       return;
     }
+    
+    //TODO factory for SignRequestHandler providing either WebServiceHDISignRequestHandler or ExternalHDIDisplaySignRequestHandler
+    AppletContext ctx = parent.getAppletContext();
+    log.debug("register SignRequestHandler for HashDataURL " + hashDataURL);
+    addRequestHandler(at.gv.egiz.stal.SignRequest.class, new ExternalDisplaySignRequestHandler(ctx, hashDataURL));
+    
     try {
       String sessionId = parent.getMyAppletParameter(BKUApplet.SESSION_ID);
       if (sessionId == null) {
         // use the testsession for testing
         sessionId = "TestSession";
       }
-      addRequestHandler(at.gv.egiz.stal.SignRequest.class,
-          new WSSignRequestHandler(sessionId, stalPort));
+      
+//      log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
+//      addRequestHandler(at.gv.egiz.stal.SignRequest.class, new WebServiceSignRequestHandler(sessionId, stalPort));
 
       ObjectFactory of = new ObjectFactory();
       GetNextRequestResponseType nextRequestResp = stalPort.connect(sessionId);
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalDisplaySignRequestHandler.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalDisplaySignRequestHandler.java
new file mode 100644
index 00000000..a9bbc559
--- /dev/null
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalDisplaySignRequestHandler.java
@@ -0,0 +1,45 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.bku.online.applet;
+
+import at.gv.egiz.bku.smccstal.SMCCSTALRequestHandler;
+import at.gv.egiz.bku.smccstal.SignRequestHandler;
+import at.gv.egiz.stal.signedinfo.ReferenceType;
+import java.applet.AppletContext;
+import java.net.URL;
+import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author clemens
+ */
+public class ExternalDisplaySignRequestHandler extends SignRequestHandler {
+
+  private static final Log log = LogFactory.getLog(ExternalDisplaySignRequestHandler.class);
+  
+  AppletContext ctx;
+  URL hashDataURL;
+
+  public ExternalDisplaySignRequestHandler(AppletContext ctx, URL hashDataURL) {
+    this.ctx = ctx;
+    this.hashDataURL = hashDataURL;
+  }
+
+  @Override
+  public SMCCSTALRequestHandler newInstance() {
+    return new ExternalDisplaySignRequestHandler(ctx, hashDataURL);
+  }
+
+  @Override
+  public void displayHashDataInputs(List<ReferenceType> signedReferences) throws Exception {
+    //TODO pass reference Id's to servlet (TODO servlet)
+    log.debug("displaying hashdata inputs at " + hashDataURL);
+    ctx.showDocument(hashDataURL, "_blank");
+  }
+
+}
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/SignRequestHandlerFactory.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/SignRequestHandlerFactory.java
new file mode 100644
index 00000000..327ea8aa
--- /dev/null
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/SignRequestHandlerFactory.java
@@ -0,0 +1,21 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.bku.online.applet;
+
+import at.gv.egiz.bku.smccstal.SignRequestHandler;
+
+/**
+ *
+ * @author clemens
+ */
+public class SignRequestHandlerFactory {
+
+  static SignRequestHandler getInstance() {
+    //TODO return ExternalDisplaySignRequestHandler by default, WebServiceSignRequestHandler if requested
+    //TODO get configuration as param
+    return null;
+  }
+}
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WSSignRequestHandler.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WSSignRequestHandler.java
deleted file mode 100644
index 3a36a290..00000000
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WSSignRequestHandler.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.online.applet;
-
-import at.gv.egiz.bku.smccstal.SMCCSTALRequestHandler;
-import at.gv.egiz.bku.smccstal.SignRequestHandler;
-import at.gv.egiz.stal.HashDataInput;
-import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
-import at.gv.egiz.stal.service.STALPortType;
-import at.gv.egiz.stal.service.types.GetHashDataInputResponseType;
-import at.gv.egiz.stal.service.types.GetHashDataInputType;
-import at.gv.egiz.stal.signedinfo.DigestMethodType;
-import at.gv.egiz.stal.signedinfo.ReferenceType;
-import java.security.DigestException;
-import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map.Entry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- *
- * @author clemens
- */
-public class WSSignRequestHandler extends SignRequestHandler {
-
-  private static final Log log = LogFactory.getLog(WSSignRequestHandler.class);
-  STALPortType stalPort;
-  String sessId;
-
-  public WSSignRequestHandler(String sessId, STALPortType stalPort) {
-    if (stalPort == null || sessId == null) {
-      throw new NullPointerException("STAL port must not be null");
-    }
-    this.sessId = sessId;
-    this.stalPort = stalPort;
-  }
-
-  @Override
-  public List<HashDataInput> getCashedHashDataInputs(List<ReferenceType> signedReferences) throws Exception {
-
-    GetHashDataInputType request = new GetHashDataInputType();
-    request.setSessionId(sessId);
-
-    HashMap<String, ReferenceType> idSignedRefMap = new HashMap<String, ReferenceType>();
-    for (ReferenceType signedRef : signedReferences) {
-      //don't get Manifest, QualifyingProperties, ...
-      if (signedRef.getType() == null) {
-        String signedRefId = signedRef.getId();
-        if (signedRefId != null) {
-          if (log.isTraceEnabled()) {
-            log.trace("requesting hashdata input for reference " + signedRefId);
-          }
-          idSignedRefMap.put(signedRefId, signedRef);
-          GetHashDataInputType.Reference ref = new GetHashDataInputType.Reference();
-          ref.setID(signedRefId);
-          request.getReference().add(ref);
-
-        } else {
-          throw new Exception("Cannot resolve HashDataInput for reference without Id attribute");
-        }
-      }
-    }
-
-    if (log.isDebugEnabled()) {
-      log.debug("Calling GetHashDataInput for " + request.getReference().size() + " references in session " + sessId);
-    }
-    GetHashDataInputResponseType response = stalPort.getHashDataInput(request);
-    ArrayList<HashDataInput> hashDataInputs = new ArrayList<HashDataInput>();
-
-    //hashdata inputs returned from service
-    HashMap<String, GetHashDataInputResponseType.Reference> idRefMap = new HashMap<String, GetHashDataInputResponseType.Reference>();
-    for (GetHashDataInputResponseType.Reference reference : response.getReference()) {
-      String id = reference.getID();
-      byte[] hdi = reference.getValue();
-      if (hdi == null) {
-        throw new Exception("Did not receive hashdata input for reference " + id);
-      }
-      idRefMap.put(id, reference);
-    }
-    
-    for (String signedRefId : idSignedRefMap.keySet()) {
-      log.info("validating hashdata input for reference " + signedRefId);
-      
-      GetHashDataInputResponseType.Reference reference = idRefMap.get(signedRefId);
-      if (reference == null) {
-        throw new Exception("No hashdata input for reference " + signedRefId + " returned by service");
-      }
-      
-//    }
-//    
-//    for (GetHashDataInputResponseType.Reference reference : response.getReference()) {
-//
-//      String id = reference.getID();
-      byte[] hdi = reference.getValue();
-      String mimeType = reference.getMimeType();
-      String encoding = reference.getEncoding();
-
-      if (hdi == null) {
-        throw new Exception("No hashdata input provided for reference " + signedRefId);
-      }
-      if (log.isDebugEnabled()) {
-        log.debug("Got HashDataInput " + signedRefId + " (" + mimeType + ";" + encoding + ")");
-      }
-
-      ReferenceType dsigRef = idSignedRefMap.get(signedRefId);
-      DigestMethodType dm = dsigRef.getDigestMethod();
-      
-      if (dm == null) {
-        throw new Exception("Failed to verify digest value for reference " + signedRefId + ": no digest algorithm");
-      }
-      String mdAlg = dm.getAlgorithm();
-      if ("http://www.w3.org/2000/09/xmldsig#sha1".equals(mdAlg))
-        mdAlg = "SHA-1";
-      else if ("http://www.w3.org/2001/04/xmlenc#sha256".equals(mdAlg))
-        mdAlg = "SHA-256";
-      else if ("http://www.w3.org/2001/04/xmlenc#sha224 ".equals(mdAlg))
-        mdAlg = "SHA-224";
-      else if ("http://www.w3.org/2001/04/xmldsig-more#sha224  ".equals(mdAlg))
-        mdAlg = "SHA-224";
-      else if ("http://www.w3.org/2001/04/xmldsig-more#sha384".equals(mdAlg))
-        mdAlg = "SHA-384";
-      else if ("http://www.w3.org/2001/04/xmlenc#sha512".equals(mdAlg))
-        mdAlg = "SHA-512";
-      else if ("http://www.w3.org/2001/04/xmldsig-more#md2 ".equals(mdAlg))
-        mdAlg = "MD2";
-      else if ("http://www.w3.org/2001/04/xmldsig-more#md5".equals(mdAlg))
-        mdAlg = "MD5";
-      else if ("http://www.w3.org/2001/04/xmlenc#ripemd160 ".equals(mdAlg))
-        mdAlg = "RipeMD-160";
-      else {
-        throw new Exception("Failed to verify digest value for reference " + signedRefId + ": unsupported digest algorithm " + mdAlg);
-      }
-      MessageDigest md = MessageDigest.getInstance(mdAlg);
-      byte[] hdiDigest = md.digest(hdi);
-      if (log.isDebugEnabled())
-        log.debug("Comparing digest values... "); 
-      if (!Arrays.equals(hdiDigest, dsigRef.getDigestValue())) {
-        log.error("digest values differ: " + new String(hdiDigest) + ", " + new String(dsigRef.getDigestValue()));
-        throw new DigestException("Bad digest value for reference " + signedRefId + ": " + new String(dsigRef.getDigestValue()));
-      }
-      hashDataInputs.add(new ByteArrayHashDataInput(hdi, signedRefId, mimeType, encoding));
-    }
-    return hashDataInputs;
-  }
-
-  @Override
-  public SMCCSTALRequestHandler newInstance() {
-    return new WSSignRequestHandler(this.sessId, this.stalPort);
-  }
-}
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WebServiceSignRequestHandler.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WebServiceSignRequestHandler.java
new file mode 100644
index 00000000..4a87b8b5
--- /dev/null
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WebServiceSignRequestHandler.java
@@ -0,0 +1,167 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.online.applet;
+
+import at.gv.egiz.bku.smccstal.SMCCSTALRequestHandler;
+import at.gv.egiz.bku.smccstal.SignRequestHandler;
+import at.gv.egiz.stal.HashDataInput;
+import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
+import at.gv.egiz.stal.service.STALPortType;
+import at.gv.egiz.stal.service.types.GetHashDataInputResponseType;
+import at.gv.egiz.stal.service.types.GetHashDataInputType;
+import at.gv.egiz.stal.signedinfo.DigestMethodType;
+import at.gv.egiz.stal.signedinfo.ReferenceType;
+import java.security.DigestException;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author clemens
+ */
+public class WebServiceSignRequestHandler extends SignRequestHandler {
+
+  private static final Log log = LogFactory.getLog(WebServiceSignRequestHandler.class);
+  STALPortType stalPort;
+  String sessId;
+
+    public WebServiceSignRequestHandler(String sessId, STALPortType stalPort) {
+    if (stalPort == null || sessId == null) {
+      throw new NullPointerException("STAL port must not be null");
+    }
+    this.sessId = sessId;
+    this.stalPort = stalPort;
+  }
+
+  @Override
+  public void displayHashDataInputs(List<ReferenceType> signedReferences) throws Exception {
+  
+    GetHashDataInputType request = new GetHashDataInputType();
+    request.setSessionId(sessId);
+
+    HashMap<String, ReferenceType> idSignedRefMap = new HashMap<String, ReferenceType>();
+    for (ReferenceType signedRef : signedReferences) {
+      //don't get Manifest, QualifyingProperties, ...
+      if (signedRef.getType() == null) {
+        String signedRefId = signedRef.getId();
+        if (signedRefId != null) {
+          if (log.isTraceEnabled()) {
+            log.trace("requesting hashdata input for reference " + signedRefId);
+          }
+          idSignedRefMap.put(signedRefId, signedRef);
+          GetHashDataInputType.Reference ref = new GetHashDataInputType.Reference();
+          ref.setID(signedRefId);
+          request.getReference().add(ref);
+
+        } else {
+          throw new Exception("Cannot resolve HashDataInput for reference without Id attribute");
+        }
+      }
+    }
+
+    if (log.isDebugEnabled()) {
+      log.debug("Calling GetHashDataInput for " + request.getReference().size() + " references in session " + sessId);
+    }
+    GetHashDataInputResponseType response = stalPort.getHashDataInput(request);
+    ArrayList<HashDataInput> hashDataInputs = new ArrayList<HashDataInput>();
+
+    //hashdata inputs returned from service
+    HashMap<String, GetHashDataInputResponseType.Reference> idRefMap = new HashMap<String, GetHashDataInputResponseType.Reference>();
+    for (GetHashDataInputResponseType.Reference reference : response.getReference()) {
+      String id = reference.getID();
+      byte[] hdi = reference.getValue();
+      if (hdi == null) {
+        throw new Exception("Did not receive hashdata input for reference " + id);
+      }
+      idRefMap.put(id, reference);
+    }
+    
+    for (String signedRefId : idSignedRefMap.keySet()) {
+      log.info("validating hashdata input for reference " + signedRefId);
+      
+      GetHashDataInputResponseType.Reference reference = idRefMap.get(signedRefId);
+      if (reference == null) {
+        throw new Exception("No hashdata input for reference " + signedRefId + " returned by service");
+      }
+      
+//    }
+//    
+//    for (GetHashDataInputResponseType.Reference reference : response.getReference()) {
+//
+//      String id = reference.getID();
+      byte[] hdi = reference.getValue();
+      String mimeType = reference.getMimeType();
+      String encoding = reference.getEncoding();
+
+      if (hdi == null) {
+        throw new Exception("No hashdata input provided for reference " + signedRefId);
+      }
+      if (log.isDebugEnabled()) {
+        log.debug("Got HashDataInput " + signedRefId + " (" + mimeType + ";" + encoding + ")");
+      }
+
+      ReferenceType dsigRef = idSignedRefMap.get(signedRefId);
+      DigestMethodType dm = dsigRef.getDigestMethod();
+      
+      if (dm == null) {
+        throw new Exception("Failed to verify digest value for reference " + signedRefId + ": no digest algorithm");
+      }
+      String mdAlg = dm.getAlgorithm();
+      if ("http://www.w3.org/2000/09/xmldsig#sha1".equals(mdAlg))
+        mdAlg = "SHA-1";
+      else if ("http://www.w3.org/2001/04/xmlenc#sha256".equals(mdAlg))
+        mdAlg = "SHA-256";
+      else if ("http://www.w3.org/2001/04/xmlenc#sha224 ".equals(mdAlg))
+        mdAlg = "SHA-224";
+      else if ("http://www.w3.org/2001/04/xmldsig-more#sha224  ".equals(mdAlg))
+        mdAlg = "SHA-224";
+      else if ("http://www.w3.org/2001/04/xmldsig-more#sha384".equals(mdAlg))
+        mdAlg = "SHA-384";
+      else if ("http://www.w3.org/2001/04/xmlenc#sha512".equals(mdAlg))
+        mdAlg = "SHA-512";
+      else if ("http://www.w3.org/2001/04/xmldsig-more#md2 ".equals(mdAlg))
+        mdAlg = "MD2";
+      else if ("http://www.w3.org/2001/04/xmldsig-more#md5".equals(mdAlg))
+        mdAlg = "MD5";
+      else if ("http://www.w3.org/2001/04/xmlenc#ripemd160 ".equals(mdAlg))
+        mdAlg = "RipeMD-160";
+      else {
+        throw new Exception("Failed to verify digest value for reference " + signedRefId + ": unsupported digest algorithm " + mdAlg);
+      }
+      MessageDigest md = MessageDigest.getInstance(mdAlg);
+      byte[] hdiDigest = md.digest(hdi);
+      if (log.isDebugEnabled())
+        log.debug("Comparing digest values... "); 
+      if (!Arrays.equals(hdiDigest, dsigRef.getDigestValue())) {
+        log.error("digest values differ: " + new String(hdiDigest) + ", " + new String(dsigRef.getDigestValue()));
+        throw new DigestException("Bad digest value for reference " + signedRefId + ": " + new String(dsigRef.getDigestValue()));
+      }
+      hashDataInputs.add(new ByteArrayHashDataInput(hdi, signedRefId, mimeType, encoding));
+    }
+    
+    gui.showHashDataInputDialog(hashDataInputs, this, "ok");
+  }
+
+  @Override
+  public SMCCSTALRequestHandler newInstance() {
+    return new WebServiceSignRequestHandler(this.sessId, this.stalPort);
+  }
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 4925e7fa..0b617271 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -30,6 +30,7 @@ public interface BKUGUIFacade {
   public static final String ERR_NO_PCSC = "error.pcsc";
   public static final String ERR_NO_CARDTERMINAL = "error.cardterminal";
   public static final String ERR_NO_HASHDATA = "error.no.hashdata";
+  public static final String ERR_DISPLAY_HASHDATA = "error.display.hashdata";
   public static final String ERR_WRITE_HASHDATA = "error.write.hashdata";
   public static final String ERR_INVALID_HASH = "error.invalid.hash";
   
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index abed420f..e7716ae9 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -50,6 +50,7 @@ save.hashdatainput.prefix=Signaturdaten
 
 # Error Messages
 error.no.hashdata=<html>Keine Signaturdaten verf\u00FCgbar: {0}</html>
+error.display.hashdata=<html>Signaturdaten konnten nicht dargestellt werden: {0}</html>
 error.write.hashdata=<html>Die Signaturdaten konnten nicht gespeichert werden: {0}</html>
 error.invalid.hash=<html>Die Signaturdaten sind ung\u00FCltig: {0}</html>
 error.ws.unreachable=<html>Das Web-Service ist nicht erreichbar: {0}</html>
diff --git a/BKUCommonGUI/src/main/resources/images/chipperling_only.png b/BKUCommonGUI/src/main/resources/images/chipperling_only.png
new file mode 100644
index 00000000..57063b9a
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/images/chipperling_only.png differ
diff --git a/BKUCommonGUI/src/main/resources/images/mocca_chipperling.png b/BKUCommonGUI/src/main/resources/images/mocca_chipperling.png
new file mode 100644
index 00000000..4ee2d054
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/images/mocca_chipperling.png differ
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
index ca420f13..4330f570 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
@@ -17,6 +17,7 @@
 package at.gv.egiz.bku.local.stal;
 
 import at.gv.egiz.bku.slcommands.impl.DataObjectHashDataInput;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -41,68 +42,92 @@ import java.io.InputStream;
  */
 public class LocalSignRequestHandler extends SignRequestHandler {
 
-  private static final Log log = LogFactory
-      .getLog(LocalSignRequestHandler.class);
-  private List<HashDataInput> hashDataInput = Collections.EMPTY_LIST;
-
-  public LocalSignRequestHandler() {
-  }
+  private static final Log log = LogFactory.getLog(LocalSignRequestHandler.class);
+  private List<HashDataInput> hashDataInputs = Collections.EMPTY_LIST;
 
+  /**
+   * If the request is a SIGN request, it contains a list of DataObjectHashDataInput 
+   * providing the pre-digested input stream (that can be obtained repeatedly) if 
+   * reference caching is enabled (or null otherwise).
+   * @param request
+   * @return
+   */
   @SuppressWarnings("unchecked")
   @Override
   public STALResponse handleRequest(STALRequest request) {
     if (request instanceof SignRequest) {
       SignRequest signReq = (SignRequest) request;
-      hashDataInput = signReq.getHashDataInput();
+      hashDataInputs = signReq.getHashDataInput();
     }
     return super.handleRequest(request);
   }
 
+  /**
+   * 
+   * @param dsigReferences
+   * @throws java.lang.Exception
+   */
   @Override
-  public List<HashDataInput> getCashedHashDataInputs(
-      List<ReferenceType> dsigReferences) throws Exception {
-    ArrayList<HashDataInput> result = new ArrayList<HashDataInput>();
+  public void displayHashDataInputs(List<ReferenceType> dsigReferences) throws Exception {
+    if (dsigReferences == null || dsigReferences.size() < 1) {
+      log.error("No hashdata input selected to be displayed: null");
+      throw new Exception("No HashData Input selected to be displayed");
+    }
+
+    ArrayList<HashDataInput> selectedHashDataInputs = new ArrayList<HashDataInput>();
     for (ReferenceType dsigRef : dsigReferences) {
       // don't get Manifest, QualifyingProperties, ...
       if (dsigRef.getType() == null) {
         String dsigRefId = dsigRef.getId();
         if (dsigRefId != null) {
-          for (HashDataInput hdi : hashDataInput) {
-            if (hdi.getReferenceId().equals(dsigRefId)) {
-              if (hdi instanceof DataObjectHashDataInput) {
-                if (log.isTraceEnabled())
-                  log.trace("adding DataObjectHashDataInput");
-                result.add(hdi);
-              } else if (hdi instanceof ByteArrayHashDataInput) {
-                if (log.isTraceEnabled())
-                  log.trace("adding ByteArrayHashDataInput");
-                result.add(hdi);
-              } else {
-                if (log.isDebugEnabled())
-                  log.debug("provided HashDataInput not chaching enabled, creating ByteArrayHashDataInput");
-                
-                InputStream hdIs = hdi.getHashDataInput();
-                ByteArrayOutputStream baos = new ByteArrayOutputStream(hdIs.available());
-                int b;
-                while ((b = hdIs.read()) != -1) {
-                  baos.write(b);
-                }
-                ByteArrayHashDataInput baHdi = new ByteArrayHashDataInput(baos.toByteArray(), hdi.getReferenceId(), hdi.getMimeType(), hdi.getEncoding());
-                result.add(baHdi);
+          boolean hdiAvailable = false;
+          for (HashDataInput hashDataInput : hashDataInputs) {
+            if (dsigRefId.equals(hashDataInput.getReferenceId())) {
+              log.debug("display hashdata input for dsig:SignedReference " + dsigRefId);
+              if (!(hashDataInput instanceof DataObjectHashDataInput)) {
+                log.warn(
+                  "expected DataObjectHashDataInput for LocalSignRequestHandler, got " + hashDataInput.getClass().getName());
+                hashDataInput = getByteArrayHashDataInput(hashDataInput);
               }
+              selectedHashDataInputs.add(hashDataInput);
+              hdiAvailable = true;
+              break;
             }
           }
+          if (!hdiAvailable) {
+            log.error("no hashdata input for dsig:SignedReference " + dsigRefId);
+            throw new Exception(
+              "No HashDataInput available for dsig:SignedReference " + dsigRefId);
+          }
         } else {
           throw new Exception(
-              "Cannot get HashDataInput for dsig:Reference without Id attribute");
+            "Cannot get HashDataInput for dsig:Reference without Id attribute");
         }
       }
     }
-    return result;
+
+    if (selectedHashDataInputs.size() < 1) {
+      log.error("dsig:SignedInfo does not contain a data reference");
+      throw new Exception("dsig:SignedInfo does not contain a data reference");
+    }
+    gui.showHashDataInputDialog(selectedHashDataInputs, this, "ok");
   }
 
   @Override
   public SMCCSTALRequestHandler newInstance() {
     return new LocalSignRequestHandler();
   }
+
+  private ByteArrayHashDataInput getByteArrayHashDataInput(HashDataInput hashDataInput) throws IOException {
+
+    InputStream hdIs = hashDataInput.getHashDataInput();
+    ByteArrayOutputStream baos = new ByteArrayOutputStream(hdIs.available());
+    int b;
+    while ((b = hdIs.read()) != -1) {
+      baos.write(b);
+    }
+    ByteArrayHashDataInput hdi = new ByteArrayHashDataInput(baos.toByteArray(), hashDataInput.getReferenceId(), hashDataInput.getMimeType(), hashDataInput.getEncoding());
+
+    return hdi;
+  }
 }
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp
index 6c4aee58..903c762d 100644
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ b/BKUOnline/src/main/webapp/appletPage.jsp
@@ -53,6 +53,7 @@
 		var parameters = {
 			background : '<%=backgroundImg%>',
 			WSDL_URL :'../stal?wsdl',
+                        HashDataURL : '../hashDataInput',
 			SessionID : '<%=session.getId()%>',
 			redirectURL : '../bkuResult'
 		};
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/CashedHashDataInputResolver.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/CashedHashDataInputResolver.java
deleted file mode 100644
index 05af85d9..00000000
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/CashedHashDataInputResolver.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package at.gv.egiz.bku.smccstal;
-
-import at.gv.egiz.stal.HashDataInput;
-import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
-import at.gv.egiz.stal.signedinfo.ReferenceType;
-import java.security.DigestException;
-import java.util.List;
-import java.util.Set;
-
-/**
- *
- * @author clemens
- */
-public interface CashedHashDataInputResolver {
-
-    /**
-     * implementations may verify the hashvalue 
-     * @post-condition returned list != null
-     * @return
-     */
-    List<HashDataInput> getCashedHashDataInputs(List<ReferenceType> signedReferences) throws DigestException, Exception; 
-}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/HashDataInputDisplay.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/HashDataInputDisplay.java
new file mode 100644
index 00000000..f79a2027
--- /dev/null
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/HashDataInputDisplay.java
@@ -0,0 +1,30 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package at.gv.egiz.bku.smccstal;
+
+import at.gv.egiz.stal.signedinfo.ReferenceType;
+import java.security.DigestException;
+import java.util.List;
+
+/**
+ *
+ * @author clemens
+ */
+public interface HashDataInputDisplay {
+
+  /**
+   * Displays the hashdata inputs for all provided dsig:SignedReferences.
+   * Implementations may verify the digest value if necessary. 
+   * (LocalSignRequestHandler operates on DataObjectHashDataInput, 
+   * other SignRequestHandlers should cache the HashDataInputs obtained by webservice calls, 
+   * or simply forward to a HashDataInputServlet.)
+   * @param signedReferences The caller may select a subset of the references in SignedInfo to be displayed.
+   * @throws java.security.DigestException if digest values are verified and do not correspond 
+   * (or any other digest computation error occurs)
+   * @throws java.lang.Exception
+   */
+  void displayHashDataInputs(List<ReferenceType> signedReferences) throws DigestException, Exception;
+  
+}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index 7d994392..dcd12b02 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -17,6 +17,7 @@
 package at.gv.egiz.bku.smccstal;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
+import java.awt.event.ActionEvent;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.security.MessageDigest;
@@ -42,31 +43,18 @@ import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
 import at.gv.egiz.stal.SignRequest;
 import at.gv.egiz.stal.SignResponse;
-import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
 import at.gv.egiz.stal.signedinfo.ObjectFactory;
-import at.gv.egiz.stal.signedinfo.ReferenceType;
 import at.gv.egiz.stal.signedinfo.SignedInfoType;
 import at.gv.egiz.stal.util.JCEAlgorithmNames;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import java.awt.event.ActionListener;
 import java.security.DigestException;
-import java.security.DigestInputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
 
-/**
- * This class is NOT thread-safe. 
- * handleRequest() sets the SignedInfo which is used in providePIN.
- */
-public abstract class SignRequestHandler extends AbstractRequestHandler implements
-  CashedHashDataInputResolver {
+public abstract class SignRequestHandler extends AbstractRequestHandler implements HashDataInputDisplay {
 
     private static Log log = LogFactory.getLog(SignRequestHandler.class);
     private static JAXBContext jaxbContext;
     
-
     static {
         try {
             jaxbContext = JAXBContext.newInstance(ObjectFactory.class.getPackage().getName());
@@ -74,11 +62,6 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
             log.fatal("Cannot init jaxbContext", e);
         }
     }
-    /** the SignedInfo of the current SignRequest */
-//    protected SignedInfoType signedInfo;
-//    protected List<ByteArrayHashDataInput> hashDataInputs;
-    
-//    private int retryCounter = 0;
 
     @SuppressWarnings("unchecked")
     @Override
@@ -192,99 +175,10 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
 //        return new SignRequestHandler();
 //    }
 
-    /**
-     * implementations may verify the hashvalue 
-     * @post-condition returned list != null
-     * @return
-     */
-    @Override
-    public abstract List<HashDataInput> getCashedHashDataInputs(List<ReferenceType> signedReferences) throws Exception; 
-//    {
-//        //TODO
-//        log.warn("Return empty HashDataInput");
-//        return new ArrayList<HashDataInput>();
-//    }
-
     
+
     
-//    protected void validateHashDataInputs(List<ReferenceType> signedReferences, List<HashDataInput> hashDataInputs) {
-//      if (hashDataInputs != null) {
-//
-//          Map<String, HashDataInput> hashDataIdMap = new HashMap<String, HashDataInput>();
-//          for (HashDataInput hdi : hashDataInputs) {
-//            if (log.isTraceEnabled()) {
-//              log.trace("Provided HashDataInput for reference " + hdi.getReferenceId());
-//            }
-//            hashDataIdMap.put(hdi.getReferenceId(), hdi);
-//          }
-//
-//          List<GetHashDataInputType.Reference> reqRefs = request.getReference();
-//          for (GetHashDataInputType.Reference reqRef : reqRefs) {
-//            String reqRefId = reqRef.getID();
-//            HashDataInput reqHdi = hashDataIdMap.get(reqRefId);
-//            if (reqHdi == null) {
-//              String msg = "Failed to resolve HashDataInput for reference " + reqRefId;
-//              log.error(msg);
-//              GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
-//              faultInfo.setErrorCode(1);
-//              faultInfo.setErrorMessage(msg);
-//              throw new GetHashDataInputFault(msg, faultInfo);
-//            }
-//
-//            InputStream hashDataIS = reqHdi.getHashDataInput();
-//            if (hashDataIS == null) {
-//              //HashDataInput not cached?
-//              String msg = "Failed to obtain HashDataInput for reference " + reqRefId + ", reference not cached";
-//              log.error(msg);
-//              GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
-//              faultInfo.setErrorCode(1);
-//              faultInfo.setErrorMessage(msg);
-//              throw new GetHashDataInputFault(msg, faultInfo);
-//            }
-//            ByteArrayOutputStream baos = null;
-//            try {
-//              if (log.isDebugEnabled()) {
-//                log.debug("Resolved HashDataInput " + reqRefId + " (" + reqHdi.getMimeType() + ";charset=" + reqHdi.getEncoding() + ")");
-//              }
-//              baos = new ByteArrayOutputStream(hashDataIS.available());
-//              int c;
-//              while ((c = hashDataIS.read()) != -1) {
-//                baos.write(c);
-//              }
-//              GetHashDataInputResponseType.Reference ref = new GetHashDataInputResponseType.Reference();
-//              ref.setID(reqRefId);
-//              ref.setMimeType(reqHdi.getMimeType());
-//              ref.setEncoding(reqHdi.getEncoding());
-//              ref.setValue(baos.toByteArray());
-//              response.getReference().add(ref);
-//            } catch (IOException ex) {
-//              String msg = "Failed to get HashDataInput for reference " + reqRefId;
-//              log.error(msg, ex);
-//              GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
-//              faultInfo.setErrorCode(1);
-//              faultInfo.setErrorMessage(msg);
-//              throw new GetHashDataInputFault(msg, faultInfo, ex);
-//            } finally {
-//              try {
-//                baos.close();
-//              } catch (IOException ex) {
-//              }
-//            }
-//          }
-//          return response;
-//        }
-//      for (ReferenceType reference : signedReferences) {
-//        String algorithm = reference.getDigestMethod().getAlgorithm();
-//        
-//      }
-//    }
-  
-  
-  /**
-   * cashes the HashDataInputs provided by SignRequestHandler.this.getHashDataInputs()
-   * (don't know whether outer class is LocalSignRequestHandler or WSSignRequestHandler, providing DataObjectHDI or ByteArrayHDI, resp)
-   */
-  class STALPinProvider implements PINProvider {
+  class STALPinProvider implements PINProvider, ActionListener {
     
     protected SignedInfoType signedInfo;
     protected List<HashDataInput> hashDataInputs;
@@ -293,49 +187,73 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
     public STALPinProvider(SignedInfoType signedInfo) {
       this.signedInfo = signedInfo;
     }
+    
+    private void showSignaturePINDialog(PINSpec spec, int retries) {
+      if (retryCounter > 0) {
+          gui.showSignaturePINRetryDialog(spec, retries, SignRequestHandler.this, "sign", SignRequestHandler.this,
+            "cancel", SignRequestHandler.this, "hashData");
+        } else {
+          gui.showSignaturePINDialog(spec, SignRequestHandler.this, "sign", SignRequestHandler.this, "cancel", SignRequestHandler.this,
+            "hashData");
+        }
+    }
   
     @Override
     public String providePIN(PINSpec spec, int retries) {
-    if (retryCounter++ > 0) {
-      log.info("PIN wrong retrying ...");
-      gui.showSignaturePINRetryDialog(spec, retries, SignRequestHandler.this, "sign", SignRequestHandler.this,
-        "cancel", SignRequestHandler.this, "hashData");
-    } else {
-      gui.showSignaturePINDialog(spec, SignRequestHandler.this, "sign", SignRequestHandler.this, "cancel", SignRequestHandler.this,
-        "hashData");
-    }
+    
+      showSignaturePINDialog(spec, retries);
+      
     do {
       waitForAction();
       gui.showWaitDialog(null);
       if (actionCommand.equals("cancel")) {
         return null;
       } else if (actionCommand.equals("hashData")) {
-        if (signedInfo != null) {
+        
+        showSignaturePINDialog(spec, retries);
+          
           try {
-//            gui.showWaitDialog(null);
-            if (hashDataInputs == null || hashDataInputs.size() == 0) {
-              hashDataInputs = getCashedHashDataInputs(signedInfo.getReference());
-            }
-            gui.showHashDataInputDialog(hashDataInputs, SignRequestHandler.this, "ok");
+            displayHashDataInputs(signedInfo.getReference());
           } catch (DigestException ex) { 
             log.error("Bad digest value: " + ex.getMessage());
             gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH, new Object[] {ex.getMessage()});
           } catch (Exception ex) {
-            //FIXME localize messages
-            log.error("Failed to obtain HashDataInputs: " + ex.getMessage());
-            gui.showErrorDialog(BKUGUIFacade.ERR_NO_HASHDATA, new Object[] {ex.getMessage()}, SignRequestHandler.this, "ok");
+            log.error("Could not display hashdata inputs: " + ex.getMessage());
+            gui.showErrorDialog(BKUGUIFacade.ERR_DISPLAY_HASHDATA, new Object[] {ex.getMessage()}, SignRequestHandler.this, "ok");
           }
-        } else {
-          //FIXME get all hashdatainputs
-          gui.showErrorDialog(BKUGUIFacade.ERR_NO_HASHDATA, new Object[] {"No dsig:SignedInfo provided"}, SignRequestHandler.this, "ok");
-        }
+        
+        // OLD HASHDATA DISPLAY (in applet), 
+        // register SignRequestHandler.this as hashdataListener to use
+//        if (signedInfo != null) {
+//          try {
+//            if (hashDataInputs == null || hashDataInputs.size() == 0) {
+//              hashDataInputs = getCashedHashDataInputs(signedInfo.getReference());
+//            }
+//            gui.showHashDataInputDialog(hashDataInputs, SignRequestHandler.this, "ok");
+//          } catch (DigestException ex) { 
+//            log.error("Bad digest value: " + ex.getMessage());
+//            gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH, new Object[] {ex.getMessage()});
+//          } catch (Exception ex) {
+//            //FIXME localize messages
+//            log.error("Failed to obtain HashDataInputs: " + ex.getMessage());
+//            gui.showErrorDialog(BKUGUIFacade.ERR_NO_HASHDATA, new Object[] {ex.getMessage()}, SignRequestHandler.this, "ok");
+//          }
+//        } else {
+//          //FIXME get all hashdatainputs
+//          gui.showErrorDialog(BKUGUIFacade.ERR_NO_HASHDATA, new Object[] {"No dsig:SignedInfo provided"}, SignRequestHandler.this, "ok");
+//        }
       } else if (actionCommand.equals("sign")) {
+        retryCounter++;
         return new String(gui.getPin());
       } else if (actionCommand.equals("ok")) {
-        gui.showSignaturePINDialog(spec, SignRequestHandler.this, "sign", SignRequestHandler.this, "cancel", SignRequestHandler.this,
-          "hashData");
+        showSignaturePINDialog(spec, retries);
       }
     } while (true);
   }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+      throw new UnsupportedOperationException("Not supported yet.");
+    }
   }
 }
-- 
cgit v1.2.3


From aa099311111a1d53f999705762aceb4005ecc187 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 13 Oct 2008 13:59:06 +0000
Subject: config guiStyle simple/advanced, hashdatadisplay internal/external

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@107 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    | 11 ++++++++--
 .../at/gv/egiz/bku/online/applet/BKUWorker.java    | 25 +++++++++++++++-------
 .../online/applet/SignRequestHandlerFactory.java   | 21 ------------------
 BKUApplet/src/test/resources/appletTest.html       |  6 +++++-
 .../java/at/gv/egiz/bku/gui/BKUGUIFactory.java     | 13 ++++++++---
 .../at/gv/egiz/bku/local/stal/SMCCSTALFactory.java |  2 +-
 BKUOnline/src/main/webapp/appletPage.jsp           |  6 ++++--
 7 files changed, 46 insertions(+), 38 deletions(-)
 delete mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/SignRequestHandlerFactory.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 32c4feaa..96c0e7eb 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -42,13 +42,19 @@ import java.net.URL;
 public class BKUApplet extends JApplet {
 
     private static Log log = LogFactory.getLog(BKUApplet.class);
+    public static final String GUI_STYLE = "GuiStyle";
     public final static String RESOURCE_BUNDLE_BASE = "at/gv/egiz/bku/online/applet/Messages";
     public final static String LOCALE_PARAM_KEY = "Locale";
     public final static String LOGO_URL_KEY = "LogoURL";
     public final static String WSDL_URL = "WSDL_URL";
+    public static final String HASHDATA_DISPLAY = "HashDataDisplay";
     public final static String HASHDATA_URL = "HashDataURL";
     public final static String SESSION_ID = "SessionID";
-    public static final String BACKGROUND_PARAM = "background";
+    public static final String BACKGROUND_PARAM = "Background";
+    public static final String REDIRECT_URL = "RedirectURL";
+    public static final String REDIRECT_TARGET = "RedirectTarget";
+    
+    public static final String HASHDATA_DISPLAY_INTERNAL = "internal";
     
     protected ResourceBundle resourceBundle;
     protected BKUWorker worker;
@@ -78,7 +84,8 @@ public class BKUApplet extends JApplet {
             log.warn(ex.getMessage() + ", using default background");
           }
         }
-        BKUGUIFacade gui = BKUGUIFactory.createGUI();
+        String guiStyle = getMyAppletParameter(GUI_STYLE);
+        BKUGUIFacade gui = BKUGUIFactory.createGUI(guiStyle);
         gui.init(getContentPane(), localeString, background);
         worker = new BKUWorker(gui, this, resourceBundle);
     }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
index b11413d6..350925ce 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
@@ -55,7 +55,7 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
   protected BKUGUIFacade gui;
   protected BKUApplet parent;
   private STALPortType stalPort;
-  private URL hashDataURL;
+//  private URL hashDataURL;
   protected List<String> actionCommandList = new ArrayList<String>();
   protected Boolean actionPerformed = false;
   protected boolean finished = false;
@@ -140,7 +140,6 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
     gui.showWelcomeDialog();
     try {
       stalPort = getSTALPort();
-      hashDataURL = getHashDataURL();
     } catch (Exception e) {
       log.fatal("Failed to call STAL service.", e);
       actionCommandList.clear();
@@ -155,10 +154,10 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
       return;
     }
     
-    //TODO factory for SignRequestHandler providing either WebServiceHDISignRequestHandler or ExternalHDIDisplaySignRequestHandler
-    AppletContext ctx = parent.getAppletContext();
-    log.debug("register SignRequestHandler for HashDataURL " + hashDataURL);
-    addRequestHandler(at.gv.egiz.stal.SignRequest.class, new ExternalDisplaySignRequestHandler(ctx, hashDataURL));
+//    //TODO factory for SignRequestHandler providing either WebServiceHDISignRequestHandler or ExternalHDIDisplaySignRequestHandler
+//    AppletContext ctx = parent.getAppletContext();
+//    log.debug("register SignRequestHandler for HashDataURL " + hashDataURL);
+//    addRequestHandler(at.gv.egiz.stal.SignRequest.class, new ExternalDisplaySignRequestHandler(ctx, hashDataURL));
     
     try {
       String sessionId = parent.getMyAppletParameter(BKUApplet.SESSION_ID);
@@ -167,6 +166,16 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
         sessionId = "TestSession";
       }
       
+      String hashDataDisplayStyle = parent.getMyAppletParameter(BKUApplet.HASHDATA_DISPLAY);
+      if (BKUApplet.HASHDATA_DISPLAY_INTERNAL.equals(hashDataDisplayStyle)) {
+        log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
+        addRequestHandler(at.gv.egiz.stal.SignRequest.class, new WebServiceSignRequestHandler(sessionId, stalPort));
+      } else { //if (HASHDATADISPLAY_EXTERNAL.equals(displayStyle)) {
+        URL hashDataURL = getHashDataURL();
+        log.debug("register SignRequestHandler for HashDataURL " + hashDataURL);
+        addRequestHandler(at.gv.egiz.stal.SignRequest.class, new ExternalDisplaySignRequestHandler(parent.getAppletContext(), hashDataURL));
+      }
+      
 //      log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
 //      addRequestHandler(at.gv.egiz.stal.SignRequest.class, new WebServiceSignRequestHandler(sessionId, stalPort));
 
@@ -254,8 +263,8 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
 
   protected void sendRedirect() {
     log.info("Done, sending redirect to get BKU response");
-    String redirectURL = parent.getMyAppletParameter("redirectURL");
-    String redirectTarget = parent.getMyAppletParameter("redirectTarget");
+    String redirectURL = parent.getMyAppletParameter(BKUApplet.REDIRECT_URL);
+    String redirectTarget = parent.getMyAppletParameter(BKUApplet.REDIRECT_TARGET);
     log.info("Redirecting to: " + redirectURL + " target: " + redirectTarget);
     URL url = null;
     if (redirectURL != null) {
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/SignRequestHandlerFactory.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/SignRequestHandlerFactory.java
deleted file mode 100644
index 327ea8aa..00000000
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/SignRequestHandlerFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package at.gv.egiz.bku.online.applet;
-
-import at.gv.egiz.bku.smccstal.SignRequestHandler;
-
-/**
- *
- * @author clemens
- */
-public class SignRequestHandlerFactory {
-
-  static SignRequestHandler getInstance() {
-    //TODO return ExternalDisplaySignRequestHandler by default, WebServiceSignRequestHandler if requested
-    //TODO get configuration as param
-    return null;
-  }
-}
diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
index 5b10d6b5..b8a0770e 100644
--- a/BKUApplet/src/test/resources/appletTest.html
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -20,9 +20,13 @@
       <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=190 height=130>
+              <param name="GuiStyle" value="advanced"/>
+              <param name="Background" value="http://localhost:3495/DemoIntegration/mocca_background.png"/>
               <param name="WSDL_URL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/stal?wsdl"/>
+              <param name="HashDataDisplay" value="internal"/>
+              <!--param name="HashDataURL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/hashDataInput"/-->
               <param name="SessionId" value="TestSession"/>
-              <param name="redirectURL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/bkuResult"/>
+              <param name="RedirectURL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/bkuResult"/>
       </applet>
     </center>
   </body>
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
index 5124914a..4a338f23 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
@@ -17,16 +17,23 @@
 package at.gv.egiz.bku.gui;
 
 public class BKUGUIFactory {
+  
+  public static final String SIMPLE_GUI = "simple";
+  public static final String ADVANCED_GUI = "advanced";
+  
   private static BKUGUIFactory instance = new BKUGUIFactory();
 
   private BKUGUIFactory() {
   }
 
-  protected BKUGUIFacade createNewGUI() {
+  protected BKUGUIFacade createNewGUI(String style) {
+    if (ADVANCED_GUI.equals(style)) {
+      return new BKUGUI();
+    }
     return new SimpleGUI();
   }
 
-  public static BKUGUIFacade createGUI() {
-    return instance.createNewGUI();
+  public static BKUGUIFacade createGUI(String style) {
+    return instance.createNewGUI(style);
   }
 }
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
index 0bdff867..c5736648 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
@@ -50,7 +50,7 @@ public class SMCCSTALFactory implements STALFactory {
       resourceBundle = ResourceBundle.getBundle(BKUApplet.RESOURCE_BUNDLE_BASE);
     }
     dialog = new JDialog();
-    BKUGUIFacade gui = BKUGUIFactory.createGUI();
+    BKUGUIFacade gui = BKUGUIFactory.createGUI(BKUGUIFactory.ADVANCED_GUI);
     gui.init(dialog.getContentPane(), locale.toString(), null);
     stal = new SMCCSTAL(new BKUGuiProxy(dialog, gui), dialog, resourceBundle);
     dialog.setPreferredSize(new Dimension(400, 200));
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp
index 903c762d..950141c4 100644
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ b/BKUOnline/src/main/webapp/appletPage.jsp
@@ -51,11 +51,13 @@
 			height :<%=height%>
 		};
 		var parameters = {
-			background : '<%=backgroundImg%>',
+                        GuiStyle : 'simple',
+			Background : '<%=backgroundImg%>',
 			WSDL_URL :'../stal?wsdl',
+                        HashDataDisplay : 'external',
                         HashDataURL : '../hashDataInput',
 			SessionID : '<%=session.getId()%>',
-			redirectURL : '../bkuResult'
+			RedirectURL : '../bkuResult'
 		};
 		var version = '1.6.0_02';
 		deployJava.runApplet(attributes, parameters, version);
-- 
cgit v1.2.3


From de95f8219adf98710992b6716778b174bc2d2fcc Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 13 Oct 2008 16:43:46 +0000
Subject: BKUGUI / SimpleGUI aligned

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@109 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/src/test/resources/appletTest.html       |   2 +-
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 112 +++------------------
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    | 104 +++----------------
 3 files changed, 26 insertions(+), 192 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
index b8a0770e..472000de 100644
--- a/BKUApplet/src/test/resources/appletTest.html
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -20,7 +20,7 @@
       <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=190 height=130>
-              <param name="GuiStyle" value="advanced"/>
+              <param name="GuiStyle" value="simple"/>
               <param name="Background" value="http://localhost:3495/DemoIntegration/mocca_background.png"/>
               <param name="WSDL_URL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/stal?wsdl"/>
               <param name="HashDataDisplay" value="internal"/>
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 53ec1088..64cd9f50 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
@@ -67,7 +67,7 @@ public class BKUGUI implements BKUGUIFacade {
     
     private static final Log log = LogFactory.getLog(BKUGUI.class);
     public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
-    public static final String LOGO_RESOURCE = "/images/logo.png";
+    public static final String DEFAULT_BACKGROUND = "/images/mocca_default.png"; //logo.png";
     public static final String HASHDATA_FONT = "Monospaced";
     public static final Color ERROR_COLOR = Color.RED;
     public static final Color HYPERLINK_COLOR = Color.BLUE;
@@ -192,11 +192,19 @@ public class BKUGUI implements BKUGUIFacade {
 
     protected void initContentPanel(URL background) {
 
-        contentPanel = new JPanel();
+      if (background == null) {
+        background = this.getClass().getResource(DEFAULT_BACKGROUND);
+      }
+      contentPanel = new ImagePanel(background);
 
+//        contentPanel.setBorder(new TitledBorder("content"));
+        
 //        headerPanel = new JPanel();
-        mainPanel = new JPanel();
-        buttonPanel = new JPanel();
+//        headerPanel.setOpaque(false);
+//        mainPanel = new JPanel();
+//        mainPanel.setOpaque(false);
+//        buttonPanel = new JPanel(); 
+//        buttonPanel.setOpaque(false);
 
 //        headerPanel.setBorder(new TitledBorder("header"));
 //        mainPanel.setBorder(new TitledBorder("main"));
@@ -389,16 +397,12 @@ public class BKUGUI implements BKUGUIFacade {
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
-//                buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
                 buttonPanelLayout.setHorizontalGroup(
                   buttonPanelLayout.createSequentialGroup()
-//                  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));
                 buttonPanelLayout.setVerticalGroup(
                   buttonPanelLayout.createSequentialGroup()
-//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                     .addComponent(cancelButton));
 
                 contentPanel.validate();
@@ -452,16 +456,12 @@ public class BKUGUI implements BKUGUIFacade {
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
-//                buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
                 buttonPanelLayout.setHorizontalGroup(
                   buttonPanelLayout.createSequentialGroup()
-//                  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));
                 buttonPanelLayout.setVerticalGroup(
                   buttonPanelLayout.createSequentialGroup()
-//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                     .addComponent(cancelButton));
                 
                 contentPanel.validate();
@@ -522,8 +522,8 @@ public class BKUGUI implements BKUGUIFacade {
                 });
 
                 JLabel infoLabel = new JLabel();
+                infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 if (numRetries < 0) {
-                    infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                     String pinsizePattern = messages.getString(LABEL_PINSIZE);
                     String pinSize = String.valueOf(pinSpec.getMinLength());
                     if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
@@ -593,7 +593,6 @@ public class BKUGUI implements BKUGUIFacade {
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
-//                buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
                 buttonPanelLayout.setHorizontalGroup(
                   buttonPanelLayout.createSequentialGroup()
                         .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -738,7 +737,6 @@ public class BKUGUI implements BKUGUIFacade {
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
-//                buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
                 buttonPanelLayout.setHorizontalGroup(
                   buttonPanelLayout.createSequentialGroup()
                         .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -844,16 +842,12 @@ public class BKUGUI implements BKUGUIFacade {
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
-//                buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
                 buttonPanelLayout.setHorizontalGroup(
                   buttonPanelLayout.createSequentialGroup()
-//                  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));
                 buttonPanelLayout.setVerticalGroup(
                   buttonPanelLayout.createSequentialGroup()
-//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                     .addComponent(okButton));
 
                 contentPanel.validate();
@@ -1068,7 +1062,6 @@ public class BKUGUI implements BKUGUIFacade {
           GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
           buttonPanel.setLayout(buttonPanelLayout);
 
-  //        buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
           buttonPanelLayout.setHorizontalGroup(
             buttonPanelLayout.createSequentialGroup()
                   .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -1211,7 +1204,6 @@ public class BKUGUI implements BKUGUIFacade {
           GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
           buttonPanel.setLayout(buttonPanelLayout);
 
-  //        buttonPanelLayout.linkSize(cancelButton, okButton, signButton, backButton, saveButton);        
           buttonPanelLayout.setHorizontalGroup(
             buttonPanelLayout.createSequentialGroup()
                   .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -1343,82 +1335,4 @@ public class BKUGUI implements BKUGUIFacade {
           }
       }
     }
-    
-//    private String parseToken(final char[] terminators) {
-//        char ch;
-//        i1 = pos;
-//        i2 = pos;
-//        while (hasChar()) {
-//            ch = chars[pos];
-//            if (isOneOf(ch, terminators)) {
-//                break;
-//            }
-//            i2++;
-//            pos++;
-//        }
-//        return getToken(false);
-//    }
-    
-//     private static String getCharset(String contentType) {
-//       
-//       StringTokenizer t = new StringTokenizer
-//       
-//       if (contentType == null) {
-//         return "UTF-8";
-//       }
-//       
-//       int pos = 0;
-//       int len = contentType.length();
-//       
-//       while (pos < len) {
-//         pos++;
-//         String paramName = parseToken(new char[] {
-//                    '=', separator });
-//       }
-//       
-//        HashMap params = new HashMap();
-//        this.chars = chars;
-//        this.pos = offset;
-//        this.len = length;
-//
-//        String paramName = null;
-//        String paramValue = null;
-//        while (hasChar()) {
-//            paramName = parseToken(new char[] {
-//                    '=', separator });
-//            paramValue = null;
-//            if (hasChar() && (chars[pos] == '=')) {
-//                pos++; // skip '='
-//                paramValue = parseQuotedToken(new char[] {
-//                        separator });
-//            }
-//            if (hasChar() && (chars[pos] == separator)) {
-//                pos++; // skip separator
-//            }
-//            if ((paramName != null) && (paramName.length() > 0)) {
-//                if (this.lowerCaseNames) {
-//                    paramName = paramName.toLowerCase();
-//                }
-//                params.put(paramName, paramValue);
-//            }
-//        }
-//        return params;
-//       
-//       
-//       
-//       Parser
-//      ParameterParser pf = new ParameterParser();
-//    pf.setLowerCaseNames(true);
-//    Map map = pf.parse(contentType, SEPERATOR);
-//    String retVal = (String) map.get(CHAR_SET);
-//    if ((retVal == null) && (replaceNullWithDefault)) {
-//      if (map.containsKey(APPLICATION_URL_ENCODED)) {
-//        // default charset for url encoded data
-//        return "UTF-8";
-//      }
-//      retVal = getDefaultCharset();
-//    }
-//    return retVal;
-//  }
-    
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index 8e32d67e..e323d195 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -54,7 +54,6 @@ import javax.swing.JTable;
 import javax.swing.JTextArea;
 import javax.swing.LayoutStyle;
 import javax.swing.SwingUtilities;
-import javax.swing.border.TitledBorder;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
 import org.apache.commons.logging.Log;
@@ -196,14 +195,15 @@ public class SimpleGUI implements BKUGUIFacade {
       if (background == null) {
         background = this.getClass().getResource(DEFAULT_BACKGROUND);
       }
-        contentPanel = new ImagePanel(background);
+      contentPanel = new ImagePanel(background);
 
 //        contentPanel.setBorder(new TitledBorder("content"));
         
 //        headerPanel = new JPanel();
+//        headerPanel.setOpaque(false);
         mainPanel = new JPanel();
         mainPanel.setOpaque(false);
-        buttonPanel = new JPanel(); // new ImagePanel(LOGO_RESOURCE); //new JPanel();
+        buttonPanel = new JPanel(); 
         buttonPanel.setOpaque(false);
 
 //        headerPanel.setBorder(new TitledBorder("header"));
@@ -570,13 +570,12 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
-                    .addGroup(mainPanelLayout.createSequentialGroup()
-                        .addComponent(cardPinLabel, 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.createSequentialGroup()
+                    .addComponent(cardPinLabel, 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()
@@ -589,7 +588,6 @@ public class SimpleGUI implements BKUGUIFacade {
                         .addComponent(infoLabel));
 //                        .addGap(signPinLabel.getFont().getSize())); 
 
-                
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
@@ -731,9 +729,9 @@ public class SimpleGUI implements BKUGUIFacade {
                       .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));
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
+                            .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                            .addComponent(infoLabel))));
 
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
@@ -1384,82 +1382,4 @@ public class SimpleGUI implements BKUGUIFacade {
           }
       }
     }
-    
-//    private String parseToken(final char[] terminators) {
-//        char ch;
-//        i1 = pos;
-//        i2 = pos;
-//        while (hasChar()) {
-//            ch = chars[pos];
-//            if (isOneOf(ch, terminators)) {
-//                break;
-//            }
-//            i2++;
-//            pos++;
-//        }
-//        return getToken(false);
-//    }
-    
-//     private static String getCharset(String contentType) {
-//       
-//       StringTokenizer t = new StringTokenizer
-//       
-//       if (contentType == null) {
-//         return "UTF-8";
-//       }
-//       
-//       int pos = 0;
-//       int len = contentType.length();
-//       
-//       while (pos < len) {
-//         pos++;
-//         String paramName = parseToken(new char[] {
-//                    '=', separator });
-//       }
-//       
-//        HashMap params = new HashMap();
-//        this.chars = chars;
-//        this.pos = offset;
-//        this.len = length;
-//
-//        String paramName = null;
-//        String paramValue = null;
-//        while (hasChar()) {
-//            paramName = parseToken(new char[] {
-//                    '=', separator });
-//            paramValue = null;
-//            if (hasChar() && (chars[pos] == '=')) {
-//                pos++; // skip '='
-//                paramValue = parseQuotedToken(new char[] {
-//                        separator });
-//            }
-//            if (hasChar() && (chars[pos] == separator)) {
-//                pos++; // skip separator
-//            }
-//            if ((paramName != null) && (paramName.length() > 0)) {
-//                if (this.lowerCaseNames) {
-//                    paramName = paramName.toLowerCase();
-//                }
-//                params.put(paramName, paramValue);
-//            }
-//        }
-//        return params;
-//       
-//       
-//       
-//       Parser
-//      ParameterParser pf = new ParameterParser();
-//    pf.setLowerCaseNames(true);
-//    Map map = pf.parse(contentType, SEPERATOR);
-//    String retVal = (String) map.get(CHAR_SET);
-//    if ((retVal == null) && (replaceNullWithDefault)) {
-//      if (map.containsKey(APPLICATION_URL_ENCODED)) {
-//        // default charset for url encoded data
-//        return "UTF-8";
-//      }
-//      retVal = getDefaultCharset();
-//    }
-//    return retVal;
-//  }
-    
 }
-- 
cgit v1.2.3


From 43cb317a0eb230205e3c8ba58ae7ce67f9fc5613 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 13 Oct 2008 16:45:33 +0000
Subject: BKUGUI / SimpleGUI aligned

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@110 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'BKUCommonGUI')

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 64cd9f50..4988ff39 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
@@ -106,7 +106,7 @@ public class BKUGUI implements BKUGUIFacade {
 //    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  */
@@ -199,12 +199,12 @@ public class BKUGUI implements BKUGUIFacade {
 
 //        contentPanel.setBorder(new TitledBorder("content"));
         
-//        headerPanel = new JPanel();
-//        headerPanel.setOpaque(false);
-//        mainPanel = new JPanel();
-//        mainPanel.setOpaque(false);
-//        buttonPanel = new JPanel(); 
-//        buttonPanel.setOpaque(false);
+        headerPanel = new JPanel();
+        headerPanel.setOpaque(false);
+        mainPanel = new JPanel();
+        mainPanel.setOpaque(false);
+        buttonPanel = new JPanel(); 
+        buttonPanel.setOpaque(false);
 
 //        headerPanel.setBorder(new TitledBorder("header"));
 //        mainPanel.setBorder(new TitledBorder("main"));
-- 
cgit v1.2.3


From 07e77c763ae69e690e9b714586dc45ccccc0e4da Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 13 Oct 2008 16:46:34 +0000
Subject: BKUGUI / SimpleGUI aligned

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@111 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'BKUCommonGUI')

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 4988ff39..42f9e518 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
@@ -106,7 +106,7 @@ public class BKUGUI implements BKUGUIFacade {
 //    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  */
@@ -199,8 +199,8 @@ public class BKUGUI implements BKUGUIFacade {
 
 //        contentPanel.setBorder(new TitledBorder("content"));
         
-        headerPanel = new JPanel();
-        headerPanel.setOpaque(false);
+//        headerPanel = new JPanel();
+//        headerPanel.setOpaque(false);
         mainPanel = new JPanel();
         mainPanel.setOpaque(false);
         buttonPanel = new JPanel(); 
-- 
cgit v1.2.3


From e19102048016591ba161453b43a3a47f3d4f180c Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 13 Oct 2008 17:31:43 +0000
Subject: GUI cleanup, BKUGUI HeaderPanel

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@112 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 257 ++++-----------------
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    | 183 +--------------
 2 files changed, 47 insertions(+), 393 deletions(-)

(limited to 'BKUCommonGUI')

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 42f9e518..9cba293a 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
@@ -106,19 +106,14 @@ public class BKUGUI implements BKUGUIFacade {
 //    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;
 
-//    protected JButton okButton;
-//    protected JButton cancelButton;
-//    protected JButton signButton;
-//    protected JButton saveButton;
-//    protected JButton backButton;
     protected int buttonSize;
     
     private static final int CHECKBOX_WIDTH = new JCheckBox().getPreferredSize().width;
@@ -199,8 +194,8 @@ public class BKUGUI implements BKUGUIFacade {
 
 //        contentPanel.setBorder(new TitledBorder("content"));
         
-//        headerPanel = new JPanel();
-//        headerPanel.setOpaque(false);
+        headerPanel = new JPanel();
+        headerPanel.setOpaque(false);
         mainPanel = new JPanel();
         mainPanel.setOpaque(false);
         buttonPanel = new JPanel(); 
@@ -210,9 +205,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 = 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));
@@ -241,38 +236,35 @@ public class BKUGUI implements BKUGUIFacade {
 //            buttonSize = saveButton.getPreferredSize().width;
 
         
-//        GroupLayout headerPanelLayout = new GroupLayout(headerPanel);
-//        headerPanel.setLayout(headerPanelLayout);
+        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));
+        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));
 
 
         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.createSequentialGroup()
             .addContainerGap()
             .addGroup(
               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))
             .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,7 +286,7 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-//                titleLabel.setText(messages.getString(TITLE_ERROR));
+                titleLabel.setText(messages.getString(TITLE_ERROR));
 
                 JLabel waitMsgLabel = new JLabel();
                 waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -306,7 +298,6 @@ public class BKUGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(waitMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -332,22 +323,20 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-//                titleLabel.setText(messages.getString(TITLE_WELCOME));
+                titleLabel.setText(messages.getString(TITLE_WELCOME));
 
                 JLabel welcomeMsgLabel = new JLabel();
                 welcomeMsgLabel.setFont(welcomeMsgLabel.getFont().deriveFont(welcomeMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                welcomeMsgLabel.setText(messages.getString(TITLE_WELCOME)); //MESSAGE_WAIT));
+                welcomeMsgLabel.setText(messages.getString(MESSAGE_WAIT));
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(welcomeMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(welcomeMsgLabel));
 
                 contentPanel.validate();
@@ -371,7 +360,7 @@ 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));
@@ -382,11 +371,9 @@ public class BKUGUI implements BKUGUIFacade {
 
                 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();
@@ -430,22 +417,20 @@ public class BKUGUI implements BKUGUIFacade {
               mainPanel.removeAll();
               buttonPanel.removeAll();
 
-//                titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
+                titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
 
                 JLabel insertCardMsgLabel = new JLabel();
                 insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                insertCardMsgLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED)); //MESSAGE_INSERTCARD));
+                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();
@@ -483,12 +468,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));
@@ -506,7 +491,6 @@ public class BKUGUI implements BKUGUIFacade {
                 String pinLabel = messages.getString(LABEL_PIN);
                 cardPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
 
-//                JPasswordField cardPINField = new JPasswordField();
                 pinField = new JPasswordField();
                 pinField.setText("");
                 pinField.setDocument(new PINDocument(pinSpec, okButton));
@@ -534,36 +518,6 @@ public class BKUGUI implements BKUGUIFacade {
                     infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
                     infoLabel.setForeground(ERROR_COLOR);
                 }
-
-//                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-//                mainPanel.setLayout(mainPanelLayout);
-//
-//                mainPanelLayout.setHorizontalGroup(
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//                  .addGroup(mainPanelLayout.createSequentialGroup() //                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//                  //                  .addComponent(hashDataLabel)
-//                  //                  .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
-//                  .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) //RELATED)
-//                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) //TRAILING)
-//                  .addComponent(infoLabel) //, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)
-//                  .addComponent(pinField, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)) //))
-//                  .addContainerGap()));
-//
-//                mainPanelLayout.setVerticalGroup(
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addContainerGap() //                  .addComponent(hashDataLabel).addGap(14, 14, 14)
-//                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) //, false)
-//                  .addComponent(cardPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
-//                  .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
-//                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(infoLabel).addGap(cardPinLabel.getFont().getSize()))); //10, 10, 10)));
-//
-//                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-//                buttonPanel.setLayout(buttonPanelLayout);
-//
-//                buttonPanelLayout.setHorizontalGroup(
-//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(okButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
-//                buttonPanelLayout.setVerticalGroup(
-//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(okButton).addComponent(cancelButton)));
-
                 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
@@ -588,7 +542,6 @@ public class BKUGUI implements BKUGUIFacade {
                             .addComponent(pinField))
                         .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(infoLabel));
-//                        .addGap(signPinLabel.getFont().getSize())); 
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
@@ -645,11 +598,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));
@@ -732,7 +685,6 @@ public class BKUGUI implements BKUGUIFacade {
                             .addComponent(pinField))
                         .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(infoLabel));
-//                        .addGap(signPinLabel.getFont().getSize())); 
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
@@ -751,49 +703,7 @@ public class BKUGUI implements BKUGUIFacade {
                 pinField.requestFocusInWindow();
                 contentPanel.validate();
 
-            }//            private ParallelGroup createMainGroup(GroupLayout mainPanelLayout, JLabel hashDataLabel, JLabel signPinLabel, JLabel pinSizeLabel, JLabel errorLabel) {
-//                ParallelGroup mainGroup = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
-//                mainGroup.addComponent(hashDataLabel);
-//                if (errorLabel != null) {
-//                    mainGroup.addComponent(errorLabel);
-//                }
-//                mainGroup.addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
-//                                                                    .addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE)
-//                                                                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-//                                                                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
-//                                                                                                .addComponent(pinSizeLabel)
-//                                                                                                .addComponent(pinField, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)));
-//                return mainGroup;
-//            }
-//            private GroupLayout.SequentialGroup createVerticalMainGroup(GroupLayout mainPanelLayout, JLabel hashDataLabel, JLabel signPinLabel, JLabel pinSizeLabel, JLabel errorLabel) {
-//                GroupLayout.SequentialGroup mainGroup = mainPanelLayout.createSequentialGroup();
-//                mainGroup.addComponent(hashDataLabel)
-//                    .addGap(hashDataLabel.getFont().getSize()); //14, 14, 14)
-//                    
-//                if (errorLabel != null) {
-//                    mainGroup.addComponent(errorLabel)
-//                      .addGap(errorLabel.getFont().getSize());
-//                }
-//                mainGroup.addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE, false)
-//                        .addComponent(signPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
-//                        .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
-//                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-//                    .addComponent(pinSizeLabel)
-//                    .addGap(signPinLabel.getFont().getSize());
-//                
-//                return mainGroup;
-////                mainPanelLayout.createSequentialGroup()
-////                    .addComponent(hashDataLabel)
-////                    .addGap(hashDataLabel.getFont().getSize()) //14, 14, 14)
-////                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE, false)
-////                        .addComponent(signPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
-////                        .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
-////                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-////                    .addComponent(pinSizeLabel)
-////                    .addGap(signPinLabel.getFont().getSize())
-////                    
-////                    
-//            }
+            }
         });
     }
 
@@ -812,7 +722,7 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-//                titleLabel.setText(messages.getString(TITLE_ERROR));
+                titleLabel.setText(messages.getString(TITLE_ERROR));
 
                 String errorMsgPattern = messages.getString(errorMsgKey);
                 String errorMsg = MessageFormat.format(errorMsgPattern, errorMsgParams);
@@ -827,11 +737,9 @@ public class BKUGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(errorMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(errorMsgLabel));
 
                 JButton okButton = new JButton();
@@ -870,7 +778,7 @@ public class BKUGUI implements BKUGUIFacade {
           mainPanel.removeAll();
           buttonPanel.removeAll();
 
-//          titleLabel.setText(messages.getString(TITLE_ERROR));
+          titleLabel.setText(messages.getString(TITLE_ERROR));
 
           String errorMsgPattern = messages.getString(errorMsgKey);
           String errorMsg = MessageFormat.format(errorMsgPattern, errorMsgParams);
@@ -885,11 +793,9 @@ public class BKUGUI implements BKUGUIFacade {
 
           mainPanelLayout.setHorizontalGroup(
             mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
             .addComponent(errorMsgLabel));
           mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createSequentialGroup()
-//            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
             .addComponent(errorMsgLabel));
 
           contentPanel.validate();
@@ -927,11 +833,9 @@ public class BKUGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(waitMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(waitMsgLabel));
 
                 contentPanel.validate();
@@ -956,8 +860,6 @@ public class BKUGUI implements BKUGUIFacade {
       
       if (signedReferences.size() == 1) {
 
-//          final HashDataInput signedRef = signedReferences.get(0);
-          
           if ("text/plain".equals(signedReferences.get(0).getMimeType())) {
             
             ActionListener saveHashDataListener = new ActionListener() {
@@ -1008,7 +910,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));
@@ -1040,15 +942,6 @@ public class BKUGUI implements BKUGUIFacade {
                   .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                   .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
 
-  //        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-  //        mainPanel.setLayout(mainPanelLayout);
-  //
-  //        mainPanelLayout.setHorizontalGroup(
-  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(refIdLabel).addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)).addContainerGap()));
-  //
-  //        mainPanelLayout.setVerticalGroup(
-  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addComponent(refIdLabel).addGap(refIdLabel.getFont().getSize()).addComponent(hashDataScrollPane).addGap(refIdLabel.getFont().getSize())));
-
           JButton backButton = new JButton();
           backButton.setText(messages.getString(BUTTON_BACK));
           backButton.setActionCommand(cancelCommand);
@@ -1073,15 +966,6 @@ public class BKUGUI implements BKUGUIFacade {
                   .addComponent(saveButton)
                   .addComponent(backButton)); 
 
-
-  //        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-  //        buttonPanel.setLayout(buttonPanelLayout);
-  //
-  //        buttonPanelLayout.setHorizontalGroup(
-  //          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(saveButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
-  //        buttonPanelLayout.setVerticalGroup(
-  //          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(cancelButton)));
-
           contentPanel.validate();
         }
       });
@@ -1101,7 +985,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));
@@ -1135,61 +1019,6 @@ public class BKUGUI implements BKUGUIFacade {
                   .addComponent(refIdLabel)
                   .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                   .addComponent(hashDataScrollPane, 0, 0, hashDataTable.getPreferredSize().height+3));
-  //                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED));
-
-
-
-  //        
-  //        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-  //        mainPanel.setLayout(mainPanelLayout);
-  //
-  //        mainPanelLayout.setHorizontalGroup(
-  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-  //            .addGroup(mainPanelLayout.createSequentialGroup()
-  //                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-  //                    .addComponent(refIdLabel)
-  //                    .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE))
-  //                    .addContainerGap()));
-  //
-  //        mainPanelLayout.setVerticalGroup(
-  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-  //          .addGroup(mainPanelLayout.createSequentialGroup()
-  //            .addComponent(refIdLabel)
-  //            .addGap(refIdLabel.getFont().getSize())
-  //            .addComponent(hashDataScrollPane)
-  //            .addGap(refIdLabel.getFont().getSize())));
-
-
-
-
-
-
-
-
-
-
-
-
-  //        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-  //        buttonPanel.setLayout(buttonPanelLayout);
-  //
-  //        buttonPanelLayout.setHorizontalGroup(
-  //          buttonPanelLayout.createSequentialGroup()
-  ////          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-  ////            .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
-  //                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-  //                .addComponent(saveButton)
-  //                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-  //                .addComponent(cancelButton)
-  //                .addContainerGap()); //);
-  //        buttonPanelLayout.setVerticalGroup(
-  //          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-  //          .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
-  //            .addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-  //                .addComponent(saveButton)
-  //                .addComponent(cancelButton))
-  //            .addContainerGap()));
-
 
           JButton backButton = new JButton();
           backButton.setText(messages.getString(BUTTON_BACK));
@@ -1220,8 +1049,6 @@ public class BKUGUI implements BKUGUIFacade {
       });
     }
 
-//    private DisposableFileChooser fileDialog;
-    
     private void showSaveHashDataInputDialog(final List<HashDataInput> signedRefs, final ActionListener okListener, final String okCommand) {
       
       log.debug("scheduling save hashdatainput dialog");
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index e323d195..3d47e1cd 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -114,11 +114,6 @@ public class SimpleGUI implements BKUGUIFacade {
     /** remember the pinfield to return to worker */
     protected JPasswordField pinField;
 
-//    protected JButton okButton;
-//    protected JButton cancelButton;
-//    protected JButton signButton;
-//    protected JButton saveButton;
-//    protected JButton backButton;
     protected int buttonSize;
     
     private static final int CHECKBOX_WIDTH = new JCheckBox().getPreferredSize().width;
@@ -255,16 +250,13 @@ public class SimpleGUI implements BKUGUIFacade {
 
         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.createSequentialGroup()
             .addContainerGap()
             .addGroup(
               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))
             .addContainerGap());
@@ -306,7 +298,6 @@ public class SimpleGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(waitMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -336,18 +327,16 @@ public class SimpleGUI implements BKUGUIFacade {
 
                 JLabel welcomeMsgLabel = new JLabel();
                 welcomeMsgLabel.setFont(welcomeMsgLabel.getFont().deriveFont(welcomeMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                welcomeMsgLabel.setText(messages.getString(TITLE_WELCOME)); //MESSAGE_WAIT));
+                welcomeMsgLabel.setText(messages.getString(TITLE_WELCOME)); 
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(welcomeMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(welcomeMsgLabel));
 
                 contentPanel.validate();
@@ -382,11 +371,9 @@ public class SimpleGUI implements BKUGUIFacade {
 
                 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();
@@ -434,18 +421,16 @@ public class SimpleGUI implements BKUGUIFacade {
 
                 JLabel insertCardMsgLabel = new JLabel();
                 insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                insertCardMsgLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED)); //MESSAGE_INSERTCARD));
+                insertCardMsgLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED)); 
 
                 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();
@@ -507,7 +492,6 @@ public class SimpleGUI implements BKUGUIFacade {
                 String pinLabel = messages.getString(LABEL_PIN);
                 cardPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
 
-//                JPasswordField cardPINField = new JPasswordField();
                 pinField = new JPasswordField();
                 pinField.setText("");
                 pinField.setDocument(new PINDocument(pinSpec, okButton));
@@ -535,36 +519,6 @@ public class SimpleGUI implements BKUGUIFacade {
                     infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
                     infoLabel.setForeground(ERROR_COLOR);
                 }
-
-//                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-//                mainPanel.setLayout(mainPanelLayout);
-//
-//                mainPanelLayout.setHorizontalGroup(
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//                  .addGroup(mainPanelLayout.createSequentialGroup() //                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//                  //                  .addComponent(hashDataLabel)
-//                  //                  .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
-//                  .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) //RELATED)
-//                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) //TRAILING)
-//                  .addComponent(infoLabel) //, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)
-//                  .addComponent(pinField, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)) //))
-//                  .addContainerGap()));
-//
-//                mainPanelLayout.setVerticalGroup(
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addContainerGap() //                  .addComponent(hashDataLabel).addGap(14, 14, 14)
-//                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) //, false)
-//                  .addComponent(cardPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
-//                  .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
-//                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(infoLabel).addGap(cardPinLabel.getFont().getSize()))); //10, 10, 10)));
-//
-//                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-//                buttonPanel.setLayout(buttonPanelLayout);
-//
-//                buttonPanelLayout.setHorizontalGroup(
-//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(okButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
-//                buttonPanelLayout.setVerticalGroup(
-//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(okButton).addComponent(cancelButton)));
-
                 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
@@ -586,7 +540,6 @@ public class SimpleGUI implements BKUGUIFacade {
                             .addComponent(pinField))
                         .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(infoLabel));
-//                        .addGap(signPinLabel.getFont().getSize())); 
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
@@ -742,7 +695,6 @@ public class SimpleGUI implements BKUGUIFacade {
                             .addComponent(pinField))
                         .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(infoLabel));
-//                        .addGap(signPinLabel.getFont().getSize())); 
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
@@ -772,49 +724,7 @@ public class SimpleGUI implements BKUGUIFacade {
                 pinField.requestFocusInWindow();
                 contentPanel.validate();
 
-            }//            private ParallelGroup createMainGroup(GroupLayout mainPanelLayout, JLabel hashDataLabel, JLabel signPinLabel, JLabel pinSizeLabel, JLabel errorLabel) {
-//                ParallelGroup mainGroup = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
-//                mainGroup.addComponent(hashDataLabel);
-//                if (errorLabel != null) {
-//                    mainGroup.addComponent(errorLabel);
-//                }
-//                mainGroup.addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
-//                                                                    .addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE)
-//                                                                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-//                                                                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
-//                                                                                                .addComponent(pinSizeLabel)
-//                                                                                                .addComponent(pinField, GroupLayout.DEFAULT_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)));
-//                return mainGroup;
-//            }
-//            private GroupLayout.SequentialGroup createVerticalMainGroup(GroupLayout mainPanelLayout, JLabel hashDataLabel, JLabel signPinLabel, JLabel pinSizeLabel, JLabel errorLabel) {
-//                GroupLayout.SequentialGroup mainGroup = mainPanelLayout.createSequentialGroup();
-//                mainGroup.addComponent(hashDataLabel)
-//                    .addGap(hashDataLabel.getFont().getSize()); //14, 14, 14)
-//                    
-//                if (errorLabel != null) {
-//                    mainGroup.addComponent(errorLabel)
-//                      .addGap(errorLabel.getFont().getSize());
-//                }
-//                mainGroup.addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE, false)
-//                        .addComponent(signPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
-//                        .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
-//                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-//                    .addComponent(pinSizeLabel)
-//                    .addGap(signPinLabel.getFont().getSize());
-//                
-//                return mainGroup;
-////                mainPanelLayout.createSequentialGroup()
-////                    .addComponent(hashDataLabel)
-////                    .addGap(hashDataLabel.getFont().getSize()) //14, 14, 14)
-////                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE, false)
-////                        .addComponent(signPinLabel) //, GroupLayout.PREFERRED_SIZE, 17, GroupLayout.PREFERRED_SIZE)
-////                        .addComponent(pinField)) //, GroupLayout.PREFERRED_SIZE, 19, GroupLayout.PREFERRED_SIZE))
-////                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-////                    .addComponent(pinSizeLabel)
-////                    .addGap(signPinLabel.getFont().getSize())
-////                    
-////                    
-//            }
+            }
         });
     }
 
@@ -848,11 +758,9 @@ public class SimpleGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(errorMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(errorMsgLabel));
 
                 JButton okButton = new JButton();
@@ -907,11 +815,9 @@ public class SimpleGUI implements BKUGUIFacade {
 
           mainPanelLayout.setHorizontalGroup(
             mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
             .addComponent(errorMsgLabel));
           mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createSequentialGroup()
-//            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
             .addComponent(errorMsgLabel));
 
           contentPanel.validate();
@@ -949,11 +855,9 @@ public class SimpleGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(waitMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                   .addComponent(waitMsgLabel));
 
                 contentPanel.validate();
@@ -978,8 +882,6 @@ public class SimpleGUI implements BKUGUIFacade {
       
       if (signedReferences.size() == 1) {
 
-//          final HashDataInput signedRef = signedReferences.get(0);
-          
           if ("text/plain".equals(signedReferences.get(0).getMimeType())) {
             
             ActionListener saveHashDataListener = new ActionListener() {
@@ -1062,15 +964,6 @@ public class SimpleGUI implements BKUGUIFacade {
                   .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                   .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
 
-  //        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-  //        mainPanel.setLayout(mainPanelLayout);
-  //
-  //        mainPanelLayout.setHorizontalGroup(
-  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(refIdLabel).addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE)).addContainerGap()));
-  //
-  //        mainPanelLayout.setVerticalGroup(
-  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(mainPanelLayout.createSequentialGroup().addComponent(refIdLabel).addGap(refIdLabel.getFont().getSize()).addComponent(hashDataScrollPane).addGap(refIdLabel.getFont().getSize())));
-
           JButton backButton = new JButton();
           backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle() & ~java.awt.Font.BOLD));
           backButton.setText(messages.getString(BUTTON_BACK));
@@ -1107,15 +1000,6 @@ public class SimpleGUI implements BKUGUIFacade {
 //                  .addComponent(saveButton)
 //                  .addComponent(backButton)); 
 
-
-  //        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-  //        buttonPanel.setLayout(buttonPanelLayout);
-  //
-  //        buttonPanelLayout.setHorizontalGroup(
-  //          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup().addContainerGap(15, Short.MAX_VALUE).addComponent(saveButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(cancelButton).addContainerGap()));
-  //        buttonPanelLayout.setVerticalGroup(
-  //          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(cancelButton)));
-
           contentPanel.validate();
         }
       });
@@ -1169,61 +1053,6 @@ public class SimpleGUI implements BKUGUIFacade {
                   .addComponent(refIdLabel)
                   .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                   .addComponent(hashDataScrollPane, 0, 0, hashDataTable.getPreferredSize().height+3));
-  //                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED));
-
-
-
-  //        
-  //        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-  //        mainPanel.setLayout(mainPanelLayout);
-  //
-  //        mainPanelLayout.setHorizontalGroup(
-  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-  //            .addGroup(mainPanelLayout.createSequentialGroup()
-  //                .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-  //                    .addComponent(refIdLabel)
-  //                    .addComponent(hashDataScrollPane, GroupLayout.PREFERRED_SIZE, PREF_SIZE_PINFIELD, Short.MAX_VALUE))
-  //                    .addContainerGap()));
-  //
-  //        mainPanelLayout.setVerticalGroup(
-  //          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-  //          .addGroup(mainPanelLayout.createSequentialGroup()
-  //            .addComponent(refIdLabel)
-  //            .addGap(refIdLabel.getFont().getSize())
-  //            .addComponent(hashDataScrollPane)
-  //            .addGap(refIdLabel.getFont().getSize())));
-
-
-
-
-
-
-
-
-
-
-
-
-  //        GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-  //        buttonPanel.setLayout(buttonPanelLayout);
-  //
-  //        buttonPanelLayout.setHorizontalGroup(
-  //          buttonPanelLayout.createSequentialGroup()
-  ////          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-  ////            .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
-  //                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-  //                .addComponent(saveButton)
-  //                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-  //                .addComponent(cancelButton)
-  //                .addContainerGap()); //);
-  //        buttonPanelLayout.setVerticalGroup(
-  //          buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-  //          .addGroup(GroupLayout.Alignment.TRAILING, buttonPanelLayout.createSequentialGroup()
-  //            .addGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-  //                .addComponent(saveButton)
-  //                .addComponent(cancelButton))
-  //            .addContainerGap()));
-
 
           JButton backButton = new JButton();
           backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -1266,8 +1095,6 @@ public class SimpleGUI implements BKUGUIFacade {
         }
       });
     }
-
-//    private DisposableFileChooser fileDialog;
     
     private void showSaveHashDataInputDialog(final List<HashDataInput> signedRefs, final ActionListener okListener, final String okCommand) {
       
-- 
cgit v1.2.3


From 11411c3d236e10b237ec1c7a1904e64dc2508551 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 14 Oct 2008 14:47:06 +0000
Subject: GUI retry error msg

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@115 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml                                  |   7 +
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 143 ++++++++-------------
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |  38 ++++++
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    | 138 ++++++++------------
 .../at/gv/egiz/bku/gui/Messages.properties         |   1 +
 .../gv/egiz/stal/service/impl/STALServiceImpl.java |  10 +-
 6 files changed, 164 insertions(+), 173 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 130749c5..a20a613d 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -103,6 +103,13 @@
 					</execution>
 				</executions>
 			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
     </plugins>
   </build>
   <dependencies>
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 9cba293a..7e0f0447 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
@@ -22,7 +22,6 @@ package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.stal.HashDataInput;
-import java.awt.Color;
 import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.Font;
@@ -66,40 +65,7 @@ import org.apache.commons.logging.LogFactory;
 public class BKUGUI implements BKUGUIFacade {
     
     private static final Log log = LogFactory.getLog(BKUGUI.class);
-    public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
-    public static final String DEFAULT_BACKGROUND = "/images/mocca_default.png"; //logo.png";
-    public static final String HASHDATA_FONT = "Monospaced";
-    public static final Color ERROR_COLOR = Color.RED;
-    public static final Color HYPERLINK_COLOR = Color.BLUE;
-    private static final String TITLE_WELCOME = "title.welcome";
-    private static final String TITLE_INSERTCARD = "title.insertcard";
-    private static final String TITLE_CARD_NOT_SUPPORTED = "title.cardnotsupported";
-    private static final String TITLE_CARDPIN = "title.cardpin";
-    private static final String TITLE_SIGN = "title.sign";
-    private static final String TITLE_ERROR = "title.error";
-    private static final String TITLE_RETRY = "title.retry";
-    private static final String TITLE_WAIT = "title.wait";
-    private static final String TITLE_HASHDATA = "title.hashdata";
-    private static final String WINDOWTITLE_SAVE = "windowtitle.save";
-    private static final String WINDOWTITLE_SAVEDIR = "windowtitle.savedir";
-    private static final String WINDOWTITLE_OVERWRITE = "windowtitle.overwrite";
-    private static final String MESSAGE_WAIT = "message.wait";
-    private static final String MESSAGE_INSERTCARD = "message.insertcard";
-    private static final String MESSAGE_HASHDATALINK = "message.hashdatalink";
-    private static final String MESSAGE_HASHDATA = "message.hashdata";
-    private static final String MESSAGE_HASHDATALIST = "message.hashdatalist";
-    private static final String MESSAGE_RETRIES = "message.retries";
-    private static final String MESSAGE_OVERWRITE = "message.overwrite";
-    private static final String LABEL_PIN = "label.pin";
-    private static final String LABEL_PINSIZE = "label.pinsize";
-//    private static final String ERROR_NO_HASHDATA = "error.no.hashdata";
     
-    private static final String BUTTON_OK = "button.ok";
-    private static final String BUTTON_CANCEL = "button.cancel";
-    private static final String BUTTON_BACK = "button.back";
-    private static final String BUTTON_SIGN = "button.sign";
-    private static final String BUTTON_SAVE = "button.save";
-    private static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
     protected Container contentPane;
     protected ResourceBundle messages;
     /** left and right side main panels */
@@ -506,42 +472,47 @@ public class BKUGUI implements BKUGUIFacade {
                 });
 
                 JLabel infoLabel = new JLabel();
-                infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 if (numRetries < 0) {
-                    String pinsizePattern = messages.getString(LABEL_PINSIZE);
-                    String pinSize = String.valueOf(pinSpec.getMinLength());
-                    if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-                        pinSize += "-" + pinSpec.getMaxLength();
-                    }
-                    infoLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  String infoPattern = messages.getString(MESSAGE_ENTERPIN);
+                  infoLabel.setText(MessageFormat.format(infoPattern, new Object[] {pinSpec.getLocalizedName()}));
                 } else {
-                    infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
-                    infoLabel.setForeground(ERROR_COLOR);
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                  infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
+                  infoLabel.setForeground(ERROR_COLOR);
+                }
+                
+                JLabel pinsizeLabel = new JLabel();
+                pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
+                String pinsizePattern = messages.getString(LABEL_PINSIZE);
+                String pinSize = String.valueOf(pinSpec.getMinLength());
+                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+                    pinSize += "-" + pinSpec.getMaxLength();
                 }
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
                 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
-//                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//                            .addComponent(hashDataLabel)
-//                        .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
-                        .addComponent(cardPinLabel, 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.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(infoLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addGroup(mainPanelLayout.createSequentialGroup()
+                      .addComponent(cardPinLabel, 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(pinsizeLabel))));
 
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                        .addComponent(hashDataLabel)
-//                        .addGap(hashDataLabel.getFont().getSize())
+                        .addComponent(infoLabel)
+                        .addGap(infoLabel.getFont().getSize())
                         .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
                             .addComponent(cardPinLabel)
                             .addComponent(pinField))
                         .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(infoLabel));
+                        .addComponent(pinsizeLabel));
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
@@ -634,57 +605,57 @@ public class BKUGUI implements BKUGUIFacade {
                     }
                 });
 
-                //pinsize or error label
+                JLabel pinsizeLabel = new JLabel();
+                pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
+                String pinsizePattern = messages.getString(LABEL_PINSIZE);
+                String pinSize = String.valueOf(pinSpec.getMinLength());
+                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+                    pinSize += "-" + pinSpec.getMaxLength();
+                }
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                
                 JLabel infoLabel = new JLabel();
-                infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 if (numRetries < 0) {
-                    String pinsizePattern = messages.getString(LABEL_PINSIZE);
-                    String pinSize = String.valueOf(pinSpec.getMinLength());
-                    if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-                        pinSize += "-" + pinSpec.getMaxLength();
-                    }
-                    infoLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  infoLabel.setText(messages.getString(MESSAGE_HASHDATALINK));
+                  infoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                  infoLabel.setForeground(HYPERLINK_COLOR);
+                  infoLabel.addMouseListener(new MouseAdapter() {
+
+                      @Override
+                      public void mouseClicked(MouseEvent me) {
+                          ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
+                          hashdataListener.actionPerformed(e);
+                      }
+                  });
                 } else {
-                    infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
-                    infoLabel.setForeground(ERROR_COLOR);
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                  infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
+                  infoLabel.setForeground(ERROR_COLOR);
                 }
 
-                JLabel hashDataLabel = new JLabel();
-                hashDataLabel.setFont(hashDataLabel.getFont().deriveFont(hashDataLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                hashDataLabel.setText(messages.getString(MESSAGE_HASHDATALINK));
-                hashDataLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-                hashDataLabel.setForeground(HYPERLINK_COLOR);
-                hashDataLabel.addMouseListener(new MouseAdapter() {
-
-                    @Override
-                    public void mouseClicked(MouseEvent me) {
-                        ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
-                        hashdataListener.actionPerformed(e);
-                    }
-                });
-
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(hashDataLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                      .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
+                      .addComponent(infoLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                      .addGroup(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))));
+                            .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                            .addComponent(pinsizeLabel))));
 
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-                        .addComponent(hashDataLabel)
-                        .addGap(hashDataLabel.getFont().getSize())
+                        .addComponent(infoLabel)
+                        .addGap(infoLabel.getFont().getSize())
                         .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
                             .addComponent(signPinLabel)
                             .addComponent(pinField))
                         .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(infoLabel));
+                        .addComponent(pinsizeLabel));
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 0b617271..a5b7d606 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -18,6 +18,7 @@ package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.smcc.PINSpec;
+import java.awt.Color;
 import java.awt.Container;
 import java.awt.event.ActionListener;
 import java.net.URL;
@@ -34,6 +35,43 @@ public interface BKUGUIFacade {
   public static final String ERR_WRITE_HASHDATA = "error.write.hashdata";
   public static final String ERR_INVALID_HASH = "error.invalid.hash";
   
+    public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
+    public static final String DEFAULT_BACKGROUND = "/images/mocca_default.png"; //logo.png";
+    public static final String HASHDATA_FONT = "Monospaced";
+    public static final Color ERROR_COLOR = Color.RED;
+    public static final Color HYPERLINK_COLOR = Color.BLUE;
+    public static final String TITLE_WELCOME = "title.welcome";
+    public static final String TITLE_INSERTCARD = "title.insertcard";
+    public static final String TITLE_CARD_NOT_SUPPORTED = "title.cardnotsupported";
+    public static final String TITLE_CARDPIN = "title.cardpin";
+    public static final String TITLE_SIGN = "title.sign";
+    public static final String TITLE_ERROR = "title.error";
+    public static final String TITLE_RETRY = "title.retry";
+    public static final String TITLE_WAIT = "title.wait";
+    public static final String TITLE_HASHDATA = "title.hashdata";
+    public static final String WINDOWTITLE_SAVE = "windowtitle.save";
+    public static final String WINDOWTITLE_SAVEDIR = "windowtitle.savedir";
+    public static final String WINDOWTITLE_OVERWRITE = "windowtitle.overwrite";
+    public static final String MESSAGE_WAIT = "message.wait";
+    public static final String MESSAGE_INSERTCARD = "message.insertcard";
+    public static final String MESSAGE_ENTERPIN = "message.enterpin";
+    public static final String MESSAGE_HASHDATALINK = "message.hashdatalink";
+    public static final String MESSAGE_HASHDATA = "message.hashdata";
+    public static final String MESSAGE_HASHDATALIST = "message.hashdatalist";
+    public static final String MESSAGE_RETRIES = "message.retries";
+    public static final String MESSAGE_OVERWRITE = "message.overwrite";
+    public static final String LABEL_PIN = "label.pin";
+    public static final String LABEL_PINSIZE = "label.pinsize";
+//    public static final String ERROR_NO_HASHDATA = "error.no.hashdata";
+    
+    public static final String BUTTON_OK = "button.ok";
+    public static final String BUTTON_CANCEL = "button.cancel";
+    public static final String BUTTON_BACK = "button.back";
+    public static final String BUTTON_SIGN = "button.sign";
+    public static final String BUTTON_SAVE = "button.save";
+    public static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
+    
+    
     public void init(Container contentPane, String localeString, URL background);
     
     public void showWelcomeDialog(); 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index 3d47e1cd..c37704e2 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -22,7 +22,6 @@ package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.stal.HashDataInput;
-import java.awt.Color;
 import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.Font;
@@ -66,40 +65,7 @@ import org.apache.commons.logging.LogFactory;
 public class SimpleGUI implements BKUGUIFacade {
     
     private static final Log log = LogFactory.getLog(SimpleGUI.class);
-    public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
-    public static final String DEFAULT_BACKGROUND = "/images/mocca_default.png"; //logo.png";
-    public static final String HASHDATA_FONT = "Monospaced";
-    public static final Color ERROR_COLOR = Color.RED;
-    public static final Color HYPERLINK_COLOR = Color.BLUE;
-    private static final String TITLE_WELCOME = "title.welcome";
-    private static final String TITLE_INSERTCARD = "title.insertcard";
-    private static final String TITLE_CARD_NOT_SUPPORTED = "title.cardnotsupported";
-    private static final String TITLE_CARDPIN = "title.cardpin";
-    private static final String TITLE_SIGN = "title.sign";
-    private static final String TITLE_ERROR = "title.error";
-    private static final String TITLE_RETRY = "title.retry";
-    private static final String TITLE_WAIT = "title.wait";
-    private static final String TITLE_HASHDATA = "title.hashdata";
-    private static final String WINDOWTITLE_SAVE = "windowtitle.save";
-    private static final String WINDOWTITLE_SAVEDIR = "windowtitle.savedir";
-    private static final String WINDOWTITLE_OVERWRITE = "windowtitle.overwrite";
-    private static final String MESSAGE_WAIT = "message.wait";
-    private static final String MESSAGE_INSERTCARD = "message.insertcard";
-    private static final String MESSAGE_HASHDATALINK = "message.hashdatalink";
-    private static final String MESSAGE_HASHDATA = "message.hashdata";
-    private static final String MESSAGE_HASHDATALIST = "message.hashdatalist";
-    private static final String MESSAGE_RETRIES = "message.retries";
-    private static final String MESSAGE_OVERWRITE = "message.overwrite";
-    private static final String LABEL_PIN = "label.pin";
-    private static final String LABEL_PINSIZE = "label.pinsize";
-//    private static final String ERROR_NO_HASHDATA = "error.no.hashdata";
     
-    private static final String BUTTON_OK = "button.ok";
-    private static final String BUTTON_CANCEL = "button.cancel";
-    private static final String BUTTON_BACK = "button.back";
-    private static final String BUTTON_SIGN = "button.sign";
-    private static final String BUTTON_SAVE = "button.save";
-    private static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
     protected Container contentPane;
     protected ResourceBundle messages;
     /** left and right side main panels */
@@ -507,39 +473,47 @@ public class SimpleGUI implements BKUGUIFacade {
                 });
 
                 JLabel infoLabel = new JLabel();
-                infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD, infoLabel.getFont().getSize()-2));
                 if (numRetries < 0) {
-                    String pinsizePattern = messages.getString(LABEL_PINSIZE);
-                    String pinSize = String.valueOf(pinSpec.getMinLength());
-                    if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-                        pinSize += "-" + pinSpec.getMaxLength();
-                    }
-                    infoLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  String infoPattern = messages.getString(MESSAGE_ENTERPIN);
+                  infoLabel.setText(MessageFormat.format(infoPattern, new Object[] {pinSpec.getLocalizedName()}));
                 } else {
-                    infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
-                    infoLabel.setForeground(ERROR_COLOR);
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                  infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
+                  infoLabel.setForeground(ERROR_COLOR);
+                }
+                
+                JLabel pinsizeLabel = new JLabel();
+                pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
+                String pinsizePattern = messages.getString(LABEL_PINSIZE);
+                String pinSize = String.valueOf(pinSpec.getMinLength());
+                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+                    pinSize += "-" + pinSpec.getMaxLength();
                 }
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
                 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addComponent(cardPinLabel, 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.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(infoLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addGroup(mainPanelLayout.createSequentialGroup()
+                      .addComponent(cardPinLabel, 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(pinsizeLabel))));
 
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-//                        .addComponent(hashDataLabel)
-//                        .addGap(hashDataLabel.getFont().getSize())
+                        .addComponent(infoLabel)
+                        .addGap(infoLabel.getFont().getSize())
                         .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
                             .addComponent(cardPinLabel)
                             .addComponent(pinField))
                         .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(infoLabel));
+                        .addComponent(pinsizeLabel));
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
@@ -644,57 +618,57 @@ public class SimpleGUI implements BKUGUIFacade {
                     }
                 });
 
-                //pinsize or error label
+                JLabel pinsizeLabel = new JLabel();
+                pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
+                String pinsizePattern = messages.getString(LABEL_PINSIZE);
+                String pinSize = String.valueOf(pinSpec.getMinLength());
+                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+                    pinSize += "-" + pinSpec.getMaxLength();
+                }
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                
                 JLabel infoLabel = new JLabel();
-                infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD, infoLabel.getFont().getSize()-2));
                 if (numRetries < 0) {
-                    String pinsizePattern = messages.getString(LABEL_PINSIZE);
-                    String pinSize = String.valueOf(pinSpec.getMinLength());
-                    if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-                        pinSize += "-" + pinSpec.getMaxLength();
-                    }
-                    infoLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  infoLabel.setText(messages.getString(MESSAGE_HASHDATALINK));
+                  infoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                  infoLabel.setForeground(HYPERLINK_COLOR);
+                  infoLabel.addMouseListener(new MouseAdapter() {
+
+                      @Override
+                      public void mouseClicked(MouseEvent me) {
+                          ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
+                          hashdataListener.actionPerformed(e);
+                      }
+                  });
                 } else {
-                    infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
-                    infoLabel.setForeground(ERROR_COLOR);
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                  infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
+                  infoLabel.setForeground(ERROR_COLOR);
                 }
 
-                JLabel hashDataLabel = new JLabel();
-                hashDataLabel.setFont(hashDataLabel.getFont().deriveFont(hashDataLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                hashDataLabel.setText(messages.getString(MESSAGE_HASHDATALINK));
-                hashDataLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-                hashDataLabel.setForeground(HYPERLINK_COLOR);
-                hashDataLabel.addMouseListener(new MouseAdapter() {
-
-                    @Override
-                    public void mouseClicked(MouseEvent me) {
-                        ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
-                        hashdataListener.actionPerformed(e);
-                    }
-                });
-
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(hashDataLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                      .addGroup(GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
+                      .addComponent(infoLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                      .addGroup(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))));
+                            .addComponent(pinsizeLabel))));
 
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-                        .addComponent(hashDataLabel)
-                        .addGap(hashDataLabel.getFont().getSize())
+                        .addComponent(infoLabel)
+                        .addGap(infoLabel.getFont().getSize())
                         .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
                             .addComponent(signPinLabel)
                             .addComponent(pinField))
                         .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(infoLabel));
+                        .addComponent(pinsizeLabel));
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index e7716ae9..d0e4726e 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -27,6 +27,7 @@ windowtitle.savedir=Signaturdaten in Verzeichnis speichern
 windowtitle.overwrite=Datei \u00FCberschreiben?
 message.wait=<html>Bitte warten...</html>
 message.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken</html>
+message.enterpin=<html>Bitte {0} eingeben</html>
 message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen...</a></html>
 message.hashdata=<html>Ein Signaturdatenobjekt:</html> 
 #message.hashdata=<html>Referenz Id: {0}</html>
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
index 55e66685..99398fe6 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
@@ -314,15 +314,15 @@ public class STALServiceImpl implements STALPortType {
       log.info("Received TestSession GetNextRequest(ErrorResponse), returning QuitRequest");
       response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(new QuitRequestType());
     } else {
-      log.info("Received TestSession GetNextRequest, returning InfoboxReadRequest ");
-      SignRequestType sig = new SignRequestType();
-      sig.setKeyIdentifier("SecureSignatureKeypair");
-      sig.setSignedInfo("<dsig:SignedInfo  xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\"><dsig:CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\" /> <dsig:SignatureMethod Algorithm=\"http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1\" /> <dsig:Reference Id=\"signed-data-reference-0-1214921968-27971781-24309\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-0-1214921968-27971781-13578')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"etsi-data-reference-0-1214921968-27971781-25439\" Type=\"http://uri.etsi.org/01903/v1.1.1#SignedProperties\" URI=\"#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-data-object-0-1214921968-27971781-3095')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)\"><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /><dsig:DigestValue>yV6Q+I60buqR4mMaxA7fi+CV35A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>".getBytes());
-      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(sig);
+      log.info("Received TestSession GetNextRequest, returning SignRequest and 3 InfoboxReadRequests ");
       InfoboxReadRequestType req = new InfoboxReadRequestType();
       req.setInfoboxIdentifier("IdentityLink");
       req.setDomainIdentifier("hansiwurzel");
       response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(req);
+      SignRequestType sig = new SignRequestType();
+      sig.setKeyIdentifier("SecureSignatureKeypair");
+      sig.setSignedInfo("<dsig:SignedInfo  xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\"><dsig:CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\" /> <dsig:SignatureMethod Algorithm=\"http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1\" /> <dsig:Reference Id=\"signed-data-reference-0-1214921968-27971781-24309\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-0-1214921968-27971781-13578')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"etsi-data-reference-0-1214921968-27971781-25439\" Type=\"http://uri.etsi.org/01903/v1.1.1#SignedProperties\" URI=\"#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-data-object-0-1214921968-27971781-3095')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)\"><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /><dsig:DigestValue>yV6Q+I60buqR4mMaxA7fi+CV35A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>".getBytes());
+      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(sig);
       req = new InfoboxReadRequestType();
       req.setInfoboxIdentifier("CertifiedKeypair");
       response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(req);
-- 
cgit v1.2.3


From d56504bc815d41ac9142967915b7e6224c2cf529 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 15 Oct 2008 13:41:21 +0000
Subject: remove hashdatainputproxy

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@119 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/applet/BKUWorker.java    |  5 ----
 .../gv/egiz/stal/impl/ByteArrayHashDataInput.java  | 31 ++++++++++++++++++++++
 .../at/gv/egiz/bku/gui/Messages.properties         |  2 +-
 .../stal/service/impl/STALRequestBrokerImpl.java   |  9 +++----
 .../at/gv/egiz/stal/util/HashDataInputProxy.java   |  2 +-
 5 files changed, 36 insertions(+), 13 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
index 350925ce..3f64de3d 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
@@ -154,11 +154,6 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
       return;
     }
     
-//    //TODO factory for SignRequestHandler providing either WebServiceHDISignRequestHandler or ExternalHDIDisplaySignRequestHandler
-//    AppletContext ctx = parent.getAppletContext();
-//    log.debug("register SignRequestHandler for HashDataURL " + hashDataURL);
-//    addRequestHandler(at.gv.egiz.stal.SignRequest.class, new ExternalDisplaySignRequestHandler(ctx, hashDataURL));
-    
     try {
       String sessionId = parent.getMyAppletParameter(BKUApplet.SESSION_ID);
       if (sessionId == null) {
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java b/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
index b0285345..2b5ee7e7 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
@@ -7,7 +7,11 @@ package at.gv.egiz.stal.impl;
 
 import at.gv.egiz.stal.HashDataInput;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  *
@@ -15,6 +19,8 @@ import java.io.InputStream;
  */
 public class ByteArrayHashDataInput implements HashDataInput {
 
+    private static final Log log = LogFactory.getLog(ByteArrayHashDataInput.class);
+  
     protected byte[] hashData;
     protected String id;
     protected String mimeType;
@@ -30,6 +36,31 @@ public class ByteArrayHashDataInput implements HashDataInput {
         this.encoding = encoding;
     }
     
+    /**
+     * caches the hashdata input's stream
+     * @param hdi to be cached
+     */
+    public ByteArrayHashDataInput(HashDataInput hdi) {
+      if (hdi == null) {
+        throw new NullPointerException("HashDataInput not provided.");
+      }
+      InputStream is = hdi.getHashDataInput();
+      ByteArrayOutputStream baos = new ByteArrayOutputStream();
+      try {
+        byte[] buffer = new byte[1024];
+        for (int i = is.read(buffer); i > -1; i = is.read(buffer)) {
+          baos.write(buffer, 0, i);
+        }
+        this.hashData = baos.toByteArray();
+      } catch (IOException ex) {
+        log.error("Failed to cache provided HashDataInput: " + ex.getMessage(), ex);
+        this.hashData = new byte[0];
+      }
+      this.id = hdi.getReferenceId();
+      this.mimeType = hdi.getMimeType();
+      this.encoding = hdi.getEncoding();
+    }
+    
     @Override
     public String getReferenceId() {
         return id;
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index d0e4726e..a38e2cf8 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -35,7 +35,7 @@ message.hashdatalist=<html>{0} Signaturdatenobjekte:</html>
 message.retries=<html>Noch {0} Versuch(e)</html>
 message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
 label.pin=<html>{0}:</html>
-label.pinsize=<html>{0} stellig</html>
+label.pinsize=<html>({0} stellig)</html>
 button.ok=OK
 button.cancel=Abbrechen
 button.back=Zur\u00FCck
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
index 03c7c601..7f4a9273 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
@@ -32,7 +32,6 @@ import at.gv.egiz.stal.service.types.QuitRequestType;
 import at.gv.egiz.stal.service.types.RequestType;
 import at.gv.egiz.stal.service.types.ResponseType;
 import at.gv.egiz.stal.service.types.SignRequestType;
-import at.gv.egiz.stal.util.HashDataInputProxy;
 import at.gv.egiz.stal.util.STALTranslator;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -42,7 +41,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * An instance of STALRequestBroker is shared between a producer threads (SLCommand)
+ * An instance of STALRequestBroker is shared between a producer thread (SLCommand)
  * and multiple consumer threads (STALService).
  * This implementation assures that handleRequest is executed only once the previous invocation returned.
  * The BindingProcessor assures that a new SLCommand calls handleRequest() only once
@@ -109,10 +108,8 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
                   req.setKeyIdentifier(((SignRequest) stalRequest).getKeyIdentifier());
                   req.setSignedInfo(((SignRequest) stalRequest).getSignedInfo());
                   requests.add(req);
-                  for (HashDataInput hdi : ((SignRequest) stalRequest).getHashDataInput()) {
-                    hashDataInputs.add(new HashDataInputProxy(hdi));
-                  }
-                  //hashDataInputs.addAll(((SignRequest) stalRequest).getHashDataInput());
+                  //DataObjectHashDataInput with reference caching enabled DataObject 
+                  hashDataInputs.addAll(((SignRequest) stalRequest).getHashDataInput());
                   break;
                 } else if (stalRequest instanceof InfoboxReadRequest) {
                   log.trace("Received InfoboxReadRequest");
diff --git a/STALService/src/main/java/at/gv/egiz/stal/util/HashDataInputProxy.java b/STALService/src/main/java/at/gv/egiz/stal/util/HashDataInputProxy.java
index dda20968..01d207d2 100644
--- a/STALService/src/main/java/at/gv/egiz/stal/util/HashDataInputProxy.java
+++ b/STALService/src/main/java/at/gv/egiz/stal/util/HashDataInputProxy.java
@@ -13,7 +13,7 @@ import at.gv.egiz.stal.HashDataInput;
 
 /**
  * Enables multiple read requests.
- * 
+ * @deprecated use at.gv.egiz.stal.impl.ByteArrayHashDataInput
  */
 public class HashDataInputProxy implements HashDataInput {
 
-- 
cgit v1.2.3


From 73c8f359ff94b382324665ca981b0640cc9f058f Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 16 Oct 2008 13:11:22 +0000
Subject: Background Chipperling

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@123 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java   |   2 +-
 .../src/main/resources/images/BackgroundChipperling.png  | Bin 0 -> 3367 bytes
 .../src/main/resources/images/BackgroundMocca.png        | Bin 0 -> 1287 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png
 create mode 100644 BKUCommonGUI/src/main/resources/images/BackgroundMocca.png

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index a5b7d606..ced74834 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -36,7 +36,7 @@ public interface BKUGUIFacade {
   public static final String ERR_INVALID_HASH = "error.invalid.hash";
   
     public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
-    public static final String DEFAULT_BACKGROUND = "/images/mocca_default.png"; //logo.png";
+    public static final String DEFAULT_BACKGROUND = "/images/BackgroundChipperling.png";
     public static final String HASHDATA_FONT = "Monospaced";
     public static final Color ERROR_COLOR = Color.RED;
     public static final Color HYPERLINK_COLOR = Color.BLUE;
diff --git a/BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png b/BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png
new file mode 100644
index 00000000..a4791a7f
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png differ
diff --git a/BKUCommonGUI/src/main/resources/images/BackgroundMocca.png b/BKUCommonGUI/src/main/resources/images/BackgroundMocca.png
new file mode 100644
index 00000000..349d9ff0
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/images/BackgroundMocca.png differ
-- 
cgit v1.2.3


From 990e50c61d1b92dbd0e063fe6811783c2d479e42 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 28 Oct 2008 10:56:44 +0000
Subject: ProcessingContext removed old background imgs

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@125 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/resources/images/chipperling_only.png | Bin 3291 -> 0 bytes
 BKUCommonGUI/src/main/resources/images/logo.png    | Bin 4035 -> 0 bytes
 BKUCommonGUI/src/main/resources/images/mocca.png   | Bin 1450 -> 0 bytes
 .../main/resources/images/mocca_chipperling.png    | Bin 4103 -> 0 bytes
 .../src/main/resources/images/mocca_default.png    | Bin 1287 -> 0 bytes
 .../src/main/resources/images/mocca_tiny.png       | Bin 1025 -> 0 bytes
 BKUOnline/src/main/webapp/META-INF/context.xml     |   4 +-
 .../egiz/bku/binding/BindingProcessorManager.java  | 172 +++++++++++----------
 .../bku/binding/BindingProcessorManagerImpl.java   | 153 +++++++++++-------
 .../at/gv/egiz/bku/binding/ProcessingContext.java  |  39 +++++
 10 files changed, 221 insertions(+), 147 deletions(-)
 delete mode 100644 BKUCommonGUI/src/main/resources/images/chipperling_only.png
 delete mode 100644 BKUCommonGUI/src/main/resources/images/logo.png
 delete mode 100644 BKUCommonGUI/src/main/resources/images/mocca.png
 delete mode 100644 BKUCommonGUI/src/main/resources/images/mocca_chipperling.png
 delete mode 100644 BKUCommonGUI/src/main/resources/images/mocca_default.png
 delete mode 100644 BKUCommonGUI/src/main/resources/images/mocca_tiny.png
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/binding/ProcessingContext.java

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/resources/images/chipperling_only.png b/BKUCommonGUI/src/main/resources/images/chipperling_only.png
deleted file mode 100644
index 57063b9a..00000000
Binary files a/BKUCommonGUI/src/main/resources/images/chipperling_only.png and /dev/null differ
diff --git a/BKUCommonGUI/src/main/resources/images/logo.png b/BKUCommonGUI/src/main/resources/images/logo.png
deleted file mode 100644
index eee4be4f..00000000
Binary files a/BKUCommonGUI/src/main/resources/images/logo.png and /dev/null differ
diff --git a/BKUCommonGUI/src/main/resources/images/mocca.png b/BKUCommonGUI/src/main/resources/images/mocca.png
deleted file mode 100644
index 881a65c1..00000000
Binary files a/BKUCommonGUI/src/main/resources/images/mocca.png and /dev/null differ
diff --git a/BKUCommonGUI/src/main/resources/images/mocca_chipperling.png b/BKUCommonGUI/src/main/resources/images/mocca_chipperling.png
deleted file mode 100644
index 4ee2d054..00000000
Binary files a/BKUCommonGUI/src/main/resources/images/mocca_chipperling.png and /dev/null differ
diff --git a/BKUCommonGUI/src/main/resources/images/mocca_default.png b/BKUCommonGUI/src/main/resources/images/mocca_default.png
deleted file mode 100644
index 349d9ff0..00000000
Binary files a/BKUCommonGUI/src/main/resources/images/mocca_default.png and /dev/null differ
diff --git a/BKUCommonGUI/src/main/resources/images/mocca_tiny.png b/BKUCommonGUI/src/main/resources/images/mocca_tiny.png
deleted file mode 100644
index 1f125d9b..00000000
Binary files a/BKUCommonGUI/src/main/resources/images/mocca_tiny.png and /dev/null differ
diff --git a/BKUOnline/src/main/webapp/META-INF/context.xml b/BKUOnline/src/main/webapp/META-INF/context.xml
index cd11ce8e..f38215a1 100644
--- a/BKUOnline/src/main/webapp/META-INF/context.xml
+++ b/BKUOnline/src/main/webapp/META-INF/context.xml
@@ -15,5 +15,5 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<Context path="/bkuonline"/>
-<!--Context path="/"/-->
+<!--Context path="/bkuonline"/-->
+<Context path=""/>
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManager.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManager.java
index aaf81e51..9cad95a4 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManager.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManager.java
@@ -14,92 +14,94 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package at.gv.egiz.bku.binding;
-
+package at.gv.egiz.bku.binding;
+
 import java.net.MalformedURLException;
-import java.util.Locale;
-import java.util.Set;
-
-import at.gv.egiz.bku.slcommands.SLCommandInvoker;
-import at.gv.egiz.stal.STALFactory;
-
-/**
- * Central player that handles the protocol binding.
- * 
- * @author wbauer
- * 
- */
-public interface BindingProcessorManager {
-
-  /**
-   * FactoryMethod creating a new BindingProcessor object.
-   * The created binding processor must be passed to the process method to execute.
-   * 
-   * @param urlString
-   *          the source url
-   * @param aSessionId
-   *          optional an external sessionId (e.g. http session) could be
-   *          provided. This parameter may be null.
-   * @param locale the locale used for user interaction, may be null
-   */
-  public BindingProcessor createBindingProcessor(String urlString,
-      String aSessionId, Locale locale) throws MalformedURLException;
-
-  /**
-   * FactoryMethod creating a new BindingProcessor object.
-   * The created binding processor must be passed to the process method to execute.
-   * 
-   * @param protcol
-   *          the source url
-   * @param aSessionId
-   *          optional an external sessionId (e.g. http session) could be
-   *          provided. This parameter may be null.
-   */
-  public BindingProcessor createBindingProcessor(String urlString,
-      String aSessionId) throws MalformedURLException;
-
-  
-  /**
-   * Gets the binding processor with a certain id. The binding processor must be passed to the 
-   * process method before it is managed and thus returned by this method.
-   * @param aId must not be null
-   * @return null if the binding processor was not "processed" before.
-   */
-  public BindingProcessor getBindingProcessor(Id aId);
-
-  /**
-   * Sets the STAL factory that is used for creating STAL objects that are used by BindingProcessor objects.
-   * For each new BindingProcessor a new STAL object is created.
-   * @param aStalFactory the factory to be used. Must not be null.
-   */
-  public void setSTALFactory(STALFactory aStalFactory);
-  
-  /**
-   * Sets the invoker to be used.
-   * @param invoker
-   */
-  public void setSLCommandInvoker(SLCommandInvoker invoker);
-
-  /**
-   * Schedules the provided binding processor for processing and immediately returns.
-   * 
-   * @param aBindingProcessor
-   */
-  public void process(BindingProcessor aBindingProcessor);
-  
-  /**
-   * Removes a formerly added (by calling the process method) binding processor.
-   * @param bindingProcessor must not be null
-   */
-  public void removeBindingProcessor(Id sessionId); 
-  
-  /**
-   * A set of all managed binding processors.
-   * @return
-   */
-  public Set<Id> getManagedIds();
-      
+import java.util.Locale;
+import java.util.Set;
+
+import at.gv.egiz.bku.slcommands.SLCommandInvoker;
+import at.gv.egiz.stal.STALFactory;
+
+/**
+ * Central player that handles the protocol binding.
+ * 
+ * @author wbauer
+ * 
+ */
+public interface BindingProcessorManager {
+
+  /**
+   * FactoryMethod creating a new BindingProcessor object.
+   * The created binding processor must be passed to the process method to execute.
+   * 
+   * @param urlString
+   *          the source url
+   * @param aSessionId
+   *          optional an external sessionId (e.g. http session) could be
+   *          provided. This parameter may be null.
+   * @param locale the locale used for user interaction, may be null
+   */
+  public BindingProcessor createBindingProcessor(String urlString,
+      String aSessionId, Locale locale) throws MalformedURLException;
+
+  /**
+   * FactoryMethod creating a new BindingProcessor object.
+   * The created binding processor must be passed to the process method to execute.
+   * 
+   * @param protcol
+   *          the source url
+   * @param aSessionId
+   *          optional an external sessionId (e.g. http session) could be
+   *          provided. This parameter may be null.
+   */
+  public BindingProcessor createBindingProcessor(String urlString,
+      String aSessionId) throws MalformedURLException;
+
+  
+  /**
+   * Gets the binding processor with a certain id. The binding processor must be passed to the 
+   * process method before it is managed and thus returned by this method.
+   * @param aId must not be null
+   * @return null if the binding processor was not "processed" before.
+   */
+  public BindingProcessor getBindingProcessor(Id aId);
+
+  /**
+   * Sets the STAL factory that is used for creating STAL objects that are used by BindingProcessor objects.
+   * For each new BindingProcessor a new STAL object is created.
+   * @param aStalFactory the factory to be used. Must not be null.
+   */
+  public void setSTALFactory(STALFactory aStalFactory);
+  
+  /**
+   * Sets the invoker to be used.
+   * @param invoker
+   */
+  public void setSLCommandInvoker(SLCommandInvoker invoker);
+
+  /**
+   * Creates a processing context,
+   * schedules the provided binding processor for processing and 
+   * immediately returns the context.
+   * 
+   * @param aBindingProcessor
+   */
+  public ProcessingContext process(BindingProcessor aBindingProcessor);
+  
+  /**
+   * Removes a formerly added (by calling the process method) binding processor.
+   * @param bindingProcessor must not be null
+   */
+  public void removeBindingProcessor(Id sessionId); 
+  
+  /**
+   * A set of all managed binding processors.
+   * @return
+   */
+  public Set<Id> getManagedIds();
+      
   public void shutdown();
   
-  public void shutdownNow();
+  public void shutdownNow();
 }
\ No newline at end of file
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java
index 11f5a160..cc1b7532 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java
@@ -53,8 +53,9 @@ public class BindingProcessorManagerImpl implements BindingProcessorManager {
   private STALFactory stalFactory;
   private SLCommandInvoker commandInvokerClass;
   private ExecutorService executorService;
-  private Map<Id, MapEntityWrapper> bindingProcessorMap = Collections
-      .synchronizedMap(new HashMap<Id, MapEntityWrapper>());
+  private Map<Id, ProcessingContext> contextMap = Collections.synchronizedMap(new HashMap<Id, ProcessingContext>());
+//  private Map<Id, MapEntityWrapper> bindingProcessorMap = Collections
+//      .synchronizedMap(new HashMap<Id, MapEntityWrapper>());
 
   /**
    * Container to hold a Future and Bindingprocessor object as map value.
@@ -62,39 +63,39 @@ public class BindingProcessorManagerImpl implements BindingProcessorManager {
    * @author wbauer
    * @see BindingProcessorManagerImpl#bindingProcessorMap
    */
-  static class MapEntityWrapper {
-    private Future<?> future;
-    private BindingProcessor bindingProcessor;
-
-    public MapEntityWrapper(Future<?> future, BindingProcessor bindingProcessor) {
-      if ((bindingProcessor == null) || (future == null)) {
-        throw new NullPointerException("Argument must not be null");
-      }
-      this.bindingProcessor = bindingProcessor;
-      this.future = future;
-    }
-
-    public Future<?> getFuture() {
-      return future;
-    }
-
-    public BindingProcessor getBindingProcessor() {
-      return bindingProcessor;
-    }
-
-    public int hashCode() {
-      return bindingProcessor.getId().hashCode();
-    }
-
-    public boolean equals(Object other) {
-      if (other instanceof MapEntityWrapper) {
-        MapEntityWrapper o = (MapEntityWrapper) other;
-        return (o.bindingProcessor.getId().equals(bindingProcessor.getId()));
-      } else {
-        return false;
-      }
-    }
-  }
+//  static class MapEntityWrapper {
+//    private Future<?> future;
+//    private BindingProcessor bindingProcessor;
+//
+//    public MapEntityWrapper(Future<?> future, BindingProcessor bindingProcessor) {
+//      if ((bindingProcessor == null) || (future == null)) {
+//        throw new NullPointerException("Argument must not be null");
+//      }
+//      this.bindingProcessor = bindingProcessor;
+//      this.future = future;
+//    }
+//
+//    public Future<?> getFuture() {
+//      return future;
+//    }
+//
+//    public BindingProcessor getBindingProcessor() {
+//      return bindingProcessor;
+//    }
+//
+//    public int hashCode() {
+//      return bindingProcessor.getId().hashCode();
+//    }
+//
+//    public boolean equals(Object other) {
+//      if (other instanceof MapEntityWrapper) {
+//        MapEntityWrapper o = (MapEntityWrapper) other;
+//        return (o.bindingProcessor.getId().equals(bindingProcessor.getId()));
+//      } else {
+//        return false;
+//      }
+//    }
+//  }
 
   /**
    * 
@@ -157,17 +158,24 @@ public class BindingProcessorManagerImpl implements BindingProcessorManager {
   public void shutdownNow() {
     log.info("Shutting down the BindingProcessorManager NOW!");
     executorService.shutdownNow();
-    log.debug("Number of binding prcessors currently managed: "
-        + bindingProcessorMap.size());
+    log.debug("Number of binding contexts currently managed: "
+      + contextMap.size());
+//        + bindingProcessorMap.size());
     if (log.isDebugEnabled()) {
-      for (Iterator<MapEntityWrapper> it = bindingProcessorMap.values()
-          .iterator(); it.hasNext();) {
-        MapEntityWrapper entry = it.next();
-        log.debug(entry.getBindingProcessor().getId() + ": isDone: "
-            + entry.getFuture().isDone());
-        log.debug(entry.getBindingProcessor().getId() + ": isCanceled: "
-            + entry.getFuture().isCancelled());
+      for (ProcessingContext ctx : contextMap.values()) {
+        Id bpId = ctx.getBindingProcessor().getId();
+        Future future = ctx.getFuture();
+        log.debug(bpId + " cancelled: " + future.isCancelled());
+        log.debug(bpId + " done: " + future.isDone());
       }
+//      for (Iterator<MapEntityWrapper> it = bindingProcessorMap.values()
+//          .iterator(); it.hasNext();) {
+//        MapEntityWrapper entry = it.next();
+//        log.debug(entry.getBindingProcessor().getId() + ": isDone: "
+//            + entry.getFuture().isDone());
+//        log.debug(entry.getBindingProcessor().getId() + ": isCanceled: "
+//            + entry.getFuture().isCancelled());
+//      }
     }
   }
 
@@ -216,17 +224,22 @@ public class BindingProcessorManagerImpl implements BindingProcessorManager {
    * @return the bindingprocessor object for this id or null if no
    *         bindingprocessor was found.
    */
+    @Override
   public BindingProcessor getBindingProcessor(Id aId) {
-    if (bindingProcessorMap.get(aId) != null) {
-      return bindingProcessorMap.get(aId).getBindingProcessor();
+//    if (bindingProcessorMap.get(aId) != null) {
+//      return bindingProcessorMap.get(aId).getBindingProcessor();
+    ProcessingContext ctx = contextMap.get(aId);
+    if (ctx != null) {
+      return ctx.getBindingProcessor();
     } else {
       return null;
     }
   }
 
-  /**
-   * 
+  /**
+   * 
    */
+    @Override
   public void setSTALFactory(STALFactory aStalFactory) {
     if (aStalFactory == null) {
       throw new NullPointerException("Cannot set STALFactory to null");
@@ -236,12 +249,17 @@ public class BindingProcessorManagerImpl implements BindingProcessorManager {
 
   /**
    * Causes the BindingProcessorManager to manage the provided BindingProcessor
+   * Creates a processing context,
+   * schedules the provided binding processor for processing and 
+   * immediately returns the context.
    * 
    * @param aBindingProcessor
    *          must not be null
    */
-  public void process(BindingProcessor aBindingProcessor) {
-    if (bindingProcessorMap.containsKey(aBindingProcessor.getId())) {
+  @Override
+  public ProcessingContext process(BindingProcessor aBindingProcessor) {
+    if (contextMap.containsKey(aBindingProcessor.getId())) {
+//    if (bindingProcessorMap.containsKey(aBindingProcessor.getId())) {
       log.fatal("Clashing ids, cannot process bindingprocessor with id:"
           + aBindingProcessor.getId());
       throw new SLRuntimeException(
@@ -250,8 +268,11 @@ public class BindingProcessorManagerImpl implements BindingProcessorManager {
     }
     log.debug("processing bindingprocessor: " + aBindingProcessor.getId());
     Future<?> f = executorService.submit(aBindingProcessor);
-    bindingProcessorMap.put(aBindingProcessor.getId(), new MapEntityWrapper(f,
-        aBindingProcessor));
+    ProcessingContext ctx = new ProcessingContext(aBindingProcessor, f);
+    contextMap.put(aBindingProcessor.getId(), ctx);
+//    bindingProcessorMap.put(aBindingProcessor.getId(), new MapEntityWrapper(f,
+//        aBindingProcessor));
+    return ctx;
   }
 
   @Override
@@ -262,26 +283,38 @@ public class BindingProcessorManagerImpl implements BindingProcessorManager {
   @Override
   public void removeBindingProcessor(Id sessionId) {
     log.debug("Removing binding processor: " + sessionId);
-    MapEntityWrapper wrapper = bindingProcessorMap.get(sessionId);
-    if (wrapper == null) {
+    ProcessingContext ctx = contextMap.get(sessionId);
+    if (ctx == null) {
       return;
     }
-    Future<?> f = wrapper.getFuture();
+    Future f = ctx.getFuture();
+      
+//    MapEntityWrapper wrapper = bindingProcessorMap.get(sessionId);
+//    if (wrapper == null) {
+//      return;
+//    }
+//    Future<?> f = wrapper.getFuture();
     if (!f.isDone()) {
       f.cancel(true);
     }
-    bindingProcessorMap.remove(sessionId);
+    contextMap.remove(sessionId);
+//    bindingProcessorMap.remove(sessionId);
   }
 
   @Override
   public Set<Id> getManagedIds() {
     Set<Id> result = new HashSet<Id>();
-    synchronized (bindingProcessorMap) {
-      for (Iterator<Id> it = bindingProcessorMap.keySet().iterator(); it
-          .hasNext();) {
-        result.add(it.next());
+    synchronized (contextMap) {
+      for (Id id : contextMap.keySet()) {
+        result.add(id);
       }
     }
+//    synchronized (bindingProcessorMap) {
+//      for (Iterator<Id> it = bindingProcessorMap.keySet().iterator(); it
+//          .hasNext();) {
+//        result.add(it.next());
+//      }
+//    }
     return result;
   }
 }
\ No newline at end of file
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/ProcessingContext.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/ProcessingContext.java
new file mode 100644
index 00000000..ae7f01eb
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/ProcessingContext.java
@@ -0,0 +1,39 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.bku.binding;
+
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.Future;
+
+/**
+ * BindingContext?
+ * RequestBindingContext?
+ * 
+ * @author clemens
+ */
+public class ProcessingContext {
+
+  public static final String BINDING_PROCESSOR = "binding.processor";
+  public static final String FUTURE = "future";
+  
+  protected Map<String, Object> properties = new Hashtable<String, Object>();
+
+  public ProcessingContext(BindingProcessor bp, Future future) {
+    properties.put(BINDING_PROCESSOR, bp);
+    properties.put(FUTURE, future);
+  }
+  
+  
+  
+  public BindingProcessor getBindingProcessor() {
+    return (BindingProcessor) properties.get(BINDING_PROCESSOR);
+  }
+  
+  public Future getFuture() {
+    return (Future) properties.get(FUTURE); 
+  }
+}
-- 
cgit v1.2.3


From c2ae3db1bc6dcb8ba3eb3461c05e293917c004ca Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 30 Oct 2008 10:33:29 +0000
Subject: Updated SMCC to use exclusive access and to throw exceptions upon
 locked or not activated cards. Improved locale support in the security layer
 request and response processing. Fixed issue in STAL which prevented the use
 of RSA-SHA1 signatures. Added additional parameters to the applet test pages.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@128 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/java/at/gv/egiz/bku/gui/PinDocument.java  |   2 +-
 .../egiz/bku/online/webapp/BKURequestHandler.java  |  20 +-
 BKUOnline/src/main/webapp/HTTP-ohne.html           |  11 +-
 BKUOnline/src/main/webapp/appletPage.jsp           |  29 +-
 .../at/gv/egiz/stal/util/JCEAlgorithmNames.java    |   4 +-
 .../gv/egiz/bku/binding/HTTPBindingProcessor.java  |   3 +-
 .../gv/egiz/bku/slcommands/SLCommandContext.java   |  17 +-
 .../impl/CreateXMLSignatureCommandImpl.java        |   4 +-
 .../egiz/bku/slcommands/impl/ErrorResultImpl.java  |  42 ++-
 .../slcommands/impl/InfoboxReadCommandImpl.java    |   2 +-
 .../gv/egiz/bku/slcommands/impl/SLResultImpl.java  |   8 +-
 .../bku/slcommands/impl/ErrorResultImplTest.java   |   3 +-
 smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java   | 348 ++++++++++++---------
 .../at/gv/egiz/smcc/AbstractSignatureCard.java     | 169 +++++++---
 .../at/gv/egiz/smcc/FileNotFoundException.java     |  38 +++
 .../main/java/at/gv/egiz/smcc/LockedException.java |  38 +++
 .../at/gv/egiz/smcc/NotActivatedException.java     |  44 +++
 .../src/main/java/at/gv/egiz/smcc/STARCOSCard.java | 339 ++++++++++++--------
 smcc/src/main/java/at/gv/egiz/smcc/SWCard.java     |  79 ++++-
 .../at/gv/egiz/smcc/SignatureCardException.java    |   2 +-
 .../java/at/gv/egiz/smcc/SignatureCardFactory.java | 223 +++++++++++--
 .../java/at/gv/egiz/smcc/util/SmartCardIO.java     |   3 +-
 .../test/java/at/gv/egiz/smcc/STARCOSCardTest.java |  92 ++++++
 .../bku/smccstal/InfoBoxReadRequestHandler.java    |   8 +
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   |  10 +-
 25 files changed, 1149 insertions(+), 389 deletions(-)
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/FileNotFoundException.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/LockedException.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/NotActivatedException.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
index 8ae9d7a3..2054ae86 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
@@ -46,7 +46,7 @@ class PINDocument extends PlainDocument {
 
         @Override
         public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
-            if (pinSpec.getMaxLength() >= (getLength() + str.length())) {
+            if (pinSpec.getMaxLength() < 0 || pinSpec.getMaxLength() >= (getLength() + str.length())) {
                 boolean matches = true;
                 for (int i = 0; i < str.length(); i++) {
                     Matcher m = pinPattern.matcher(str.substring(i, i + 1));
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
index 6f3b9d7f..9092e3f9 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
@@ -44,6 +44,8 @@ import at.gv.egiz.org.apache.tomcat.util.http.AcceptLanguage;
  */
 public class BKURequestHandler extends SpringBKUServlet {
 
+  private static final long serialVersionUID = 1L;
+
   public final static String REDIRECT_URL = "appletPage.jsp";
 
   protected Log log = LogFactory.getLog(BKURequestHandler.class);
@@ -105,6 +107,8 @@ public class BKURequestHandler extends SpringBKUServlet {
     String width = getStringFromStream(bindingProcessor.getFormData("appletWidth"), charset);
     String height = getStringFromStream(bindingProcessor.getFormData("appletHeight"), charset);
     String background = getStringFromStream(bindingProcessor.getFormData("appletBackground"), charset);
+    String guiStyle = getStringFromStream(bindingProcessor.getFormData("appletGuiStyle"), charset);
+    String hashDataDisplay = getStringFromStream(bindingProcessor.getFormData("appletHashDataDisplay"), charset);
     if (width != null) {
       try {
         log.trace("Found applet width parameter: " + width);
@@ -124,12 +128,16 @@ public class BKURequestHandler extends SpringBKUServlet {
       }
     }
     if (background != null) {
-      try {
-        log.trace("Found applet background parameter: " + background);
-        session.setAttribute("appletBackground", background);
-      } catch (NumberFormatException nfe) {
-        log.warn(nfe);
-      }
+      log.trace("Found applet background parameter: " + background);
+      session.setAttribute("appletBackground", background);
+    }
+    if (guiStyle != null) {
+      log.trace("Found applet GUI style parameter: " + guiStyle);
+      session.setAttribute("appletGuiStyle", guiStyle);
+    }
+    if (hashDataDisplay != null) {
+      log.trace("Found applet hash data display parameter: " + hashDataDisplay);
+      session.setAttribute("appletHashDataDisplay", hashDataDisplay);
     }
 
     resp.sendRedirect(REDIRECT_URL);
diff --git a/BKUOnline/src/main/webapp/HTTP-ohne.html b/BKUOnline/src/main/webapp/HTTP-ohne.html
index 1923113e..044432ce 100644
--- a/BKUOnline/src/main/webapp/HTTP-ohne.html
+++ b/BKUOnline/src/main/webapp/HTTP-ohne.html
@@ -92,8 +92,17 @@ legend {
   name="appletHeight" value="130" id="appletHeight">
 <p><label for="appletBackground">Applet Background</label> <input
   name="appletBackground" value="" id="appletBackground">
+<p>
+	<label for="appletGuiStyle">GUI Style</label> 
+	<input type="radio" name="appletGuiStyle" value="simple" checked="checked">simple
+	<input type="radio" name="appletGuiStyle" value="advanced">advanced
+</p>
+<p>
+	<label for="appletHashDataDisplay">GUI Style</label> 
+	<input type="radio" name="appletHashDataDisplay" value="external" checked="checked">external
+	<input type="radio" name="appletHashDataDisplay" value="internal">internal
+</p>
 
-</textarea></p>
 <!-- 
 <p><label for="RedirectURL">RedirectURL</label> <input
 	name="RedirectURL" value="" id="RedirectURL"></p>
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp
index 950141c4..ffb67828 100644
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ b/BKUOnline/src/main/webapp/appletPage.jsp
@@ -20,7 +20,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MOCCA Appletpage</title>
+<title>MOCCA Applet</title>
 <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
 <script type="text/javascript" src="js/deployJava.js"></script>
 <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
@@ -29,19 +29,18 @@
 </head>
 <body>
 <%
-  int width = session.getAttribute("appletWidth") == null
-					? 190
-					: (Integer) session.getAttribute("appletWidth");
-			int height = session.getAttribute("appletHeight") == null
-					? 130
-					: (Integer) session.getAttribute("appletHeight");
-			String backgroundImg = (String) session
-					.getAttribute("appletBackground");
+  int width = session.getAttribute("appletWidth") == null ? 190
+      : (Integer) session.getAttribute("appletWidth");
+  int height = session.getAttribute("appletHeight") == null ? 130
+      : (Integer) session.getAttribute("appletHeight");
+  String backgroundImg = (String) session.getAttribute("appletBackground");
+  String guiStyle = (String) session.getAttribute("appletGuiStyle");
+  String hashDataDisplay = (String) session.getAttribute("appletHashDataDisplay");
 %>
 <script>
 	if (!deployJava.versionCheck('1.6.0_04+')) {
 		document
-				.write('<b>Diese Anwendung benötigt die Java Platform Version 1.6.0 oder höher.</b>' + '<input type="submit" value="Java Platform 1.6.0_02 installieren" onclick="deployJava.installLatestJRE();">');
+				.write('<b>Diese Anwendung benötigt die Java Platform Version 1.6.0_04 oder höher.</b>' + '<input type="submit" value="Java Platform 1.6.0_02 installieren" onclick="deployJava.installLatestJRE();">');
 	} else {
 		var attributes = {
 			codebase :'applet',
@@ -51,15 +50,15 @@
 			height :<%=height%>
 		};
 		var parameters = {
-                        GuiStyle : 'simple',
+            GuiStyle : '<%=guiStyle%>',
 			Background : '<%=backgroundImg%>',
-			WSDL_URL :'../stal?wsdl',
-                        HashDataDisplay : 'external',
-                        HashDataURL : '../hashDataInput',
+			WSDL_URL : '../stal?wsdl',
+            HashDataDisplay : '<%=hashDataDisplay%>',
+            HashDataURL : '../hashDataInput',
 			SessionID : '<%=session.getId()%>',
 			RedirectURL : '../bkuResult'
 		};
-		var version = '1.6.0_02';
+		var version = '1.6.0_04';
 		deployJava.runApplet(attributes, parameters, version);
 	}
 </script>
diff --git a/STAL/src/main/java/at/gv/egiz/stal/util/JCEAlgorithmNames.java b/STAL/src/main/java/at/gv/egiz/stal/util/JCEAlgorithmNames.java
index 7e8a767e..c162eed4 100644
--- a/STAL/src/main/java/at/gv/egiz/stal/util/JCEAlgorithmNames.java
+++ b/STAL/src/main/java/at/gv/egiz/stal/util/JCEAlgorithmNames.java
@@ -31,7 +31,7 @@ public class JCEAlgorithmNames {
   
   public static String[] SHA_1_ALGORITMS = {
       "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1",
-      "http://www.w3.org/2000/09/xmldsig#sha1" };
+      "http://www.w3.org/2000/09/xmldsig#rsa-sha1" };
 
   private static JCEAlgorithmNames instance = new JCEAlgorithmNames();
 
@@ -42,7 +42,7 @@ public class JCEAlgorithmNames {
   }
 
   public static String getJCEHashName(String xmlAlgorithmURI) {
-    return instance.hashNameMap.get(xmlAlgorithmURI);
+     return instance.hashNameMap.get(xmlAlgorithmURI);
   }
 
   public void registerHash(String xmlAlgorithmURI, String jceName) {
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java
index 5e44e82b..4a22874c 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java
@@ -564,6 +564,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
 		SLCommandContext commandCtx = new SLCommandContext();
 		commandCtx.setSTAL(getSTAL());
 		commandCtx.setURLDereferencerContext(new SimpleFormDataContextImpl(this));
+		commandCtx.setLocale(locale);
 		slCommand = SLCommandFactory.getInstance().createSLCommand(source,
 				commandCtx);
 		log.debug("Created new command: " + slCommand);
@@ -731,7 +732,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
 	protected void handleBindingProcessorError(OutputStream os, String encoding,
 			Templates templates) throws IOException {
 		log.debug("Writing error as result");
-		ErrorResultImpl error = new ErrorResultImpl(bindingProcessorError);
+		ErrorResultImpl error = new ErrorResultImpl(bindingProcessorError, locale);
 		error.writeTo(new StreamResult(new OutputStreamWriter(os, encoding)), templates);
 	}
 
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandContext.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandContext.java
index c95736bd..5af2afac 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandContext.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandContext.java
@@ -16,13 +16,17 @@
 */
 package at.gv.egiz.bku.slcommands;
 
+import java.util.Locale;
+
 import at.gv.egiz.bku.utils.urldereferencer.URLDereferencerContext;
 import at.gv.egiz.stal.STAL;
 
 public class SLCommandContext {
   
   private STAL stal;
-  private URLDereferencerContext urlDerefCtx;
+  private URLDereferencerContext urlDerefCtx;
+  
+  private Locale locale;
 
   public void setSTAL(STAL aStal) {
     this.stal = aStal;
@@ -38,5 +42,14 @@ public class SLCommandContext {
 
   public URLDereferencerContext getURLDereferencerContext() {
     return urlDerefCtx;
-  }
+  }
+
+  public Locale getLocale() {
+    return locale;
+  }
+
+  public void setLocale(Locale locale) {
+    this.locale = locale;
+  }
+  
 }
\ No newline at end of file
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
index 628326cf..6462bcf6 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateXMLSignatureCommandImpl.java
@@ -216,8 +216,8 @@ public class CreateXMLSignatureCommandImpl extends SLCommandImpl<CreateXMLSignat
       
       return new CreateXMLSignatureResultImpl(signature.getDocument());
       
-    } catch (SLException e) {
-      return new ErrorResultImpl(e);
+    } catch (SLException e) {
+      return new ErrorResultImpl(e, cmdCtx.getLocale());
     } 
   }
 
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImpl.java
index 176ba001..5d0f0de0 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImpl.java
@@ -16,6 +16,8 @@
 */
 package at.gv.egiz.bku.slcommands.impl;
 
+import java.util.Locale;
+
 import javax.xml.transform.Result;
 import javax.xml.transform.Templates;
 
@@ -32,22 +34,34 @@ public class ErrorResultImpl extends SLResultImpl implements ErrorResult {
   /**
    * The exception containing information provided in the <code>ErrorResponse</code>.
    */
-  protected SLException slException;
-
-  /**
-   * Creates a new instance of this ErrorResultImpl with the given
-   * <code>slException</code> containing information provided in the
-   * <code>ErrorResponse</code>.
-   * 
-   * @param slException the exception 
-   */
-  public ErrorResultImpl(SLException slException) {
-    this.slException = slException;
-  }
-
+  protected SLException slException;
+  
+  /**
+   * The locale to be used for rendering an <code>ErrorResponse</code>.
+   */
+  protected Locale locale;
+  
+  /**
+   * Creates a new instance of this ErrorResultImpl with the given
+   * <code>slException</code> containing information provided in the
+   * <code>ErrorResponse</code> and the <code>locale</code> for rendering
+   * the <code>ErrorResponse</code>.
+   * 
+   * @param slException the exception
+   * @param locale the locale
+   */
+  public ErrorResultImpl(SLException slException, Locale locale) {
+    this.slException = slException;
+    this.locale = locale;
+  }
+
   @Override
   public void writeTo(Result result, Templates templates) {
-    writeErrorTo(slException, result, templates);
+    if (locale == null) {
+      writeErrorTo(slException, result, templates);
+    } else {
+      writeErrorTo(slException, result, templates, locale);
+    }
   }
   
 }
\ No newline at end of file
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java
index d23c0598..c7bb5205 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java
@@ -279,7 +279,7 @@ public class InfoboxReadCommandImpl extends SLCommandImpl<InfoboxReadRequestType
         throw new SLCommandException(4000);
       }
     } catch (SLCommandException e) {
-      return new ErrorResultImpl(e);
+      return new ErrorResultImpl(e, cmdCtx.getLocale());
     }
   }
  
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLResultImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLResultImpl.java
index 57309182..7306b237 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLResultImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLResultImpl.java
@@ -16,6 +16,8 @@
 */
 package at.gv.egiz.bku.slcommands.impl;
 
+import java.util.Locale;
+
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
@@ -181,6 +183,10 @@ public abstract class SLResultImpl implements SLResult {
   }
   
   protected void writeErrorTo(SLException slException, Result result, Templates templates) {
+    writeErrorTo(slException, result, templates, Locale.getDefault());
+  }
+  
+  protected void writeErrorTo(SLException slException, Result result, Templates templates, Locale locale) {
     
     TransformerHandler transformerHandler = null;
     if (templates != null) {
@@ -195,7 +201,7 @@ public abstract class SLResultImpl implements SLResult {
     ObjectFactory factory = new ObjectFactory();
     ErrorResponseType responseType = factory.createErrorResponseType();
     responseType.setErrorCode(slException.getErrorCode());
-    responseType.setInfo(slException.getDetailedMsg());
+    responseType.setInfo(slException.getLocalizedMessage(locale));
     JAXBElement<ErrorResponseType> response = factory.createErrorResponse(responseType);
     
     Marshaller marshaller = getMarshaller();
diff --git a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImplTest.java b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImplTest.java
index 8455e934..f10ca520 100644
--- a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImplTest.java
+++ b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/ErrorResultImplTest.java
@@ -17,6 +17,7 @@
 package at.gv.egiz.bku.slcommands.impl;
 
 import java.io.ByteArrayOutputStream;
+import java.util.Locale;
 
 import javax.xml.transform.stream.StreamResult;
 
@@ -31,7 +32,7 @@ public class ErrorResultImplTest {
   public void writeTo() {
     
     SLException slException = new SLException(0,"test.noerror", null);
-    ErrorResult errorResult = new ErrorResultImpl(slException);
+    ErrorResult errorResult = new ErrorResultImpl(slException, Locale.getDefault());
     
     ByteArrayOutputStream stream = new ByteArrayOutputStream();
     StreamResult result = new StreamResult(stream);
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
index abe086ee..9e56701f 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
@@ -30,12 +30,18 @@ package at.gv.egiz.smcc;
 
 import java.nio.charset.Charset;
 
+import javax.smartcardio.Card;
 import javax.smartcardio.CardChannel;
 import javax.smartcardio.CardException;
 import javax.smartcardio.CommandAPDU;
 import javax.smartcardio.ResponseAPDU;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
+  
+  private static Log log = LogFactory.getLog(ACOSCard.class);
 
   public static final byte[] AID_DEC = new byte[] { (byte) 0xA0, (byte) 0x00,
       (byte) 0x00, (byte) 0x01, (byte) 0x18, (byte) 0x45, (byte) 0x4E };
@@ -97,7 +103,145 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
     super("at/gv/egiz/smcc/ACOSCard");
   }
 
-  byte[] selectFileAID(byte[] fid) throws CardException, SignatureCardException {
+  /* (non-Javadoc)
+   * @see at.gv.egiz.smcc.SignatureCard#getCertificate(at.gv.egiz.smcc.SignatureCard.KeyboxName)
+   */
+  public byte[] getCertificate(KeyboxName keyboxName)
+      throws SignatureCardException {
+  
+    byte[] aid;
+    byte[] efc;
+    int maxsize;
+    if (keyboxName == KeyboxName.SECURE_SIGNATURE_KEYPAIR) {
+      aid = AID_SIG;
+      efc = EF_C_CH_DS;
+      maxsize = EF_C_CH_DS_MAX_SIZE;
+    } else if (keyboxName == KeyboxName.CERITIFIED_KEYPAIR) {
+      aid = AID_DEC;
+      efc = EF_C_CH_EKEY;
+      maxsize = EF_C_CH_EKEY_MAX_SIZE;
+    } else {
+      throw new IllegalArgumentException("Keybox " + keyboxName
+          + " not supported.");
+    }
+
+    log.debug("Get certificate for keybox '" + keyboxName.getKeyboxName() + "'" +
+        " (AID=" + toString(aid) + " EF=" + toString(efc) + ").");
+    
+    try {
+      Card card = getCardChannel().getCard();
+      try {
+        card.beginExclusive();
+        return readTLVFile(aid, efc, maxsize + 15000);
+      } catch (FileNotFoundException e) {
+        // if certificate is not present, 
+        // the citizen card application has not been activated
+        throw new NotActivatedException();
+      } finally {
+        card.endExclusive();
+      }
+    } catch (CardException e) {
+      throw new SignatureCardException("Failed to get exclusive card access.");
+    }
+
+    
+  }
+
+  /* (non-Javadoc)
+   * @see at.gv.egiz.smcc.SignatureCard#getInfobox(java.lang.String, at.gv.egiz.smcc.PINProvider, java.lang.String)
+   */
+  public byte[] getInfobox(String infobox, PINProvider provider, String domainId)
+      throws SignatureCardException {
+  
+    if ("IdentityLink".equals(infobox)) {
+  
+      PINSpec spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("inf.pin.name"));
+      
+      try {
+        Card card = getCardChannel().getCard();
+        try {
+          card.beginExclusive();
+          return readTLVFilePIN(AID_DEC, EF_INFOBOX, KID_PIN_INF, provider,
+              spec, EF_INFOBOX_MAX_SIZE);
+        } catch (FileNotFoundException e) {
+          // if certificate is not present, 
+          // the citizen card application has not been activated
+          throw new NotActivatedException();
+        } finally {
+          card.endExclusive();
+        }
+      } catch (CardException e) {
+        throw new SignatureCardException("Failed to get exclusive card access.");
+      }
+  
+    } else {
+      throw new IllegalArgumentException("Infobox '" + infobox
+          + "' not supported.");
+    }
+  
+  }
+
+  public byte[] createSignature(byte[] hash, KeyboxName keyboxName,
+      PINProvider provider) throws SignatureCardException {
+  
+    if (hash.length != 20) {
+      throw new IllegalArgumentException("Hash value must be of length 20.");
+    }
+  
+    try {
+      Card card = getCardChannel().getCard();
+      try {
+        card.beginExclusive();
+        
+        if (KeyboxName.SECURE_SIGNATURE_KEYPAIR.equals(keyboxName)) {
+
+          // SELECT DF
+          selectFileFID(DF_SIG);
+          // VERIFY
+          verifyPIN(provider, new PINSpec(6, 10, "[0-9]", getResourceBundle()
+              .getString("sig.pin.name")), KID_PIN_SIG);
+          // MSE: SET DST
+          mseSetDST(0x81, 0xb6, DST_SIG);
+          // PSO: HASH
+          psoHash(hash);
+          // PSO: COMPUTE DIGITAL SIGNATURE
+          return psoComputDigitalSiganture();
+      
+        } else if (KeyboxName.CERITIFIED_KEYPAIR.equals(keyboxName)) {
+
+          // SELECT DF
+          selectFileFID(DF_DEC);
+          // VERIFY
+          verifyPIN(provider, new PINSpec(4, 4, "[0-9]", getResourceBundle()
+              .getString("dec.pin.name")), KID_PIN_DEC);
+          // MSE: SET DST
+          mseSetDST(0x41, 0xa4, DST_DEC);
+          // INTERNAL AUTHENTICATE
+          return internalAuthenticate(hash);
+
+          
+          // 00 88 10 00 23 30 21 30 09 06 05 2B 0E 03 02 1A 05 00 04 14 54 26 F0 EA  AF EA F0 4E D4 A1 AD BF 66 D4 A5 9B 45 6F AF 79 00
+          // 00 88 10 00 23 30 21 30 09 06 05 2B 0E 03 02 1A 05 00 04 14 DF 8C AB 8F E2 AD AC 7B 5A AF BE E9 44 5E 95 99 FA AF 2F 48 00
+          
+        } else {
+          throw new IllegalArgumentException("KeyboxName '" + keyboxName
+              + "' not supported.");
+        }
+        
+      } catch (FileNotFoundException e) {
+        // if certificate is not present, 
+        // the citizen card application has not been activated
+        throw new NotActivatedException();
+      } finally {
+        card.endExclusive();
+      }
+    } catch (CardException e) {
+      throw new SignatureCardException("Failed to get exclusive card access.");
+    }
+
+  }
+
+  protected byte[] selectFileAID(byte[] fid) throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
     ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0xA4, 0x04,
         0x00, fid, 256));
@@ -109,18 +253,40 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
     }
   }
 
-  byte[] selectFileFID(byte[] fid) throws CardException, SignatureCardException {
+  protected ResponseAPDU selectFileFID(byte[] fid) throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
-    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0xA4, 0x00,
+    return transmit(channel, new CommandAPDU(0x00, 0xA4, 0x00,
         0x00, fid, 256));
-    if (resp.getSW() == 0x6a82) {
-      throw new SignatureCardException("Failed to select file (FID="
-          + toString(fid) + "): SW=" + Integer.toHexString(resp.getSW()) + ")");
+  }
+
+  protected int verifyPIN(String pin, byte kid) throws CardException, SignatureCardException {
+    
+    CardChannel channel = getCardChannel();
+
+    byte[] asciiPIN = pin.getBytes(Charset.forName("ASCII"));
+    byte[] encodedPIN = new byte[8];
+    System.arraycopy(asciiPIN, 0, encodedPIN, 0, Math.min(asciiPIN.length,
+        encodedPIN.length));
+
+    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00,
+        kid, encodedPIN), false);
+    
+    if (resp.getSW() == 0x63c0) {
+      throw new LockedException("PIN locked.");
+    } else if (resp.getSW1() == 0x63 && resp.getSW2() >> 4 == 0xc) {
+      // return number of possible retries
+      return resp.getSW2() & 0x0f;
+    } else if (resp.getSW() == 0x6983) {
+      throw new NotActivatedException();
+    } else if (resp.getSW() == 0x9000) {
+      return -1;
     } else {
-      return resp.getBytes();
+      throw new SignatureCardException("Failed to verify pin: SW="
+          + Integer.toHexString(resp.getSW()) + ".");
     }
-  }
 
+  }
+  
   /**
    * 
    * @param pinProvider
@@ -128,56 +294,30 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
    *          the PIN spec to be given to the pinProvider
    * @param kid
    *          the KID (key identifier) of the PIN to be verified
-   * @param kfpc
-   *          acutal value of the KFCP (key fault presentation counter) or less
-   *          than 0 if actual value is unknown
-   * 
-   * @return -1 if the PIN has been verifyed successfully, or else the new value
-   *         of the KFCP (key fault presentation counter)
-   * 
    * @throws CancelledException
    *           if the user canceld the operation
    * @throws javax.smartcardio.CardException
    * @throws at.gv.egiz.smcc.SignatureCardException
    */
-  int verifyPIN(PINProvider pinProvider, PINSpec spec, byte kid, int kfpc)
+  protected void verifyPIN(PINProvider pinProvider, PINSpec spec, byte kid)
       throws CardException, CancelledException, SignatureCardException {
 
-    CardChannel channel = getCardChannel();
-
-    // get PIN
-    String pin = pinProvider.providePIN(spec, kfpc);
-    if (pin == null) {
-      // User canceld operation
-      // throw new CancelledException("User canceld PIN entry");
-      return -2;
-    }
-
-    byte[] asciiPIN = pin.getBytes(Charset.forName("ASCII"));
-    byte[] encodedPIN = new byte[8];
-    System.arraycopy(asciiPIN, 0, encodedPIN, 0, Math.min(asciiPIN.length,
-        encodedPIN.length));
-
-    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00,
-        kid, encodedPIN));
-    if (resp.getSW1() == (byte) 0x63 && resp.getSW2() >> 4 == (byte) 0xc) {
-      return resp.getSW2() & (byte) 0x0f;
-    } else if (resp.getSW() == 0x6983) {
-      // PIN blocked
-      throw new SignatureCardException(spec.getLocalizedName() + " blocked.");
-    } else if (resp.getSW() != 0x9000) {
-      throw new SignatureCardException("Failed to verify pin: SW="
-          + Integer.toHexString(resp.getSW()) + ".");
-    } else {
-      return -1;
-    }
-
+    int retries = -1;
+    do {
+      String pin = pinProvider.providePIN(spec, retries);
+      if (pin == null) {
+        // user canceled operation
+        throw new CancelledException("User canceled operation");
+      } 
+      retries = verifyPIN(pin, kid);
+    } while (retries > 0);
+      
   }
-
-  void mseSetDST(byte[] dst) throws CardException, SignatureCardException {
+    
+  void mseSetDST(int p1, int p2, byte[] dst) throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
-    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0x22, 0x81,
-        0xB6, dst));
+    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0x22, p1,
+        p2, dst));
     if (resp.getSW() != 0x9000) {
       throw new SignatureCardException("MSE:SET DST failed: SW="
           + Integer.toHexString(resp.getSW()));
@@ -207,102 +347,30 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
       return resp.getData();
     }
   }
-
-  public byte[] getCertificate(KeyboxName keyboxName)
-      throws SignatureCardException {
-
-    if (keyboxName == KeyboxName.SECURE_SIGNATURE_KEYPAIR) {
-      return readTLVFile(AID_SIG, EF_C_CH_DS, EF_C_CH_DS_MAX_SIZE);
-    } else if (keyboxName == KeyboxName.CERITIFIED_KEYPAIR) {
-      return readTLVFile(AID_DEC, EF_C_CH_EKEY, EF_C_CH_EKEY_MAX_SIZE);
-    } else {
-      throw new IllegalArgumentException("Keybox " + keyboxName
-          + " not supported.");
-    }
-
-  }
-
-  public byte[] getInfobox(String infobox, PINProvider provider, String domainId)
-      throws SignatureCardException {
-
-    if ("IdentityLink".equals(infobox)) {
-
-      PINSpec spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString(
-          "inf.pin.name"));
-      try {
-        byte[] res = readTLVFilePIN(AID_DEC, EF_INFOBOX, KID_PIN_INF, provider,
-            spec, EF_INFOBOX_MAX_SIZE);
-        return res;
-      } catch (Exception e) {
-        throw new SecurityException(e);
-      }
-
+  
+  byte[] internalAuthenticate(byte[] hash) throws CardException, SignatureCardException {
+    byte[] digestInfo = new byte[] {
+        (byte) 0x30, (byte) 0x21, (byte) 0x30, (byte) 0x09, (byte) 0x06, (byte) 0x05, (byte) 0x2B, (byte) 0x0E, 
+        (byte) 0x03, (byte) 0x02, (byte) 0x1A, (byte) 0x05, (byte) 0x00, (byte) 0x04
+    };
+    
+    byte[] data = new byte[digestInfo.length + hash.length + 1];
+    
+    System.arraycopy(digestInfo, 0, data, 0, digestInfo.length);
+    data[digestInfo.length] = (byte) hash.length;
+    System.arraycopy(hash, 0, data, digestInfo.length + 1, hash.length);
+    
+    CardChannel channel = getCardChannel();
+    
+    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0x88, 0x10, 0x00, data, 256));
+    if (resp.getSW() != 0x9000) {
+      throw new SignatureCardException("INTERNAL AUTHENTICATE failed: SW=" + Integer.toHexString(resp.getSW()));
     } else {
-      throw new IllegalArgumentException("Infobox '" + infobox
-          + "' not supported.");
+      return resp.getData();
     }
-
   }
 
   public String toString() {
     return "a-sign premium";
   }
-
-  public byte[] createSignature(byte[] hash, KeyboxName keyboxName,
-      PINProvider provider) throws SignatureCardException {
-
-    if (hash.length != 20) {
-      throw new IllegalArgumentException("Hash value must be of length 20");
-    }
-
-    byte[] fid;
-    byte kid;
-    byte[] dst;
-    PINSpec spec;
-    if (KeyboxName.SECURE_SIGNATURE_KEYPAIR.equals(keyboxName)) {
-      fid = DF_SIG;
-      kid = KID_PIN_SIG;
-      dst = DST_SIG;
-      spec = new PINSpec(6, 10, "[0-9]", getResourceBundle().getString(
-          "sig.pin.name"));
-
-    } else if (KeyboxName.CERITIFIED_KEYPAIR.equals(keyboxName)) {
-      fid = DF_DEC;
-      kid = KID_PIN_DEC;
-      dst = DST_DEC;
-      spec = new PINSpec(6, 10, "[0-9]", getResourceBundle().getString(
-          "dec.pin.name"));
-
-    } else {
-      throw new IllegalArgumentException("KeyboxName '" + keyboxName
-          + "' not supported.");
-    }
-
-    try {
-
-      // SELECT DF
-      selectFileFID(fid);
-      // VERIFY
-      int kfpc = -1;
-      while (true) {
-        kfpc = verifyPIN(provider, spec, kid, kfpc);
-        if (kfpc < -1) {
-          return null;
-        } else if (kfpc < 0) {
-          break;
-        }
-      }
-      // MSE: SET DST
-      mseSetDST(dst);
-      // PSO: HASH
-      psoHash(hash);
-      // PSO: COMPUTE DIGITAL SIGNATURE
-      byte[] rs = psoComputDigitalSiganture();
-
-      return rs;
-
-    } catch (CardException e) {
-      throw new SignatureCardException("Failed to create signature.", e);
-    }
-  }
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
index 77a3e2ea..cebc63fc 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
@@ -31,7 +31,6 @@ package at.gv.egiz.smcc;
 import java.nio.ByteBuffer;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import java.util.logging.Logger;
 
 import javax.smartcardio.ATR;
 import javax.smartcardio.Card;
@@ -60,7 +59,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
     this.resourceBundleName = resourceBundleName;
   }
 
-  String toString(byte[] b) {
+  protected String toString(byte[] b) {
     StringBuffer sb = new StringBuffer();
     if (b != null && b.length > 0) {
       sb.append(Integer.toHexString((b[0] & 240) >> 4));
@@ -74,13 +73,46 @@ public abstract class AbstractSignatureCard implements SignatureCard {
     return sb.toString();
   }
 
-  abstract byte[] selectFileAID(byte[] fid) throws CardException,
+  protected abstract byte[] selectFileAID(byte[] fid) throws CardException,
       SignatureCardException;
 
-  abstract byte[] selectFileFID(byte[] fid) throws CardException,
+  protected abstract ResponseAPDU selectFileFID(byte[] fid) throws CardException,
       SignatureCardException;
 
-  byte[] readBinary(CardChannel channel, int offset, int len)
+  /**
+   * VERIFY PIN
+   * 
+   * <p>
+   * Implementations of this method should call
+   * {@link PINProvider#providePIN(PINSpec, int)} to retrieve the PIN entered by
+   * the user and VERIFY PIN on the smart card until the PIN has been
+   * successfully verified.
+   * </p>
+   * 
+   * @param pinProvider
+   *          the PINProvider
+   * @param spec
+   *          the PINSpec
+   * @param kid
+   *          the key ID (KID) of the PIN to verify
+   * 
+   * @throws CardException
+   *           if smart card communication fails
+   * 
+   * @throws CancelledException
+   *           if the PINProvider indicated that the user canceled the PIN entry
+   * @throws NotActivatedException
+   *           if the card application has not been activated
+   * @throws LockedException
+   *           if the card application is locked
+   * 
+   * @throws SignatureCardException
+   *           if VERIFY PIN fails
+   */
+  protected abstract void verifyPIN(PINProvider pinProvider, PINSpec spec,
+      byte kid) throws CardException, SignatureCardException;
+
+  protected byte[] readBinary(CardChannel channel, int offset, int len)
       throws CardException, SignatureCardException {
 
     ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0xB0,
@@ -94,7 +126,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
 
   }
 
-  int readBinary(int offset, int len, byte[] b) throws CardException,
+  protected int readBinary(int offset, int len, byte[] b) throws CardException,
       SignatureCardException {
 
     if (b.length < len) {
@@ -114,7 +146,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
 
   }
 
-  byte[] readBinaryTLV(int maxSize, byte expectedType) throws CardException,
+  protected byte[] readBinaryTLV(int maxSize, byte expectedType) throws CardException,
       SignatureCardException {
 
     CardChannel channel = getCardChannel();
@@ -150,15 +182,38 @@ public abstract class AbstractSignatureCard implements SignatureCard {
 
   }
 
-  abstract int verifyPIN(PINProvider pinProvider, PINSpec spec, byte kid,
-      int kfpc) throws CardException, SignatureCardException;
-
-  public byte[] readTLVFile(byte[] aid, byte[] ef, int maxLength)
+  /**
+   * Read the content of a TLV file.
+   * 
+   * @param aid the application ID (AID)
+   * @param ef the elementary file (EF)
+   * @param maxLength the maximum length of the file
+   * 
+   * @return the content of the file
+   * 
+   * @throws SignatureCardException
+   */
+  protected byte[] readTLVFile(byte[] aid, byte[] ef, int maxLength)
       throws SignatureCardException {
     return readTLVFilePIN(aid, ef, (byte) 0, null, null, maxLength);
   }
 
-  public byte[] readTLVFilePIN(byte[] aid, byte[] ef, byte kid,
+  
+  /**
+   * Read the content of a TLV file wich may require a PIN.
+   * 
+   * @param aid the application ID (AID)
+   * @param ef the elementary file (EF)
+   * @param kid the key ID (KID) of the corresponding PIN
+   * @param provider the PINProvider
+   * @param spec the PINSpec
+   * @param maxLength the maximum length of the file
+   * 
+   * @return the content of the file
+   * 
+   * @throws SignatureCardException
+   */
+  protected byte[] readTLVFilePIN(byte[] aid, byte[] ef, byte kid,
       PINProvider provider, PINSpec spec, int maxLength)
       throws SignatureCardException {
 
@@ -179,33 +234,38 @@ public abstract class AbstractSignatureCard implements SignatureCard {
       }
 
       // SELECT FILE (EF)
-      rb = selectFileFID(ef);
-      if (rb[rb.length - 2] != (byte) 0x90 || rb[rb.length - 1] != (byte) 0x00) {
+      ResponseAPDU resp = selectFileFID(ef);
+      if (resp.getSW() == 0x6a82) {
+        
+        // EF not found
+        throw new FileNotFoundException("EF " + toString(ef) + " not found.");
+        
+      } else if (resp.getSW() != 0x9000) {
 
         throw new SignatureCardException("SELECT FILE with "
             + "FID="
             + toString(ef)
             + " failed ("
             + "SW="
-            + Integer.toHexString((0xFF & (int) rb[rb.length - 1])
-                | (0xFF & (int) rb[rb.length - 2]) << 8) + ").");
+            + Integer.toHexString(resp.getSW()) + ").");
+        
       }
 
       // try to READ BINARY
-      int sw = readBinary(0, 1, new byte[1]);
+      byte[] b = new byte[1];
+      int sw = readBinary(0, 1, b);
+      
       if (provider != null && sw == 0x6982) {
 
         // VERIFY
-        int kfpc = -1; // unknown
-        while (true) {
-          kfpc = verifyPIN(provider, spec, kid, kfpc);
-          if (kfpc < -1) {
-            return null;
-          } else if (kfpc < 0) {
-            break;
-          }
+        verifyPIN(provider, spec, kid);
+        
+      } else if (sw == 0x9000) {
+        // not expected type
+        if (b[0] != 0x30) {
+          throw new NotActivatedException();
         }
-      } else if (sw != 0x9000) {
+      } else {
         throw new SignatureCardException("READ BINARY failed (SW="
             + Integer.toHexString(sw) + ").");
       }
@@ -221,17 +281,56 @@ public abstract class AbstractSignatureCard implements SignatureCard {
 
   }
 
-  ResponseAPDU transmit(CardChannel channel, CommandAPDU commandAPDU)
+  /**
+   * Transmit the given command APDU using the given card channel.
+   * 
+   * @param channel
+   *          the card channel
+   * @param commandAPDU
+   *          the command APDU
+   * @param logData
+   *          <code>true</code> if command APDU data may be logged, or
+   *          <code>false</code> otherwise
+   * 
+   * @return the corresponding response APDU
+   * 
+   * @throws CardException
+   *           if smart card communication fails
+   */
+  protected ResponseAPDU transmit(CardChannel channel, CommandAPDU commandAPDU, boolean logData)
+      throws CardException {
+    
+    if (log.isTraceEnabled()) {
+      log.trace(commandAPDU 
+          + (logData ? "\n" + toString(commandAPDU.getBytes()) : ""));
+      long t0 = System.currentTimeMillis();
+      ResponseAPDU responseAPDU = channel.transmit(commandAPDU);
+      long t1 = System.currentTimeMillis();
+      log.trace(responseAPDU + "\n[" + (t1 - t0) + "ms] "
+          + (logData ? "\n" + toString(responseAPDU.getBytes()) : ""));
+      return responseAPDU;
+    } else {
+      return channel.transmit(commandAPDU);
+    }
+    
+  }
+
+  /**
+   * Transmit the given command APDU using the given card channel.
+   * 
+   * @param channel the card channel
+   * @param commandAPDU the command APDU
+   * 
+   * @return the corresponding response APDU
+   * 
+   * @throws CardException if smart card communication fails
+   */
+  protected ResponseAPDU transmit(CardChannel channel, CommandAPDU commandAPDU)
       throws CardException {
-    log.trace(commandAPDU + "\n" + toString(commandAPDU.getBytes()));
-    long t0 = System.currentTimeMillis();
-    ResponseAPDU responseAPDU = channel.transmit(commandAPDU);
-    long t1 = System.currentTimeMillis();
-    log.trace(responseAPDU + "\n[" + (t1 - t0) + "ms] "
-        + toString(responseAPDU.getBytes()));
-    return responseAPDU;
+    return transmit(channel, commandAPDU, true);
   }
 
+  
   public void init(Card card) {
     card_ = card;
     ATR atr = card.getATR();
@@ -242,7 +341,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
     }
   }
 
-  CardChannel getCardChannel() {
+  protected CardChannel getCardChannel() {
     return card_.getBasicChannel();
   }
 
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/FileNotFoundException.java b/smcc/src/main/java/at/gv/egiz/smcc/FileNotFoundException.java
new file mode 100644
index 00000000..f96611c2
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/FileNotFoundException.java
@@ -0,0 +1,38 @@
+/*
+* 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.
+*/
+package at.gv.egiz.smcc;
+
+public class FileNotFoundException extends SignatureCardException {
+
+  private static final long serialVersionUID = 1L;
+
+  public FileNotFoundException() {
+  }
+
+  public FileNotFoundException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public FileNotFoundException(String message) {
+    super(message);
+  }
+
+  public FileNotFoundException(Throwable cause) {
+    super(cause);
+  }
+
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/LockedException.java b/smcc/src/main/java/at/gv/egiz/smcc/LockedException.java
new file mode 100644
index 00000000..e00322a0
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/LockedException.java
@@ -0,0 +1,38 @@
+/*
+* 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.
+*/
+package at.gv.egiz.smcc;
+
+public class LockedException extends SignatureCardException {
+
+  private static final long serialVersionUID = 1L;
+
+  public LockedException() {
+  }
+
+  public LockedException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public LockedException(String message) {
+    super(message);
+  }
+
+  public LockedException(Throwable cause) {
+    super(cause);
+  }
+
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/NotActivatedException.java b/smcc/src/main/java/at/gv/egiz/smcc/NotActivatedException.java
new file mode 100644
index 00000000..9181fc5f
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/NotActivatedException.java
@@ -0,0 +1,44 @@
+/*
+* 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.
+*/
+package at.gv.egiz.smcc;
+
+/**
+ * This exception is thrown upon a call to a function that
+ * has not been activated (e.g. not yet activated citizen card). 
+ */
+public class NotActivatedException extends SignatureCardException {
+
+  private static final long serialVersionUID = 1L;
+
+  public NotActivatedException() {
+    super();
+  }
+
+  public NotActivatedException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public NotActivatedException(String message) {
+    super(message);
+  }
+
+  public NotActivatedException(Throwable cause) {
+    super(cause);
+  }
+
+
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
index 79e2663e..99acbc0f 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
@@ -31,12 +31,21 @@ package at.gv.egiz.smcc;
 import java.math.BigInteger;
 import java.util.Arrays;
 
+import javax.smartcardio.Card;
 import javax.smartcardio.CardChannel;
 import javax.smartcardio.CardException;
 import javax.smartcardio.CommandAPDU;
 import javax.smartcardio.ResponseAPDU;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 public class STARCOSCard extends AbstractSignatureCard implements SignatureCard {
+  
+  /**
+   * Logging facility.
+   */
+  private static Log log = LogFactory.getLog(STARCOSCard.class);
 
   public static final byte[] MF = new byte[] { (byte) 0x3F, (byte) 0x00 };
 
@@ -83,7 +92,7 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
 
   public static final byte KID_PIN_SS = (byte) 0x81;
 
-  // Gew�hnliche Signatur (GS)
+  // Gewöhnliche Signatur (GS)
 
   public static final byte[] AID_DF_GS = new byte[] { (byte) 0xd0, (byte) 0x40,
       (byte) 0x00, (byte) 0x00, (byte) 0x17, (byte) 0x00, (byte) 0x13,
@@ -104,31 +113,157 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
       // .
       // )
       (byte) 0x80, (byte) 0x02, (byte) 0x00, // local, key ID, key version
-      (byte) 0x89, (byte) 0x01, // tag, length (algorithm ID)
-      (byte) 0x14 // ECDSA
+      (byte) 0x89, (byte) 0x03, // tag, length (algorithm ID)
+      (byte) 0x13, (byte) 0x35, (byte) 0x10 // ECDSA
   };
 
   public static final byte KID_PIN_CARD = (byte) 0x01;
   
+  /**
+   * Creates an new instance.
+   */
   public STARCOSCard() {
     super("at/gv/egiz/smcc/STARCOSCard");
   }
  
+  /* (non-Javadoc)
+   * @see at.gv.egiz.smcc.SignatureCard#getCertificate(at.gv.egiz.smcc.SignatureCard.KeyboxName)
+   */
   public byte[] getCertificate(KeyboxName keyboxName)
       throws SignatureCardException {
 
+    byte[] aid;
+    byte[] efc;
     if (keyboxName == KeyboxName.SECURE_SIGNATURE_KEYPAIR) {
-      return readTLVFile(AID_DF_SS, EF_C_X509_CH_DS, 2000);
+      aid = AID_DF_SS;
+      efc = EF_C_X509_CH_DS;
     } else if (keyboxName == KeyboxName.CERITIFIED_KEYPAIR) {
-      return readTLVFile(AID_DF_GS, EF_C_X509_CH_AUT, 2000);
+      aid = AID_DF_GS;
+      efc = EF_C_X509_CH_AUT;
     } else {
       throw new IllegalArgumentException("Keybox " + keyboxName
           + " not supported.");
     }
 
+    log.debug("Get certificate for keybox '" + keyboxName.getKeyboxName() + "'" +
+        " (AID=" + toString(aid) + " EF=" + toString(efc) + ").");
+
+    try {
+      Card card = getCardChannel().getCard();
+      try {
+        card.beginExclusive();
+        return readTLVFile(aid, efc, 2000);
+      } catch (FileNotFoundException e) {
+        // if certificate is not present, 
+        // the citizen card application has not been activated
+        throw new NotActivatedException();
+      } finally {
+        card.endExclusive();
+      }
+    } catch (CardException e) {
+      throw new SignatureCardException("Failed to get exclusive card access.");
+    }
+    
+  }
+
+  /* (non-Javadoc)
+   * @see at.gv.egiz.smcc.SignatureCard#getInfobox(java.lang.String, at.gv.egiz.smcc.PINProvider, java.lang.String)
+   */
+  public byte[] getInfobox(String infobox, PINProvider provider, String domainId)
+      throws SignatureCardException {
+  
+    if ("IdentityLink".equals(infobox)) {
+  
+      PINSpec spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
+      
+      try {
+        Card card = getCardChannel().getCard();
+        try {
+          card.beginExclusive();
+          return readTLVFilePIN(AID_INFOBOX, EF_INFOBOX, KID_PIN_CARD,
+              provider, spec, 2000);
+        } catch (FileNotFoundException e) {
+          // if certificate is not present, 
+          // the citizen card application has not been activated
+          throw new NotActivatedException();
+        } finally {
+          card.endExclusive();
+        }
+      } catch (CardException e) {
+        throw new SignatureCardException("Failed to get exclusive card access.");
+      }
+      
+    } else {
+      throw new IllegalArgumentException("Infobox '" + infobox
+          + "' not supported.");
+    }
+  
+  }
+
+  /* (non-Javadoc)
+   * @see at.gv.egiz.smcc.SignatureCard#createSignature(byte[], at.gv.egiz.smcc.SignatureCard.KeyboxName, at.gv.egiz.smcc.PINProvider)
+   */
+  public byte[] createSignature(byte[] hash, KeyboxName keyboxName,
+      PINProvider provider) throws SignatureCardException {
+  
+    if (hash.length != 20) {
+      throw new IllegalArgumentException("Hash value must be of length 20.");
+    }
+  
+    byte[] aid;
+    byte kid;
+    byte[] dst;
+    PINSpec spec;
+    if (KeyboxName.SECURE_SIGNATURE_KEYPAIR.equals(keyboxName)) {
+      aid = AID_DF_SS;
+      kid = KID_PIN_SS;
+      dst = DST_SS;
+      spec = new PINSpec(6, 10, "[0-9]", getResourceBundle().getString("sig.pin.name"));
+  
+    } else if (KeyboxName.CERITIFIED_KEYPAIR.equals(keyboxName)) {
+      aid = AID_DF_GS;
+      kid = KID_PIN_CARD;
+      dst = DST_GS;
+      spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
+  
+    } else {
+      throw new IllegalArgumentException("KeyboxName '" + keyboxName
+          + "' not supported.");
+    }
+  
+    try {
+      Card card = getCardChannel().getCard();
+      try {
+        card.beginExclusive();
+
+        // SELECT MF
+        selectMF();
+        // SELECT DF
+        selectFileAID(aid);
+        // VERIFY
+        verifyPIN(provider, spec, kid);
+        // MSE: SET DST
+        mseSetDST(dst);
+        // PSO: HASH
+        psoHash(hash);
+        // PSO: COMPUTE DIGITAL SIGNATURE
+        return psoComputDigitalSiganture();
+
+
+      } catch (FileNotFoundException e) {
+        // if certificate is not present, 
+        // the citizen card application has not been activated
+        throw new NotActivatedException();
+      } finally {
+        card.endExclusive();
+      }
+    } catch (CardException e) {
+      throw new SignatureCardException("Failed to get exclusive card access.");
+    }
+  
   }
 
-  byte[] selectFileAID(byte[] fid) throws CardException, SignatureCardException {
+  protected byte[] selectFileAID(byte[] fid) throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
     ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0xA4, 0x04,
         0x04, fid, 256));
@@ -150,16 +285,10 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
     }
   }
 
-  byte[] selectFileFID(byte[] fid) throws CardException, SignatureCardException {
+  protected ResponseAPDU selectFileFID(byte[] fid) throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
-    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0xA4, 0x02,
+    return transmit(channel, new CommandAPDU(0x00, 0xA4, 0x02,
         0x04, fid, 256));
-    if (resp.getSW() == 0x6a82) {
-      throw new SignatureCardException("Failed to select file (FID="
-          + toString(fid) + "): SW=" + Integer.toHexString(resp.getSW()) + ".");
-    } else {
-      return resp.getBytes();
-    }
   }
 
   void mseSetDST(byte[] dst) throws CardException, SignatureCardException {
@@ -201,134 +330,86 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
     }
   }
 
-  int verifyPIN(PINProvider pinProvider, PINSpec spec, byte kid, int kfpc)
-      throws CardException, SignatureCardException {
-
+  /**
+   * VERIFY PIN
+   * <p>
+   * If <code>pin</code> is <code>null</code> only the PIN status is checked and
+   * returned.
+   * </p>
+   * 
+   * @param pin
+   *          the PIN (may be <code>null</code>)
+   * @param kid
+   *          the KID of the PIN to be verified
+   * 
+   * @return -1 if VERIFY PIN was successful, or the number of possible retries 
+   * 
+   * @throws CardException
+   *           if communication with the smart card fails.
+   * @throws NotActivatedException
+   *           if the card application has not been activated
+   * @throws SignatureCardException
+   *           if VERIFY PIN fails
+   */
+  private int verifyPIN(String pin, byte kid) throws CardException, SignatureCardException {
+    
     CardChannel channel = getCardChannel();
 
-    // get number of possible retries
-    ResponseAPDU resp = transmit(channel,
-        new CommandAPDU(0x00, 0x20, 0x00, kid));
-    int retries;
-    if (resp.getSW1() == 0x63 && resp.getSW2() >> 4 == 0xc) {
-      retries = resp.getSW2() & 0x0f;
-    } else if (resp.getSW() == 0x6984) {
-      // PIN LCS = "Initilized" (not activated)
-      throw new SignatureCardException(spec.getLocalizedName() + " not set.");
-    } else {
-      throw new SignatureCardException("Failed to get PIN retries: SW="
-          + Integer.toHexString(resp.getSW()));
-    }
-
-    // get PIN
-    String pin = pinProvider.providePIN(spec, retries);
+    ResponseAPDU resp;
     if (pin == null) {
-      // User canceled operation
-      // throw new CancelledException("User canceld PIN entry");
-      return -2;
-    }
-    // PIN length in bytes
-    int len = (int) Math.ceil(pin.length() / 2);
-
-    // BCD encode PIN and marshal PIN block
-    byte[] pinBytes = new BigInteger(pin, 16).toByteArray();
-    byte[] pinBlock = new byte[8];
-    if (len < pinBytes.length) {
-      System.arraycopy(pinBytes, pinBytes.length - len, pinBlock, 1, len);
+      resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid));
     } else {
-      System.arraycopy(pinBytes, 0, pinBlock, len - pinBytes.length + 1,
-          pinBytes.length);
+      // PIN length in bytes
+      int len = (int) Math.ceil(pin.length() / 2);
+
+      // BCD encode PIN and marshal PIN block
+      byte[] pinBytes = new BigInteger(pin, 16).toByteArray();
+      byte[] pinBlock = new byte[8];
+      if (len < pinBytes.length) {
+        System.arraycopy(pinBytes, pinBytes.length - len, pinBlock, 1, len);
+      } else {
+        System.arraycopy(pinBytes, 0, pinBlock, len - pinBytes.length + 1,
+            pinBytes.length);
+      }
+      pinBlock[0] = (byte) (0x20 + len * 2);
+      Arrays.fill(pinBlock, len + 1, 8, (byte) 0xff);
+
+      resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid, pinBlock), false);
+      
     }
-    pinBlock[0] = (byte) (0x20 + len * 2);
-    Arrays.fill(pinBlock, len + 1, 8, (byte) 0xff);
 
-    resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid, pinBlock));
-    if (resp.getSW1() == 0x63 && resp.getSW2() >> 4 == 0xc) {
+    if (resp.getSW() == 0x63c0) {
+      throw new LockedException("PIN locked.");
+    } else if (resp.getSW1() == 0x63 && resp.getSW2() >> 4 == 0xc) {
+      // return number of possible retries
       return resp.getSW2() & 0x0f;
-    } else if (resp.getSW() != 0x9000) {
+    } else if (resp.getSW() == 0x6984) {
+      // PIN LCS = "Initialized" (-> not activated)
+      throw new NotActivatedException("PIN not set.");
+    } else if (resp.getSW() == 0x9000) {
+      return -1; // success
+    } else {
       throw new SignatureCardException("Failed to verify pin: SW="
           + Integer.toHexString(resp.getSW()));
-    } else {
-      return -1;
-    }
-
-  }
-
-  public byte[] createSignature(byte[] hash, KeyboxName keyboxName,
-      PINProvider provider) throws SignatureCardException {
-
-    if (hash.length != 20) {
-      throw new IllegalArgumentException("Hash value must be of length 20");
-    }
-
-    byte[] aid;
-    byte kid;
-    byte[] dst;
-    PINSpec spec;
-    if (KeyboxName.SECURE_SIGNATURE_KEYPAIR.equals(keyboxName)) {
-      aid = AID_DF_SS;
-      kid = KID_PIN_SS;
-      dst = DST_SS;
-      spec = new PINSpec(6, 10, "[0-9]", getResourceBundle().getString("sig.pin.name"));
-
-    } else if (KeyboxName.CERITIFIED_KEYPAIR.equals(keyboxName)) {
-      aid = AID_DF_GS;
-      kid = KID_PIN_CARD;
-      dst = DST_GS;
-      spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
-
-    } else {
-      throw new IllegalArgumentException("KeyboxName '" + keyboxName
-          + "' not supported.");
     }
-
-    try {
-
-      // SELECT MF
-      selectMF();
-      // SELECT DF
-      selectFileAID(aid);
-      // VERIFY
-      int retr = -1; // unknown
-      while (true) {
-        retr = verifyPIN(provider, spec, kid, retr);
-        if (retr < -1) {
-          return null;
-        } else if (retr < 0) {
-          break;
-        }
-      }
-      // MSE: SET DST
-      mseSetDST(dst);
-      // PSO: HASH
-      psoHash(hash);
-      // PSO: COMPUTE DIGITAL SIGNATURE
-      byte[] rs = psoComputDigitalSiganture();
-      return rs;
-
-    } catch (CardException e) {
-      throw new SignatureCardException("Failed to create signature.", e);
-    }
-
+    
   }
+  
+  /* (non-Javadoc)
+   * @see at.gv.egiz.smcc.AbstractSignatureCard#verifyPIN(at.gv.egiz.smcc.PINProvider, at.gv.egiz.smcc.PINSpec, byte, int)
+   */
+  protected void verifyPIN(PINProvider pinProvider, PINSpec spec, byte kid)
+      throws CardException, SignatureCardException {
 
-  public byte[] getInfobox(String infobox, PINProvider provider, String domainId)
-      throws SignatureCardException {
-
-    if ("IdentityLink".equals(infobox)) {
-
-      PINSpec spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
-      try {
-        byte[] res = readTLVFilePIN(AID_INFOBOX, EF_INFOBOX, KID_PIN_CARD,
-            provider, spec, 2000);
-        return res;
-      } catch (Exception e) {
-        throw new SignatureCardException(e);
+    int retries = verifyPIN(null, kid);
+    do {
+      String pin = pinProvider.providePIN(spec, retries);
+      if (pin == null) {
+        // user canceled operation
+        throw new CancelledException("User canceld operation.");
       }
-    } else {
-      throw new IllegalArgumentException("Infobox '" + infobox
-          + "' not supported.");
-    }
+      retries = verifyPIN(pin, kid);
+    } while (retries > 0);
 
   }
 
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
index 68a6f6df..22a66c3f 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
@@ -25,6 +25,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 import java.security.InvalidKeyException;
 import java.security.Key;
 import java.security.KeyStore;
@@ -52,16 +54,20 @@ import org.apache.commons.logging.LogFactory;
  */
 public class SWCard implements SignatureCard {
   
-  private static final String BKU_USER_DIR = ".bku";
+  private static final String BKU_USER_DIR = ".mocca";
 
   private static final String SWCARD_DIR = "smcc";
   
   private static final String KEYSTORE_CERTIFIED_KEYPAIR = "certified.p12";
   
+  private static final String KEYSTORE_PASSWORD_CERTIFIED_KEYPAIR = "certified.pwd";
+  
   private static final String CERTIFICATE_CERTIFIED_KEYPAIR = "certified.cer";
   
   private static final String KEYSTORE_SECURE_KEYPAIR = "secure.p12";
   
+  private static final String KEYSTORE_PASSWORD_SECURE_KEYPAIR = "secure.pwd";
+
   private static final String CERTIFICATE_SECURE_KEYPAIR = "secure.cer";
   
   private static String swCardDir;
@@ -70,8 +76,12 @@ public class SWCard implements SignatureCard {
 
   private KeyStore certifiedKeyStore;
   
+  private String certifiedKeyStorePassword;
+  
   private KeyStore secureKeyStore;
   
+  private String secureKeyStorePassword;
+  
   private Certificate certifiedCertificate;
   
   private Certificate secureCertificate;
@@ -168,7 +178,7 @@ public class SWCard implements SignatureCard {
     }
     
     try {
-      keyStore.load(keyStoreFile, null);
+      keyStore.load(keyStoreFile, password);
     } catch (Exception e) {
       String msg = "Failed to load KeyStore from file '" + fileName + "'.";
       log.info(msg, e);
@@ -176,10 +186,33 @@ public class SWCard implements SignatureCard {
     } 
     
     return keyStore;
-
   
   }
   
+  private String loadKeyStorePassword(String passwordFileName) throws SignatureCardException {
+
+    String fileName = getFileName(passwordFileName);
+    FileInputStream keyStorePasswordFile;
+    try {
+      keyStorePasswordFile = new FileInputStream(fileName);
+    } catch (FileNotFoundException e) {
+      return null;
+    }
+    
+    try {
+      InputStreamReader reader = new InputStreamReader(keyStorePasswordFile, Charset.forName("UTF-8"));
+      StringBuilder sb = new StringBuilder();
+      char b[] = new char[16];
+      for (int l; (l = reader.read(b)) != -1;) {
+        sb.append(b, 0, l);
+      }
+      return sb.toString();
+    } catch (IOException e) {
+      throw new SignatureCardException("Failed to read file '" + passwordFileName + "'.");
+    }
+    
+  }
+  
   private KeyStore getKeyStore(KeyboxName keyboxName, char[] password) throws SignatureCardException {
     
     if (keyboxName == KeyboxName.CERITIFIED_KEYPAIR) {
@@ -198,6 +231,23 @@ public class SWCard implements SignatureCard {
     
   }
   
+  private String getPassword(KeyboxName keyboxName) throws SignatureCardException {
+    
+    if (keyboxName == KeyboxName.CERITIFIED_KEYPAIR) {
+      if (certifiedKeyStorePassword == null) {
+        certifiedKeyStorePassword = loadKeyStorePassword(KEYSTORE_PASSWORD_CERTIFIED_KEYPAIR);
+      }
+      return certifiedKeyStorePassword;
+    } else if (keyboxName == KeyboxName.SECURE_SIGNATURE_KEYPAIR) {
+      if (secureKeyStorePassword == null) {
+        secureKeyStorePassword = loadKeyStorePassword(KEYSTORE_PASSWORD_SECURE_KEYPAIR);
+      }
+      return secureKeyStorePassword;
+    } else {
+      throw new SignatureCardException("Keybox of type '" + keyboxName + "' not supported.");
+    }
+    
+  }
   
   public byte[] getCertificate(KeyboxName keyboxName)
       throws SignatureCardException {
@@ -254,9 +304,21 @@ public class SWCard implements SignatureCard {
   public byte[] createSignature(byte[] hash, KeyboxName keyboxName, PINProvider provider) throws SignatureCardException {
 
     // KeyStore password
-    PINSpec pinSpec = new PINSpec(0, -1, ".", "KeyStore-Password");
-    
-    KeyStore keyStore = getKeyStore(keyboxName, null);
+    String password = getPassword(keyboxName);
+
+    if (password == null) {
+
+      PINSpec pinSpec = new PINSpec(0, -1, ".", "KeyStore-Password");
+      
+      password = provider.providePIN(pinSpec, -1);
+      
+      if (password == null) {
+        return null;
+      }
+      
+    }
+
+    KeyStore keyStore = getKeyStore(keyboxName, password.toCharArray());
 
     PrivateKey privateKey = null;
     
@@ -269,8 +331,7 @@ public class SWCard implements SignatureCard {
           Key key = null;
           while (key == null) {
             try {
-              String pin = provider.providePIN(pinSpec, -1);
-              key = keyStore.getKey(alias, pin.toCharArray());
+              key = keyStore.getKey(alias, password.toCharArray());
             } catch (UnrecoverableKeyException e) {
               log.info("Failed to get Key from KeyStore. Wrong password?", e);
             }
@@ -315,8 +376,6 @@ public class SWCard implements SignatureCard {
 
   @Override
   public void setLocale(Locale locale) {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Not supported yet.");
   }
 
   @Override
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardException.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardException.java
index f2a964fe..f296f3a2 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardException.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardException.java
@@ -34,7 +34,7 @@ public class SignatureCardException extends Exception {
    * 
    */
   private static final long serialVersionUID = 1L;
-
+  
   /**
    * Creates a new instance of this <code>SignatureCardException</code>.
    * 
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java
index 2131a737..777299d9 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java
@@ -28,19 +28,189 @@
 //
 package at.gv.egiz.smcc;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import javax.smartcardio.ATR;
 import javax.smartcardio.Card;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A factory for creating {@link SignatureCard}s from {@link Card}s. 
+ */
 public class SignatureCardFactory {
+  
+  /**
+   * This class represents a supported smart card. 
+   */
+  private class SupportedCard {
+    
+    /**
+     * The ATR pattern. 
+     */
+    private byte[] atrPattern;
+    
+    /**
+     * The ATR mask.
+     */
+    private byte[] atrMask;
+    
+    /**
+     * The implementation class.
+     */
+    private String impl;
 
-  public static SignatureCardFactory getInstance() {
-    return new SignatureCardFactory();
+    /**
+     * Creates a new SupportedCard instance with the given ATR pattern and mask
+     * und the corresponding implementation class.
+     * 
+     * @param atrPattern
+     *          the ATR pattern
+     * @param atrMask
+     *          the ATR mask
+     * @param implementationClass
+     *          the name of the implementation class
+     * 
+     * @throws NullPointerException
+     *           if <code>atrPattern</code> or <code>atrMask</code> is
+     *           <code>null</code>.
+     * @throws IllegalArgumentException
+     *           if the lengths of <code>atrPattern</code> and
+     *           <code>atrMask</code> of not equal.
+     */
+    public SupportedCard(byte[] atrPattern, byte[] atrMask, String implementationClass) {
+      if (atrPattern.length != atrMask.length) {
+        throw new IllegalArgumentException("Length of 'atr' and 'mask' must be equal.");
+      }
+      this.atrPattern = atrPattern;
+      this.atrMask = atrMask;
+      this.impl = implementationClass;
+    }
+
+    /**
+     * Returns true if the given ATR matches the ATR pattern and mask this
+     * SupportedCard object.
+     * 
+     * @param atr
+     *          the ATR
+     * 
+     * @return <code>true</code> if the given ATR matches the ATR pattern and
+     *         mask of this SupportedCard object, or <code>false</code>
+     *         otherwise.
+     */
+    public boolean matches(ATR atr) {
+
+      byte[] bytes = atr.getBytes();
+      if (bytes == null) {
+        return false;
+      }
+      if (bytes.length < atrMask.length) {
+        // we cannot test for equal length here, as we get ATRs with 
+        // additional bytes on systems using PCSClite (e.g. linux and OS X) sometimes
+        return false;
+      }
+
+      int l = Math.min(atrMask.length, bytes.length);
+      for (int i = 0; i < l; i++) {
+        if ((bytes[i] & atrMask[i]) != atrPattern[i]) {
+          return false;
+        }
+      }
+      return true;
+      
+    }
+
+    /**
+     * @return the corresponding implementation class.
+     */
+    public String getImplementationClassName() {
+      return impl;
+    }
+    
+  }
+
+  /**
+   * Logging facility.
+   */
+  private static Log log = LogFactory.getLog(SignatureCardFactory.class);
+  
+  /**
+   * The instance to be returned by {@link #getInstance()}.
+   */
+  private static SignatureCardFactory instance;
+  
+  /**
+   * The list of supported smart cards.
+   */
+  private List<SupportedCard> supportedCards;
+  
+  /**
+   * @return an instance of this SignatureCardFactory.
+   */
+  public static synchronized SignatureCardFactory getInstance() {
+    if (instance == null) {
+      instance = new SignatureCardFactory();
+    }
+    return instance;
   }
 
+  /**
+   * Private constructor.
+   */
   private SignatureCardFactory() {
+    
+    supportedCards = new ArrayList<SupportedCard>();
+
+    // e-card
+    supportedCards.add(new SupportedCard(
+        // ATR  (3b:bd:18:00:81:31:fe:45:80:51:02:00:00:00:00:00:00:00:00:00:00:00)
+        new byte[] {
+            (byte) 0x3b, (byte) 0xbd, (byte) 0x18, (byte) 0x00, (byte) 0x81, (byte) 0x31, (byte) 0xfe, (byte) 0x45, 
+            (byte) 0x80, (byte) 0x51, (byte) 0x02, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, 
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 
+        },
+        // mask (ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:00:00:00:00:00:00:00:00:00:00:00)
+        new byte[] {
+            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, 
+            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, 
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 
+        },
+        "at.gv.egiz.smcc.STARCOSCard"));
 
+    // a-sign premium
+    supportedCards.add(new SupportedCard(
+        // ATR  (3b:bf:11:00:81:31:fe:45:45:50:41:00:00:00:00:00:00:00:00:00:00:00:00:00)
+        new byte[] {
+            (byte) 0x3b, (byte) 0xbf, (byte) 0x11, (byte) 0x00, (byte) 0x81, (byte) 0x31, (byte) 0xfe, (byte) 0x45, 
+            (byte) 0x45, (byte) 0x50, (byte) 0x41, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, 
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 
+        },
+        // mask (ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:00:00:00:00:00:00:00:00:00:00:00:00:00)
+        new byte[] {
+            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, 
+            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, 
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00
+        },
+        "at.gv.egiz.smcc.ACOSCard"));
+    
   }
 
+  /**
+   * Creates a SignatureCard instance with the given smart card.
+   * 
+   * @param card
+   *          the smart card, or <code>null</code> if a software card should be
+   *          created
+   * 
+   * @return a SignatureCard instance
+   * 
+   * @throws CardNotSupportedException
+   *           if no implementation of the given <code>card</code> could be
+   *           found
+   */
   public SignatureCard createSignatureCard(Card card)
       throws CardNotSupportedException {
     
@@ -51,31 +221,34 @@ public class SignatureCardFactory {
     }
 
     ATR atr = card.getATR();
-    byte[] historicalBytes = atr.getHistoricalBytes();
-    if(historicalBytes == null || historicalBytes.length < 3) {
-      throw new CardNotSupportedException("Card not supported: ATR=" + toString(atr.getBytes()));
+    Iterator<SupportedCard> cards = supportedCards.iterator();
+    while (cards.hasNext()) {
+      SupportedCard supportedCard = cards.next();
+      if(supportedCard.matches(atr)) {
+        
+        ClassLoader cl = SignatureCardFactory.class.getClassLoader();
+        SignatureCard sc;
+        try {
+          Class<?> scClass = cl.loadClass(supportedCard.getImplementationClassName());
+          sc = (SignatureCard) scClass.newInstance();
+          sc.init(card);
+          return sc;
+
+        } catch (ClassNotFoundException e) {
+          log.warn("Cannot find signature card implementation class.", e);
+          throw new CardNotSupportedException("Cannot find signature card implementation class.", e);
+        } catch (InstantiationException e) {
+          log.warn("Failed to instantiate signature card implementation.", e);
+          throw new CardNotSupportedException("Failed to instantiate signature card implementation.", e);
+        } catch (IllegalAccessException e) {
+          log.warn("Failed to instantiate signature card implementation.", e);
+          throw new CardNotSupportedException("Failed to instantiate signature card implementation.", e);
+        }
+        
+      }
     }
     
-    int t = ((0xFF & (int) historicalBytes[0]) << 16) + 
-      ((0xFF & (int) historicalBytes[1]) << 8) + 
-      (0xFF & (int) historicalBytes[2]);
-
-    SignatureCard sCard;
-    switch (t) {
-      case 0x455041 :
-      case 0x4D4341 :
-        sCard = new ACOSCard();
-        break;
-
-      case 0x805102 :
-        sCard = new STARCOSCard();
-        break;
-
-      default :
-        throw new CardNotSupportedException("Card not supported: ATR=" + toString(atr.getBytes()));
-    }
-    sCard.init(card);
-    return sCard;
+    throw new CardNotSupportedException("Card not supported: ATR=" + toString(atr.getBytes()));
     
   }
   
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java b/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java
index ffffd3af..b70b44a7 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java
@@ -142,7 +142,8 @@ public class SmartCardIO {
       for (CardTerminal terminal : cardTerminals_.list(CardTerminals.State.CARD_INSERTION)) {
 
         Card card = null;
-        try {
+        try {
+          log.trace("Trying to connect to card.");
           // try to connect to card
           card = terminal.connect("*");
         } catch (CardException e) {
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java
new file mode 100644
index 00000000..b921a5d5
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java
@@ -0,0 +1,92 @@
+/*
+* 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.
+*/
+package at.gv.egiz.smcc;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Locale;
+
+import javax.smartcardio.CardException;
+import javax.smartcardio.CommandAPDU;
+import javax.smartcardio.ResponseAPDU;
+
+import at.gv.egiz.smcc.SignatureCard.KeyboxName;
+import at.gv.egiz.smcc.util.SMCCHelper;
+
+public class STARCOSCardTest {
+
+  /**
+   * @param args
+   * @throws CardException 
+   * @throws NoSuchAlgorithmException 
+   */
+  public static void main(String[] args) throws CardException, NoSuchAlgorithmException {
+    
+    SMCCHelper helper = new SMCCHelper();
+    while (helper.getResultCode() != SMCCHelper.CARD_FOUND) {
+      System.out.println("Did not get a signature card ... " + helper.getResultCode());
+      helper.update();
+      try {
+        Thread.sleep(1000);
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      }
+    }
+    
+    SignatureCard signatureCard = helper.getSignatureCard(Locale.getDefault());
+    
+    System.out.println("Found '" + signatureCard + "'.");
+    
+    try {
+//      signatureCard.getCertificate(KeyboxName.SECURE_SIGNATURE_KEYPAIR);
+//      signatureCard.getCertificate(KeyboxName.CERITIFIED_KEYPAIR);
+//      signatureCard.getInfobox("IdentityLink", new CommandLinePINProvider(), null);
+      MessageDigest messageDigest = MessageDigest.getInstance("SHA-1");
+      byte[] digest = messageDigest.digest("test".getBytes());
+      signatureCard.createSignature(digest, KeyboxName.CERITIFIED_KEYPAIR, new CommandLinePINProvider());
+    } catch (SignatureCardException e) {
+      e.printStackTrace();
+    }
+
+  }
+  
+  private static class CommandLinePINProvider implements PINProvider {
+
+    @Override
+    public String providePIN(PINSpec spec, int retries) {
+      
+      InputStreamReader inputStreamReader = new InputStreamReader(System.in);
+      BufferedReader in = new BufferedReader(inputStreamReader);
+      
+      System.out.print("Enter " + spec.getLocalizedName() + " ["
+          + spec.getMinLength() + "-" + spec.getMaxLength() + "] (" + retries
+          + " retries):");
+      
+      try {
+        return in.readLine();
+      } catch (IOException e) {
+        return null;
+      }
+      
+    }
+    
+  }
+
+}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
index b48d6d50..cfac8cf5 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
@@ -20,6 +20,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.LockedException;
+import at.gv.egiz.smcc.NotActivatedException;
 import at.gv.egiz.smcc.PINProvider;
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.smcc.SignatureCard;
@@ -100,6 +102,12 @@ public class InfoBoxReadRequestHandler extends AbstractRequestHandler implements
           stalResp.setInfoboxValue(resp);
           return stalResp;
         }
+      } catch (NotActivatedException e) {
+        log.info("Citizen card not activated.", e);
+        return new ErrorResponse(6001);
+      } catch (LockedException e) {
+        log.info("Citizen card locked.", e);
+        return new ErrorResponse(6001);
       } catch (CancelledException cx) {
         log.debug("User cancelled request", cx);
         return new ErrorResponse(6001);
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index dcd12b02..466ec2a9 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -32,6 +32,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.LockedException;
+import at.gv.egiz.smcc.NotActivatedException;
 import at.gv.egiz.smcc.PINProvider;
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.smcc.SignatureCard;
@@ -78,7 +80,7 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
                 String jceName = JCEAlgorithmNames.getJCEHashName(signatureMethod);
                 if (jceName == null) {
                     log.error("Hash algorithm not supported:");
-                    return new ErrorResponse(1000);
+                    return new ErrorResponse(4006);
                 }
                 MessageDigest md = MessageDigest.getInstance(jceName);
                 md.update(signReq.getSignedInfo());
@@ -90,6 +92,12 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
                 SignResponse stalResp = new SignResponse();
                 stalResp.setSignatureValue(resp);
                 return stalResp;
+            } catch (NotActivatedException e) {
+              log.info("Citizen card not activated.", e);
+              return new ErrorResponse(6001);
+            } catch (LockedException e) {
+              log.info("Citizen card locked.", e);
+              return new ErrorResponse(6001);
             } catch (CancelledException cx) {
                 log.debug("User cancelled request");
                 return new ErrorResponse(6001);
-- 
cgit v1.2.3


From 036dd1a8054c5dc818d01e238eb9480d67da478d Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 30 Oct 2008 17:43:40 +0000
Subject: Help Icon

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@130 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    | 158 +++++++++-------
 .../at/gv/egiz/bku/online/applet/BKUWorker.java    |  24 +--
 .../bku/online/applet/ExternalHelpListener.java    |  70 ++++++++
 BKUApplet/src/main/resources/simplelog.properties  |   2 +-
 BKUApplet/src/test/resources/appletTest.html       |   9 +-
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 140 ++++++++++-----
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |  14 +-
 .../java/at/gv/egiz/bku/gui/HelpMouseListener.java |  33 ++++
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    | 200 +++++++++++++++------
 .../at/gv/egiz/bku/gui/Messages.properties         |  10 +-
 BKUCommonGUI/src/main/resources/images/help.png    | Bin 0 -> 746 bytes
 BKUOnline/src/main/webapp/appletPage.jsp           |   7 +-
 12 files changed, 465 insertions(+), 202 deletions(-)
 create mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalHelpListener.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpMouseListener.java
 create mode 100644 BKUCommonGUI/src/main/resources/images/help.png

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 97b5869f..470534da 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -21,6 +21,8 @@ import java.net.URL;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.net.ssl.HttpsURLConnection;
 import javax.swing.JApplet;
 
@@ -36,79 +38,105 @@ import at.gv.egiz.bku.gui.BKUGUIFactory;
  */
 public class BKUApplet extends JApplet {
 
-    private static Log log = LogFactory.getLog(BKUApplet.class);
-    public static final String GUI_STYLE = "GuiStyle";
-    public final static String RESOURCE_BUNDLE_BASE = "at/gv/egiz/bku/online/applet/Messages";
-    public final static String LOCALE_PARAM_KEY = "Locale";
-    public final static String LOGO_URL_KEY = "LogoURL";
-    public final static String WSDL_URL = "WSDL_URL";
-    public static final String HASHDATA_DISPLAY = "HashDataDisplay";
-    public final static String HASHDATA_URL = "HashDataURL";
-    public final static String SESSION_ID = "SessionID";
-    public static final String BACKGROUND_PARAM = "Background";
-    public static final String REDIRECT_URL = "RedirectURL";
-    public static final String REDIRECT_TARGET = "RedirectTarget";
-    
-    public static final String HASHDATA_DISPLAY_INTERNAL = "internal";
-    
-    protected ResourceBundle resourceBundle;
-    protected BKUWorker worker;
-    protected Thread workerThread;
+  private static Log log = LogFactory.getLog(BKUApplet.class);
+  public static final String GUI_STYLE = "GuiStyle";
+  public final static String RESOURCE_BUNDLE_BASE = "at/gv/egiz/bku/online/applet/Messages";
+  public final static String LOCALE_PARAM_KEY = "Locale";
+  public final static String LOGO_URL_KEY = "LogoURL";
+  public final static String WSDL_URL = "WSDL_URL";
+  public static final String HASHDATA_DISPLAY = "HashDataDisplay";
+  public final static String HASHDATA_URL = "HashDataURL";
+  public final static String HELP_URL = "HelpURL";
+  public final static String SESSION_ID = "SessionID";
+  public static final String BACKGROUND_PARAM = "Background";
+  public static final String REDIRECT_URL = "RedirectURL";
+  public static final String REDIRECT_TARGET = "RedirectTarget";
+  public static final String HASHDATA_DISPLAY_INTERNAL = "internal";
+  protected ResourceBundle resourceBundle;
+  protected BKUWorker worker;
+  protected Thread workerThread;
 
-    public BKUApplet() {
-    }
+  public BKUApplet() {
+  }
 
-    public void init() {
-      log.info("Welcome to MOCCA\n");
-        log.debug("Called init()");
-        HttpsURLConnection.setDefaultSSLSocketFactory(InternalSSLSocketFactory.getInstance());
-        String localeString = getMyAppletParameter(LOCALE_PARAM_KEY);
-        if (localeString != null) {
-            resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE_BASE,
+  @Override
+  public void init() {
+    log.info("Welcome to MOCCA\n");
+    log.debug("Called init()");
+    HttpsURLConnection.setDefaultSSLSocketFactory(InternalSSLSocketFactory.getInstance());
+    String localeString = getMyAppletParameter(LOCALE_PARAM_KEY);
+    if (localeString != null) {
+      resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE_BASE,
               new Locale(localeString));
-        } else {
-            resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE_BASE);
-        }
-        String backgroundString = getMyAppletParameter(BACKGROUND_PARAM);
-        URL background = null;
-        if (backgroundString != null) {
-          try {
-            background = new URL(backgroundString);
-          } catch (MalformedURLException ex) {
-            log.warn(ex.getMessage() + ", using default background");
-          }
-        }
-        String guiStyle = getMyAppletParameter(GUI_STYLE);
-        BKUGUIFacade gui = BKUGUIFactory.createGUI(guiStyle);
-        gui.init(getContentPane(), localeString, background);
-        worker = new BKUWorker(gui, this, resourceBundle);
+    } else {
+      resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE_BASE);
     }
-
-    public void start() {
-        log.debug("Called start()");
-        workerThread = new Thread(worker);
-        workerThread.start();
+    String backgroundString = getMyAppletParameter(BACKGROUND_PARAM);
+    URL background = null;
+    if (backgroundString != null) {
+      try {
+        background = new URL(backgroundString);
+      } catch (MalformedURLException ex) {
+        log.warn(ex.getMessage() + ", using default background");
+      }
     }
-
-    public void stop() {
-        log.debug("Called stop()");
-        if ((workerThread != null) && (workerThread.isAlive())) {
-            workerThread.interrupt();
-        }
+    String guiStyle = getMyAppletParameter(GUI_STYLE);
+    BKUGUIFacade gui = BKUGUIFactory.createGUI(guiStyle);
+    ExternalHelpListener helpListener = null;
+    try {
+      URL helpURL = getMyAppletParameterURL(HELP_URL);
+      helpListener = new ExternalHelpListener(getAppletContext(), helpURL, localeString);
+    } catch (MalformedURLException ex) {
+      log.error("invalid help URL: " + ex.getMessage());
     }
+    gui.init(getContentPane(), localeString, background, helpListener);
+    worker = new BKUWorker(gui, this, resourceBundle);
+  }
 
-    public void destroy() {
-        log.debug("Called destroy()");
+  @Override
+  public void start() {
+    log.debug("Called start()");
+    workerThread = new Thread(worker);
+    workerThread.start();
+  }
+
+  @Override
+  public void stop() {
+    log.debug("Called stop()");
+    if ((workerThread != null) && (workerThread.isAlive())) {
+      workerThread.interrupt();
     }
+  }
+
+  @Override
+  public void destroy() {
+    log.debug("Called destroy()");
+  }
+
+  /**
+   * Applet configuration parameters
+   * 
+   * @param paramKey
+   * @return
+   */
+  String getMyAppletParameter(String paramKey) {
+    log.info("Getting parameter: " + paramKey + ": " + getParameter(paramKey));
+    return getParameter(paramKey);
+  }
 
-    /**
-     * Applet configuration parameters
-     * 
-     * @param paramKey
-     * @return
-     */
-    public String getMyAppletParameter(String paramKey) {
-        log.info("Getting parameter: " + paramKey + ": " + getParameter(paramKey));
-        return getParameter(paramKey);
+  URL getMyAppletParameterURL(String param) throws MalformedURLException {
+    String hashDataParam = getMyAppletParameter(param); //BKUApplet.HASHDATA_URL);
+    if (hashDataParam != null) {
+      URL codebase = getCodeBase();
+      try {
+        return new URL(codebase, hashDataParam);
+      } catch (MalformedURLException ex) {
+        log.error("Paremeter " + param + " is not a valid URL.", ex);
+        throw new MalformedURLException(ex.getMessage());
+      }
+    } else {
+      log.error("Paremeter " + param + " not set");
+      throw new MalformedURLException(param + " not set");
     }
+  }
 }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
index f708826d..78f3dc12 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
@@ -24,6 +24,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.ResourceBundle;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.xml.namespace.QName;
 
 import org.apache.commons.logging.Log;
@@ -46,6 +48,7 @@ import at.gv.egiz.stal.service.types.ObjectFactory;
 import at.gv.egiz.stal.service.types.RequestType;
 import at.gv.egiz.stal.service.types.ResponseType;
 import at.gv.egiz.stal.util.STALTranslator;
+import javax.naming.ConfigurationException;
 
 public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
     ActionListener, SMCCSTALRequestHandler {
@@ -68,7 +71,7 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
   public BKUWorker(BKUGUIFacade gui, BKUApplet parent,
       ResourceBundle errorMessageBundle) {
     if ((gui == null) || (parent == null) || (errorMessageBundle == null)) {
-      throw new NullPointerException("Parameter must not be set to null");
+        throw new NullPointerException("Parameter must not be set to null");
     }
     this.gui = gui;
     this.parent = parent;
@@ -117,23 +120,6 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
     return stal.getSTALPort();
   }
   
-  private URL getHashDataURL() throws MalformedURLException {
-    String hashDataParam = parent.getMyAppletParameter(BKUApplet.HASHDATA_URL);
-    URL codebase = parent.getCodeBase();
-    if (hashDataParam != null) {
-      try {
-        return new URL(codebase, hashDataParam);
-//        log.debug("Found HashDataInputServlet URL: " + hashDataURL);
-      } catch (MalformedURLException ex) {
-        log.fatal("Paremeter " + BKUApplet.HASHDATA_URL + " is not a vailid URL.", ex);
-        throw new MalformedURLException(ex.getMessage());
-      }
-    } else {
-      log.fatal("Paremeter " + BKUApplet.HASHDATA_URL + " not set");
-      throw new MalformedURLException(BKUApplet.HASHDATA_URL + " not set");
-    }
-  }
-
   @Override
   public void run() {
     gui.showWelcomeDialog();
@@ -165,7 +151,7 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
         log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
         addRequestHandler(at.gv.egiz.stal.SignRequest.class, new WebServiceSignRequestHandler(sessionId, stalPort));
       } else { //if (HASHDATADISPLAY_EXTERNAL.equals(displayStyle)) {
-        URL hashDataURL = getHashDataURL();
+        URL hashDataURL = parent.getMyAppletParameterURL(BKUApplet.HASHDATA_URL);
         log.debug("register SignRequestHandler for HashDataURL " + hashDataURL);
         addRequestHandler(at.gv.egiz.stal.SignRequest.class, new ExternalDisplaySignRequestHandler(parent.getAppletContext(), hashDataURL));
       }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalHelpListener.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalHelpListener.java
new file mode 100644
index 00000000..4d6d5851
--- /dev/null
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalHelpListener.java
@@ -0,0 +1,70 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package at.gv.egiz.bku.online.applet;
+
+import java.applet.AppletContext;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.net.MalformedURLException;
+import java.net.URL;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author clemens
+ */
+public class ExternalHelpListener implements ActionListener {
+
+  protected final static Log log = LogFactory.getLog(ExternalHelpListener.class);
+  protected AppletContext ctx;
+  protected String helpURLBase;
+  protected String locale;
+
+  public ExternalHelpListener(AppletContext ctx, URL helpURL, String locale) {
+    if (ctx == null) {
+      throw new RuntimeException("no applet context provided");
+    }
+    if (helpURL == null || "".equals(helpURL)) {
+      throw new RuntimeException("no help URL provided");
+    }
+    this.ctx = ctx;
+    this.helpURLBase = helpURL.toString();
+    this.locale = locale;
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    log.debug("received help action: " + e.getActionCommand());
+    URL helpURL;
+    try {
+      String urlString = helpURLBase;
+      if (locale != null) {
+        urlString = appendParameter(urlString, "locale", locale);
+      } 
+      if (e.getActionCommand() != null && !"".equals(e.getActionCommand())) {
+        urlString = appendParameter(urlString, "topic", e.getActionCommand());
+      }
+      helpURL = new URL(urlString);
+    } catch (MalformedURLException ex) {
+      try {
+        log.error("failed to create help URL: " + ex.getMessage());
+        helpURL = new URL(helpURLBase);
+      } catch (MalformedURLException ex1) {
+        log.error("failed to create default help URL, requested help will not be displayed");
+        return;
+      }
+    }
+    ctx.showDocument(helpURL, "_blank");
+  }
+  
+  private String appendParameter(String url, String paramName, String paramValue) {
+    if (url.indexOf('?') < 0) {
+      return url + "?" + paramName + "=" + paramValue;
+    } else {
+      return url + "&" + paramName + "=" + paramValue;
+    }
+  }
+}
diff --git a/BKUApplet/src/main/resources/simplelog.properties b/BKUApplet/src/main/resources/simplelog.properties
index 51be76a8..d62508cf 100644
--- a/BKUApplet/src/main/resources/simplelog.properties
+++ b/BKUApplet/src/main/resources/simplelog.properties
@@ -15,7 +15,7 @@
 
 # Logging detail level,
 # Must be one of ("trace", "debug", "info", "warn", "error", or "fatal").
-org.apache.commons.logging.simplelog.defaultlog=trace
+org.apache.commons.logging.simplelog.defaultlog=debug
 # Logs the Log instance used
 org.apache.commons.logging.simplelog.showlogname=true
 #Logs the class name with package(or Path)
diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
index 472000de..daf8445b 100644
--- a/BKUApplet/src/test/resources/appletTest.html
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -19,14 +19,15 @@
     <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=190 height=130>
-              <param name="GuiStyle" value="simple"/>
+              width=300 height=200>
+              <param name="GuiStyle" value="advanced"/>
               <param name="Background" value="http://localhost:3495/DemoIntegration/mocca_background.png"/>
-              <param name="WSDL_URL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/stal?wsdl"/>
+              <param name="WSDL_URL" value="http://localhost:3495/stal?wsdl"/>
+              <param name="HelpURL" value="http://localhost:3495/help"/>
               <param name="HashDataDisplay" value="internal"/>
               <!--param name="HashDataURL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/hashDataInput"/-->
               <param name="SessionId" value="TestSession"/>
-              <param name="RedirectURL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/bkuResult"/>
+              <param name="RedirectURL" value="http://localhost:3495/bkuResult"/>
       </applet>
     </center>
   </body>
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 7e0f0447..27841d1c 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
@@ -41,6 +41,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
 import javax.swing.GroupLayout;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JFileChooser;
@@ -66,6 +67,8 @@ public class BKUGUI implements BKUGUIFacade {
     
     private static final Log log = LogFactory.getLog(BKUGUI.class);
     
+    protected HelpMouseListener helpListener;
+    
     protected Container contentPane;
     protected ResourceBundle messages;
     /** left and right side main panels */
@@ -89,7 +92,7 @@ public class BKUGUI implements BKUGUIFacade {
      * @param localeString may be null
      */
     @Override
-    public void init(final Container contentPane, String localeString, final URL background) {
+    public void init(final Container contentPane, String localeString, final URL background, ActionListener helpListener) {
 
         if (localeString != null) {
             messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, new Locale(localeString));
@@ -98,6 +101,7 @@ public class BKUGUI implements BKUGUIFacade {
         }
 
         this.contentPane = contentPane;
+        registerHelpListener(helpListener);
 
         try {
 
@@ -175,6 +179,11 @@ public class BKUGUI implements BKUGUIFacade {
         titleLabel.setFont(titleLabel.getFont().deriveFont(titleLabel.getFont().getStyle() |
           java.awt.Font.BOLD, titleLabel.getFont().getSize() + 2));
         
+        JLabel helpLabel = new JLabel();
+        helpLabel.setIcon(new ImageIcon(getClass().getResource(HELP_IMG))); 
+        helpLabel.addMouseListener(helpListener);
+        helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+
         JButton b = new JButton();
         b.setText(messages.getString(BUTTON_CANCEL));
         if (b.getPreferredSize().width > buttonSize)
@@ -204,15 +213,17 @@ public class BKUGUI implements BKUGUIFacade {
         
         GroupLayout headerPanelLayout = new GroupLayout(headerPanel);
         headerPanel.setLayout(headerPanelLayout);
-//
+
         headerPanelLayout.setHorizontalGroup(
           headerPanelLayout.createSequentialGroup()
-            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
-            .addContainerGap());
+            .addComponent(titleLabel) 
+            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+            .addComponent(helpLabel));
         headerPanelLayout.setVerticalGroup(
-          headerPanelLayout.createSequentialGroup()
-            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
-
+          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) //SequentialGroup()
+            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
+            .addComponent(helpLabel));
+            
 
         GroupLayout contentPanelLayout = new GroupLayout(contentPanel);
         contentPanel.setLayout(contentPanelLayout);
@@ -234,7 +245,7 @@ public class BKUGUI implements BKUGUIFacade {
             .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)
-            .addContainerGap()); //);
+            .addContainerGap());
     }
 
     @Override
@@ -291,6 +302,8 @@ public class BKUGUI implements BKUGUIFacade {
 
                 titleLabel.setText(messages.getString(TITLE_WELCOME));
 
+                helpListener.setHelpTopic(HELP_WELCOME);
+                
                 JLabel welcomeMsgLabel = new JLabel();
                 welcomeMsgLabel.setFont(welcomeMsgLabel.getFont().deriveFont(welcomeMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 welcomeMsgLabel.setText(messages.getString(MESSAGE_WAIT));
@@ -300,10 +313,10 @@ public class BKUGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
-                  .addComponent(welcomeMsgLabel));
+                    .addComponent(welcomeMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-                  .addComponent(welcomeMsgLabel));
+                    .addComponent(welcomeMsgLabel));
 
                 contentPanel.validate();
 
@@ -328,6 +341,8 @@ public class BKUGUI implements BKUGUIFacade {
 
                 titleLabel.setText(messages.getString(TITLE_INSERTCARD));
 
+                helpListener.setHelpTopic(HELP_INSERTCARD);
+
                 JLabel insertCardMsgLabel = new JLabel();
                 insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 insertCardMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD));
@@ -385,6 +400,8 @@ public class BKUGUI implements BKUGUIFacade {
 
                 titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
 
+                helpListener.setHelpTopic(HELP_CARDNOTSUPPORTED);
+              
                 JLabel insertCardMsgLabel = new JLabel();
                 insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 insertCardMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD));
@@ -476,10 +493,12 @@ public class BKUGUI implements BKUGUIFacade {
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                   String infoPattern = messages.getString(MESSAGE_ENTERPIN);
                   infoLabel.setText(MessageFormat.format(infoPattern, new Object[] {pinSpec.getLocalizedName()}));
+                  helpListener.setHelpTopic(HELP_CARDPIN);
                 } else {
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
                   infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
                   infoLabel.setForeground(ERROR_COLOR);
+                  helpListener.setHelpTopic(HELP_RETRY);
                 }
                 
                 JLabel pinsizeLabel = new JLabel();
@@ -496,7 +515,7 @@ public class BKUGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addComponent(infoLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                      .addComponent(infoLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                     .addGroup(mainPanelLayout.createSequentialGroup()
                       .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                       .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
@@ -506,13 +525,13 @@ public class BKUGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-                        .addComponent(infoLabel)
-                        .addGap(infoLabel.getFont().getSize())
-                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                            .addComponent(cardPinLabel)
-                            .addComponent(pinField))
-                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(pinsizeLabel));
+                      .addComponent(infoLabel)
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                        .addComponent(cardPinLabel)
+                        .addComponent(pinField))
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addComponent(pinsizeLabel));
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
@@ -628,10 +647,12 @@ public class BKUGUI implements BKUGUIFacade {
                           hashdataListener.actionPerformed(e);
                       }
                   });
+                  helpListener.setHelpTopic(HELP_SIGNPIN);
                 } else {
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
                   infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
                   infoLabel.setForeground(ERROR_COLOR);
+                  helpListener.setHelpTopic(HELP_RETRY);
                 }
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
@@ -640,22 +661,22 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                       .addComponent(infoLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                      .addGroup(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(pinsizeLabel))));
+                    .addGroup(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(pinsizeLabel))));
 
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
                         .addComponent(infoLabel)
-                        .addGap(infoLabel.getFont().getSize())
-                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                            .addComponent(signPinLabel)
-                            .addComponent(pinField))
-                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(pinsizeLabel));
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                        .addComponent(signPinLabel)
+                        .addComponent(pinField))
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addComponent(pinsizeLabel));
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
@@ -695,6 +716,8 @@ public class BKUGUI implements BKUGUIFacade {
 
                 titleLabel.setText(messages.getString(TITLE_ERROR));
 
+                helpListener.setHelpTopic(errorMsgKey);
+                
                 String errorMsgPattern = messages.getString(errorMsgKey);
                 String errorMsg = MessageFormat.format(errorMsgPattern, errorMsgParams);
                 
@@ -708,10 +731,10 @@ public class BKUGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
-                  .addComponent(errorMsgLabel));
+                    .addComponent(errorMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-                  .addComponent(errorMsgLabel));
+                    .addComponent(errorMsgLabel));
 
                 JButton okButton = new JButton();
                 okButton.setText(messages.getString(BUTTON_OK));
@@ -751,6 +774,8 @@ public class BKUGUI implements BKUGUIFacade {
 
           titleLabel.setText(messages.getString(TITLE_ERROR));
 
+          helpListener.setHelpTopic(errorMsgKey);
+          
           String errorMsgPattern = messages.getString(errorMsgKey);
           String errorMsg = MessageFormat.format(errorMsgPattern, errorMsgParams);
 
@@ -764,10 +789,10 @@ public class BKUGUI implements BKUGUIFacade {
 
           mainPanelLayout.setHorizontalGroup(
             mainPanelLayout.createSequentialGroup()
-            .addComponent(errorMsgLabel));
+              .addComponent(errorMsgLabel));
           mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createSequentialGroup()
-            .addComponent(errorMsgLabel));
+              .addComponent(errorMsgLabel));
 
           contentPanel.validate();
         }
@@ -791,6 +816,8 @@ public class BKUGUI implements BKUGUIFacade {
 
 //                titleLabel.setText(messages.getString(TITLE_WAIT));
 
+                helpListener.setHelpTopic(HELP_WAIT);
+                
                 JLabel waitMsgLabel = new JLabel();
                 waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 if (waitMessage != null) {
@@ -804,10 +831,10 @@ public class BKUGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createSequentialGroup()
-                  .addComponent(waitMsgLabel));
+                    .addComponent(waitMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-                  .addComponent(waitMsgLabel));
+                    .addComponent(waitMsgLabel));
 
                 contentPanel.validate();
             }
@@ -883,6 +910,8 @@ public class BKUGUI implements BKUGUIFacade {
 
           titleLabel.setText(messages.getString(TITLE_HASHDATA));
 
+          helpListener.setHelpTopic(HELP_HASHDATA);
+
           JLabel refIdLabel = new JLabel();
           refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
           refIdLabel.setText(messages.getString(MESSAGE_HASHDATA)); //MessageFormat.format(refIdLabelPattern, new Object[]{refId}));
@@ -904,14 +933,14 @@ public class BKUGUI implements BKUGUIFacade {
 
           mainPanelLayout.setHorizontalGroup(
              mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(refIdLabel)
-                      .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
+                .addComponent(refIdLabel)
+              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
 
           mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createSequentialGroup()
-                  .addComponent(refIdLabel)
-                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                  .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
+                .addComponent(refIdLabel)
+              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
 
           JButton backButton = new JButton();
           backButton.setText(messages.getString(BUTTON_BACK));
@@ -958,6 +987,8 @@ public class BKUGUI implements BKUGUIFacade {
 
           titleLabel.setText(messages.getString(TITLE_HASHDATA));
 
+          helpListener.setHelpTopic(HELP_HASHDATALIST);
+          
           JLabel refIdLabel = new JLabel();
           refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
           String refIdLabelPattern = messages.getString(MESSAGE_HASHDATALIST);
@@ -982,15 +1013,15 @@ public class BKUGUI implements BKUGUIFacade {
 
           mainPanelLayout.setHorizontalGroup(
             mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(refIdLabel)
-                      .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
+                .addComponent(refIdLabel)
+              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
 
           mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createSequentialGroup()
-                  .addComponent(refIdLabel)
-                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                  .addComponent(hashDataScrollPane, 0, 0, hashDataTable.getPreferredSize().height+3));
-
+                .addComponent(refIdLabel)
+              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+              .addComponent(hashDataScrollPane, 0, 0, hashDataTable.getPreferredSize().height+3));
+          
           JButton backButton = new JButton();
           backButton.setText(messages.getString(BUTTON_BACK));
           backButton.setActionCommand(cancelCommand);
@@ -1133,4 +1164,19 @@ public class BKUGUI implements BKUGUIFacade {
           }
       }
     }
+    
+    private void registerHelpListener(ActionListener helpListener) {
+      if (helpListener != null) {
+        this.helpListener = new HelpMouseListener(helpListener);
+      } else {
+        log.error("no help listener provided, will not be able to display help");
+        this.helpListener = new HelpMouseListener(new ActionListener() {
+
+          @Override
+          public void actionPerformed(ActionEvent e) {
+            log.error("no help listener registered (requested help topic: " + e.getActionCommand() + ")");
+          }
+        });
+      }
+    }
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index ced74834..6c157e76 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -37,6 +37,7 @@ public interface BKUGUIFacade {
   
     public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
     public static final String DEFAULT_BACKGROUND = "/images/BackgroundChipperling.png";
+    public static final String HELP_IMG = "/images/help.png";
     public static final String HASHDATA_FONT = "Monospaced";
     public static final Color ERROR_COLOR = Color.RED;
     public static final Color HYPERLINK_COLOR = Color.BLUE;
@@ -63,6 +64,15 @@ public interface BKUGUIFacade {
     public static final String LABEL_PIN = "label.pin";
     public static final String LABEL_PINSIZE = "label.pinsize";
 //    public static final String ERROR_NO_HASHDATA = "error.no.hashdata";
+    public static final String HELP_WELCOME = "help.welcome";
+    public static final String HELP_WAIT = "help.wait";
+    public static final String HELP_CARDNOTSUPPORTED = "help.cardnotsupported";
+    public static final String HELP_INSERTCARD = "help.insertcard";
+    public static final String HELP_CARDPIN = "help.cardpin";
+    public static final String HELP_SIGNPIN = "help.signpin";
+    public static final String HELP_RETRY = "help.retry";
+    public static final String HELP_HASHDATA = "help.hashdata";
+    public static final String HELP_HASHDATALIST = "help.hashdatalist";
     
     public static final String BUTTON_OK = "button.ok";
     public static final String BUTTON_CANCEL = "button.cancel";
@@ -72,9 +82,9 @@ public interface BKUGUIFacade {
     public static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
     
     
-    public void init(Container contentPane, String localeString, URL background);
+    public void init(Container contentPane, String localeString, URL background, ActionListener helpListener);
     
-    public void showWelcomeDialog(); 
+    public void showWelcomeDialog();
     
     /**
      * MOA-ID only
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpMouseListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpMouseListener.java
new file mode 100644
index 00000000..6d814f01
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpMouseListener.java
@@ -0,0 +1,33 @@
+package at.gv.egiz.bku.gui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class HelpMouseListener extends MouseAdapter {
+
+  protected static final Log log = LogFactory.getLog(HelpMouseListener.class);
+  
+  protected ActionListener externalHelpListener;
+  protected String locale;
+  protected String topic;
+
+  public HelpMouseListener(ActionListener externalHelpListener) {
+    super();
+    this.externalHelpListener = externalHelpListener;
+  }
+
+  public void setHelpTopic(String topic) {
+    log.trace("setting help topic: " + topic);
+    this.topic = topic;
+  }
+
+  @Override
+  public void mouseClicked(MouseEvent arg0) {
+    ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, topic);
+    externalHelpListener.actionPerformed(e);
+  }
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index c37704e2..29913d2a 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -41,6 +41,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
 import javax.swing.GroupLayout;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JFileChooser;
@@ -65,6 +66,8 @@ import org.apache.commons.logging.LogFactory;
 public class SimpleGUI implements BKUGUIFacade {
     
     private static final Log log = LogFactory.getLog(SimpleGUI.class);
+
+    protected HelpMouseListener helpListener;
     
     protected Container contentPane;
     protected ResourceBundle messages;
@@ -77,6 +80,7 @@ public class SimpleGUI implements BKUGUIFacade {
     protected JPanel buttonPanel;
     /** right side fixed labels  */
 //    protected JLabel titleLabel;
+    protected JLabel helpLabel;
     /** remember the pinfield to return to worker */
     protected JPasswordField pinField;
 
@@ -89,7 +93,7 @@ public class SimpleGUI implements BKUGUIFacade {
      * @param localeString may be null
      */
     @Override
-    public void init(final Container contentPane, String localeString, final URL background) {
+    public void init(final Container contentPane, String localeString, final URL background, ActionListener helpListener) {
 
         if (localeString != null) {
             messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, new Locale(localeString));
@@ -98,7 +102,8 @@ public class SimpleGUI implements BKUGUIFacade {
         }
 
         this.contentPane = contentPane;
-
+        registerHelpListener(helpListener);
+        
         try {
 
           log.debug("scheduling gui initialization");
@@ -131,7 +136,7 @@ public class SimpleGUI implements BKUGUIFacade {
             throw new RuntimeException("Failed to init GUI: " + ex.getMessage());
         }
     }
-
+    
 //    protected void initIconPanel() {
 //        iconPanel = new JPanel();
 //        JLabel iconLabel = new JLabel();
@@ -151,7 +156,7 @@ public class SimpleGUI implements BKUGUIFacade {
 //                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)); //);
 //    }
 
-    protected void initContentPanel(URL background) {
+    protected void initContentPanel(URL background) { 
 
       if (background == null) {
         background = this.getClass().getResource(DEFAULT_BACKGROUND);
@@ -175,6 +180,11 @@ public class SimpleGUI implements BKUGUIFacade {
 //        titleLabel.setFont(titleLabel.getFont().deriveFont(titleLabel.getFont().getStyle() |
 //          java.awt.Font.BOLD, titleLabel.getFont().getSize() + 2));
         
+        helpLabel = new JLabel();
+        helpLabel.setIcon(new ImageIcon(getClass().getResource(HELP_IMG))); 
+        helpLabel.addMouseListener(helpListener);
+        helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+        
         JButton b = new JButton();
 //        b.setText(messages.getString(BUTTON_CANCEL));
 //        if (b.getPreferredSize().width > buttonSize)
@@ -207,8 +217,7 @@ public class SimpleGUI implements BKUGUIFacade {
 //
 //        headerPanelLayout.setHorizontalGroup(
 //          headerPanelLayout.createSequentialGroup()
-//            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
-//            .addContainerGap());
+//            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
 //        headerPanelLayout.setVerticalGroup(
 //          headerPanelLayout.createSequentialGroup()
 //            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
@@ -234,7 +243,7 @@ public class SimpleGUI implements BKUGUIFacade {
             .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)
-            .addContainerGap()); //);
+            .addContainerGap());
     }
 
     @Override
@@ -291,6 +300,8 @@ public class SimpleGUI implements BKUGUIFacade {
 
 //                titleLabel.setText(messages.getString(TITLE_WELCOME));
 
+                helpListener.setHelpTopic(HELP_WELCOME);
+                
                 JLabel welcomeMsgLabel = new JLabel();
                 welcomeMsgLabel.setFont(welcomeMsgLabel.getFont().deriveFont(welcomeMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 welcomeMsgLabel.setText(messages.getString(TITLE_WELCOME)); 
@@ -299,12 +310,16 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                  .addComponent(welcomeMsgLabel));
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addGroup(mainPanelLayout.createSequentialGroup()
+                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                      .addComponent(helpLabel))
+                    .addComponent(welcomeMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-                  .addComponent(welcomeMsgLabel));
-
+                    .addComponent(helpLabel)
+                    .addComponent(welcomeMsgLabel));
+                
                 contentPanel.validate();
 
             }
@@ -328,6 +343,8 @@ public class SimpleGUI implements BKUGUIFacade {
 
 //                titleLabel.setText(messages.getString(TITLE_INSERTCARD));
 
+                helpListener.setHelpTopic(HELP_INSERTCARD);
+
                 JLabel insertCardMsgLabel = new JLabel();
                 insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 insertCardMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD));
@@ -336,10 +353,14 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addGroup(mainPanelLayout.createSequentialGroup()
+                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                      .addComponent(helpLabel))
                     .addComponent(insertCardMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
+                    .addComponent(helpLabel)
                     .addComponent(insertCardMsgLabel));
                 
 //                JButton cancelButton = new JButton();
@@ -385,6 +406,8 @@ public class SimpleGUI implements BKUGUIFacade {
 
 //                titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
 
+              helpListener.setHelpTopic(HELP_CARDNOTSUPPORTED);
+              
                 JLabel insertCardMsgLabel = new JLabel();
                 insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 insertCardMsgLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED)); 
@@ -393,12 +416,16 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addGroup(mainPanelLayout.createSequentialGroup()
+                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                      .addComponent(helpLabel))
                     .addComponent(insertCardMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
+                    .addComponent(helpLabel)
                     .addComponent(insertCardMsgLabel));
-
+                
 //                JButton cancelButton = new JButton();
 //                cancelButton.setText(messages.getString(BUTTON_CANCEL));
 //                cancelButton.addActionListener(cancelListener);
@@ -477,10 +504,12 @@ public class SimpleGUI implements BKUGUIFacade {
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                   String infoPattern = messages.getString(MESSAGE_ENTERPIN);
                   infoLabel.setText(MessageFormat.format(infoPattern, new Object[] {pinSpec.getLocalizedName()}));
+                  helpListener.setHelpTopic(HELP_CARDPIN);
                 } else {
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
                   infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
                   infoLabel.setForeground(ERROR_COLOR);
+                  helpListener.setHelpTopic(HELP_RETRY);
                 }
                 
                 JLabel pinsizeLabel = new JLabel();
@@ -497,7 +526,10 @@ public class SimpleGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addComponent(infoLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addGroup(mainPanelLayout.createSequentialGroup()
+                      .addComponent(infoLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                      .addComponent(helpLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
                     .addGroup(mainPanelLayout.createSequentialGroup()
                       .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                       .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
@@ -507,13 +539,15 @@ public class SimpleGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-                        .addComponent(infoLabel)
-                        .addGap(infoLabel.getFont().getSize())
-                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                            .addComponent(cardPinLabel)
-                            .addComponent(pinField))
-                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(pinsizeLabel));
+                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(infoLabel)
+                      .addComponent(helpLabel))
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                        .addComponent(cardPinLabel)
+                        .addComponent(pinField))
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addComponent(pinsizeLabel));
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
@@ -580,7 +614,7 @@ public class SimpleGUI implements BKUGUIFacade {
       
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
-
+                
 //                if (numRetries < 0) {
 //                    titleLabel.setText(messages.getString(TITLE_SIGN));
 //                } else {
@@ -626,7 +660,7 @@ public class SimpleGUI implements BKUGUIFacade {
                     pinSize += "-" + pinSpec.getMaxLength();
                 }
                 pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
-                
+
                 JLabel infoLabel = new JLabel();
                 if (numRetries < 0) {
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -641,10 +675,12 @@ public class SimpleGUI implements BKUGUIFacade {
                           hashdataListener.actionPerformed(e);
                       }
                   });
+                  helpListener.setHelpTopic(HELP_SIGNPIN);
                 } else {
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
                   infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
                   infoLabel.setForeground(ERROR_COLOR);
+                  helpListener.setHelpTopic(HELP_RETRY);
                 }
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
@@ -652,23 +688,28 @@ public class SimpleGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addGroup(mainPanelLayout.createSequentialGroup()
                       .addComponent(infoLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                      .addGroup(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(pinsizeLabel))));
+                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                      .addComponent(helpLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+                    .addGroup(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(pinsizeLabel))));
 
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
+                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                         .addComponent(infoLabel)
-                        .addGap(infoLabel.getFont().getSize())
-                        .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                            .addComponent(signPinLabel)
-                            .addComponent(pinField))
-                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(pinsizeLabel));
+                        .addComponent(helpLabel))
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                        .addComponent(signPinLabel)
+                        .addComponent(pinField))
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addComponent(pinsizeLabel));
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
@@ -719,6 +760,8 @@ public class SimpleGUI implements BKUGUIFacade {
 
 //                titleLabel.setText(messages.getString(TITLE_ERROR));
 
+                helpListener.setHelpTopic(errorMsgKey);
+                
                 String errorMsgPattern = messages.getString(errorMsgKey);
                 String errorMsg = MessageFormat.format(errorMsgPattern, errorMsgParams);
                 
@@ -731,12 +774,16 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                  .addComponent(errorMsgLabel));
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addGroup(mainPanelLayout.createSequentialGroup()
+                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                      .addComponent(helpLabel))
+                    .addComponent(errorMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-                  .addComponent(errorMsgLabel));
-
+                    .addComponent(helpLabel)
+                    .addComponent(errorMsgLabel));
+                
                 JButton okButton = new JButton();
                 okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
                 okButton.setText(messages.getString(BUTTON_OK));
@@ -776,6 +823,8 @@ public class SimpleGUI implements BKUGUIFacade {
 
 //          titleLabel.setText(messages.getString(TITLE_ERROR));
 
+          helpListener.setHelpTopic(errorMsgKey);
+          
           String errorMsgPattern = messages.getString(errorMsgKey);
           String errorMsg = MessageFormat.format(errorMsgPattern, errorMsgParams);
 
@@ -788,11 +837,15 @@ public class SimpleGUI implements BKUGUIFacade {
           mainPanel.setLayout(mainPanelLayout);
 
           mainPanelLayout.setHorizontalGroup(
-            mainPanelLayout.createSequentialGroup()
-            .addComponent(errorMsgLabel));
+            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+              .addGroup(mainPanelLayout.createSequentialGroup()
+                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                .addComponent(helpLabel))
+              .addComponent(errorMsgLabel));
           mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createSequentialGroup()
-            .addComponent(errorMsgLabel));
+              .addComponent(helpLabel)
+              .addComponent(errorMsgLabel));
 
           contentPanel.validate();
         }
@@ -816,6 +869,8 @@ public class SimpleGUI implements BKUGUIFacade {
 
 //                titleLabel.setText(messages.getString(TITLE_WAIT));
 
+                helpListener.setHelpTopic(HELP_WAIT);
+                
                 JLabel waitMsgLabel = new JLabel();
                 waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 if (waitMessage != null) {
@@ -828,11 +883,15 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                  .addComponent(waitMsgLabel));
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addGroup(mainPanelLayout.createSequentialGroup()
+                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                      .addComponent(helpLabel))
+                    .addComponent(waitMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-                  .addComponent(waitMsgLabel));
+                    .addComponent(helpLabel)
+                    .addComponent(waitMsgLabel));
 
                 contentPanel.validate();
             }
@@ -907,6 +966,8 @@ public class SimpleGUI implements BKUGUIFacade {
           buttonPanel.removeAll();
 
 //          titleLabel.setText(messages.getString(TITLE_HASHDATA));
+          
+          helpListener.setHelpTopic(HELP_HASHDATA);
 
           JLabel refIdLabel = new JLabel();
           refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -929,14 +990,19 @@ public class SimpleGUI implements BKUGUIFacade {
 
           mainPanelLayout.setHorizontalGroup(
              mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(refIdLabel)
-                      .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
+              .addGroup(mainPanelLayout.createSequentialGroup()
+                .addComponent(refIdLabel)
+                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                .addComponent(helpLabel))
+              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
 
           mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createSequentialGroup()
-                  .addComponent(refIdLabel)
-                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                  .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
+              .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                .addComponent(refIdLabel)
+                .addComponent(helpLabel))
+              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
 
           JButton backButton = new JButton();
           backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -995,6 +1061,8 @@ public class SimpleGUI implements BKUGUIFacade {
 
 //          titleLabel.setText(messages.getString(TITLE_HASHDATA));
 
+          helpListener.setHelpTopic(HELP_HASHDATALIST);
+          
           JLabel refIdLabel = new JLabel();
           refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
           String refIdLabelPattern = messages.getString(MESSAGE_HASHDATALIST);
@@ -1019,14 +1087,19 @@ public class SimpleGUI implements BKUGUIFacade {
 
           mainPanelLayout.setHorizontalGroup(
             mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(refIdLabel)
-                      .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
+              .addGroup(mainPanelLayout.createSequentialGroup()
+                .addComponent(refIdLabel)
+                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                .addComponent(helpLabel))
+              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
 
           mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createSequentialGroup()
-                  .addComponent(refIdLabel)
-                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                  .addComponent(hashDataScrollPane, 0, 0, hashDataTable.getPreferredSize().height+3));
+              .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                .addComponent(refIdLabel)
+                .addComponent(helpLabel))
+              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+              .addComponent(hashDataScrollPane, 0, 0, hashDataTable.getPreferredSize().height+3));
 
           JButton backButton = new JButton();
           backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -1183,4 +1256,19 @@ public class SimpleGUI implements BKUGUIFacade {
           }
       }
     }
+    
+    private void registerHelpListener(ActionListener helpListener) {
+      if (helpListener != null) {
+        this.helpListener = new HelpMouseListener(helpListener);
+      } else {
+        log.error("no help listener provided, will not be able to display help");
+        this.helpListener = new HelpMouseListener(new ActionListener() {
+
+          @Override
+          public void actionPerformed(ActionEvent e) {
+            log.error("no help listener registered (requested help topic: " + e.getActionCommand() + ")");
+          }
+        });
+      }
+    }
 }
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index a38e2cf8..5a427360 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -26,12 +26,12 @@ windowtitle.save=Signaturdaten speichern
 windowtitle.savedir=Signaturdaten in Verzeichnis speichern
 windowtitle.overwrite=Datei \u00FCberschreiben?
 message.wait=<html>Bitte warten...</html>
-message.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken</html>
-message.enterpin=<html>Bitte {0} eingeben</html>
-message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen...</a></html>
-message.hashdata=<html>Ein Signaturdatenobjekt:</html> 
+message.insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
+message.enterpin=<html>{0} eingeben</html>
+message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
+message.hashdata=<html>Signaturdaten:</html> 
 #message.hashdata=<html>Referenz Id: {0}</html>
-message.hashdatalist=<html>{0} Signaturdatenobjekte:</html>
+message.hashdatalist=<html>{0} Signaturdaten:</html>
 message.retries=<html>Noch {0} Versuch(e)</html>
 message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
 label.pin=<html>{0}:</html>
diff --git a/BKUCommonGUI/src/main/resources/images/help.png b/BKUCommonGUI/src/main/resources/images/help.png
new file mode 100644
index 00000000..4ed65a97
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/images/help.png differ
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp
index ffb67828..8ddbed13 100644
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ b/BKUOnline/src/main/webapp/appletPage.jsp
@@ -52,9 +52,10 @@
 		var parameters = {
             GuiStyle : '<%=guiStyle%>',
 			Background : '<%=backgroundImg%>',
-			WSDL_URL : '../stal?wsdl',
-            HashDataDisplay : '<%=hashDataDisplay%>',
-            HashDataURL : '../hashDataInput',
+			WSDL_URL :'../stal?wsdl',
+                        HelpURL : '../help',
+                        HashDataDisplay : 'external',
+                        HashDataURL : '../hashDataInput',
 			SessionID : '<%=session.getId()%>',
 			RedirectURL : '../bkuResult'
 		};
-- 
cgit v1.2.3


From 8479ef50c84e8998f7909074df6a23c2ff0aa5b0 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 31 Oct 2008 12:33:18 +0000
Subject: Help Icon

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@132 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/nb-configuration.xml                          |  6 ++++++
 .../applet/ExternalDisplaySignRequestHandler.java       | 16 ++++++++++++++--
 .../gv/egiz/bku/online/applet/ExternalHelpListener.java | 17 +++++++++++++++--
 .../bku/online/applet/InternalSSLSocketFactory.java     |  4 ----
 .../bku/online/applet/WebServiceSignRequestHandler.java |  1 +
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java  |  1 +
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java |  1 +
 .../java/at/gv/egiz/bku/gui/HashDataTableModel.java     |  1 +
 .../main/java/at/gv/egiz/bku/gui/HelpMouseListener.java | 17 +++++++++++++++++
 .../src/main/java/at/gv/egiz/bku/gui/ImagePanel.java    | 16 ++++++++++++++--
 .../src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java     |  5 +----
 .../src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java    |  2 +-
 .../java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java     |  4 ++--
 .../java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java |  2 +-
 14 files changed, 75 insertions(+), 18 deletions(-)
 create mode 100644 BKUApplet/nb-configuration.xml

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/nb-configuration.xml b/BKUApplet/nb-configuration.xml
new file mode 100644
index 00000000..352a03be
--- /dev/null
+++ b/BKUApplet/nb-configuration.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+  <properties>
+    <project.license>bka</project.license>
+  </properties>
+</project-shared-configuration>
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalDisplaySignRequestHandler.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalDisplaySignRequestHandler.java
index 2ac1bc62..2c9fde71 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalDisplaySignRequestHandler.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalDisplaySignRequestHandler.java
@@ -1,6 +1,18 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * 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.
  */
 
 package at.gv.egiz.bku.online.applet;
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalHelpListener.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalHelpListener.java
index 4d6d5851..f92a6963 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalHelpListener.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalHelpListener.java
@@ -1,7 +1,20 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * 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.
  */
+
 package at.gv.egiz.bku.online.applet;
 
 import java.applet.AppletContext;
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/InternalSSLSocketFactory.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/InternalSSLSocketFactory.java
index fa3587e4..c3417d63 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/InternalSSLSocketFactory.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/InternalSSLSocketFactory.java
@@ -14,10 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 
 package at.gv.egiz.bku.online.applet;
 
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WebServiceSignRequestHandler.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WebServiceSignRequestHandler.java
index b417fd33..ddbe76bf 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WebServiceSignRequestHandler.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WebServiceSignRequestHandler.java
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package at.gv.egiz.bku.online.applet;
 
 import java.security.DigestException;
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 6c157e76..872f1874 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -14,6 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.stal.HashDataInput;
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
index 4a338f23..87676026 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
@@ -14,6 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package at.gv.egiz.bku.gui;
 
 public class BKUGUIFactory {
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
index 1a833f48..aea85523 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.stal.HashDataInput;
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpMouseListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpMouseListener.java
index 6d814f01..531884d1 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpMouseListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpMouseListener.java
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+
 package at.gv.egiz.bku.gui;
 
 import java.awt.event.ActionEvent;
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java
index e9c270ce..1185cf53 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java
@@ -1,6 +1,18 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * 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.
  */
 
 package at.gv.egiz.bku.gui;
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index 29913d2a..195db27a 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -14,10 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
+
 package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.smcc.PINSpec;
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index 308be642..c32a237a 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -40,7 +40,7 @@ public class BKUGUITest {
         BKUGUI gui = new BKUGUI();
         Container contentPane = testFrame.getContentPane();
         contentPane.setPreferredSize(new Dimension(380, 150));
-        gui.init(contentPane, null, null);
+        gui.init(contentPane, null, null, null);
         BKUGUIWorker worker = new BKUGUIWorker();
         worker.init(gui);
         testFrame.pack();
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
index d12be9ac..8a850549 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
@@ -37,8 +37,8 @@ public class BKUGuiProxy implements BKUGUIFacade {
   }
 
   @Override
-  public void init(Container contentPane, String localeString, URL bgImage) {
-    delegate.init(contentPane, localeString, bgImage);
+  public void init(Container contentPane, String localeString, URL bgImage, ActionListener helpListener) {
+    delegate.init(contentPane, localeString, bgImage, helpListener);
   }
 
   @Override
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
index e1d434e3..df5c2b28 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
@@ -48,7 +48,7 @@ public class SMCCSTALFactory implements STALFactory {
     }
     dialog = new JDialog();
     BKUGUIFacade gui = BKUGUIFactory.createGUI(BKUGUIFactory.ADVANCED_GUI);
-    gui.init(dialog.getContentPane(), locale.toString(), null);
+    gui.init(dialog.getContentPane(), locale.toString(), null, null);
     stal = new SMCCSTAL(new BKUGuiProxy(dialog, gui), dialog, resourceBundle);
     dialog.setPreferredSize(new Dimension(400, 200));
     dialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-- 
cgit v1.2.3


From afad7e7920c5418e10c70cb88f967076d290ff1d Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 31 Oct 2008 14:48:17 +0000
Subject: Changed applet background image.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@135 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/resources/images/BackgroundChipperling.png   | Bin 3367 -> 1544 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png b/BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png
index a4791a7f..5cb64674 100644
Binary files a/BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png and b/BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png differ
-- 
cgit v1.2.3


From 35096aca11df113631a982554e85a22fff350813 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 31 Oct 2008 15:28:06 +0000
Subject: Changed applet background image.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@136 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/resources/images/BackgroundChipperling.png   | Bin 1544 -> 2041 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png b/BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png
index 5cb64674..5097aa6b 100644
Binary files a/BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png and b/BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png differ
-- 
cgit v1.2.3


From 4032e46810c24dc3f013de296a2133f4651696b9 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 31 Oct 2008 15:30:34 +0000
Subject: local HelpListener card locked/not activated

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@137 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../egiz/bku/online/applet/AppletHelpListener.java |  46 ++++++++
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |   4 +-
 .../bku/online/applet/ExternalHelpListener.java    |  83 --------------
 .../at/gv/egiz/bku/gui/AbstractHelpListener.java   |  84 +++++++++++++++
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   2 +
 .../at/gv/egiz/bku/gui/Messages.properties         |   4 +-
 BKULocal/pom.xml                                   | 119 ++++++++++-----------
 .../gv/egiz/bku/local/gui/LocalHelpListener.java   |  41 +++++++
 .../at/gv/egiz/bku/local/stal/SMCCSTALFactory.java |  11 +-
 BKUOnline/src/main/webapp/HTTP-ohne.html           |   2 +-
 .../bku/smccstal/InfoBoxReadRequestHandler.java    |   7 ++
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   |   6 ++
 12 files changed, 260 insertions(+), 149 deletions(-)
 create mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java
 delete mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalHelpListener.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
 create mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java
new file mode 100644
index 00000000..a0305eb4
--- /dev/null
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.online.applet;
+
+import at.gv.egiz.bku.gui.AbstractHelpListener;
+import java.applet.AppletContext;
+import java.net.URL;
+
+/**
+ *
+ * @author clemens
+ */
+public class AppletHelpListener extends AbstractHelpListener {
+
+  protected AppletContext ctx;
+
+  public AppletHelpListener(AppletContext ctx, URL helpURL, String locale) {
+    super(helpURL, locale);
+    if (ctx == null) {
+      throw new RuntimeException("no applet context provided");
+    }
+    this.ctx = ctx;
+  }
+
+  @Override
+  public void showDocument(URL helpDocument) throws Exception {
+    ctx.showDocument(helpDocument, "_blank");
+  }
+
+  
+}
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 470534da..2b0188bb 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -82,10 +82,10 @@ public class BKUApplet extends JApplet {
     }
     String guiStyle = getMyAppletParameter(GUI_STYLE);
     BKUGUIFacade gui = BKUGUIFactory.createGUI(guiStyle);
-    ExternalHelpListener helpListener = null;
+    AppletHelpListener helpListener = null;
     try {
       URL helpURL = getMyAppletParameterURL(HELP_URL);
-      helpListener = new ExternalHelpListener(getAppletContext(), helpURL, localeString);
+      helpListener = new AppletHelpListener(getAppletContext(), helpURL, localeString);
     } catch (MalformedURLException ex) {
       log.error("invalid help URL: " + ex.getMessage());
     }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalHelpListener.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalHelpListener.java
deleted file mode 100644
index f92a6963..00000000
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalHelpListener.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.online.applet;
-
-import java.applet.AppletContext;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- *
- * @author clemens
- */
-public class ExternalHelpListener implements ActionListener {
-
-  protected final static Log log = LogFactory.getLog(ExternalHelpListener.class);
-  protected AppletContext ctx;
-  protected String helpURLBase;
-  protected String locale;
-
-  public ExternalHelpListener(AppletContext ctx, URL helpURL, String locale) {
-    if (ctx == null) {
-      throw new RuntimeException("no applet context provided");
-    }
-    if (helpURL == null || "".equals(helpURL)) {
-      throw new RuntimeException("no help URL provided");
-    }
-    this.ctx = ctx;
-    this.helpURLBase = helpURL.toString();
-    this.locale = locale;
-  }
-
-  @Override
-  public void actionPerformed(ActionEvent e) {
-    log.debug("received help action: " + e.getActionCommand());
-    URL helpURL;
-    try {
-      String urlString = helpURLBase;
-      if (locale != null) {
-        urlString = appendParameter(urlString, "locale", locale);
-      } 
-      if (e.getActionCommand() != null && !"".equals(e.getActionCommand())) {
-        urlString = appendParameter(urlString, "topic", e.getActionCommand());
-      }
-      helpURL = new URL(urlString);
-    } catch (MalformedURLException ex) {
-      try {
-        log.error("failed to create help URL: " + ex.getMessage());
-        helpURL = new URL(helpURLBase);
-      } catch (MalformedURLException ex1) {
-        log.error("failed to create default help URL, requested help will not be displayed");
-        return;
-      }
-    }
-    ctx.showDocument(helpURL, "_blank");
-  }
-  
-  private String appendParameter(String url, String paramName, String paramValue) {
-    if (url.indexOf('?') < 0) {
-      return url + "?" + paramName + "=" + paramValue;
-    } else {
-      return url + "&" + paramName + "=" + paramValue;
-    }
-  }
-}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
new file mode 100644
index 00000000..68d61bef
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.net.MalformedURLException;
+import java.net.URL;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public abstract class AbstractHelpListener implements ActionListener {
+
+  protected final static Log log = LogFactory.getLog(AbstractHelpListener.class);
+  protected String helpURLBase;
+  protected String locale;
+
+  public AbstractHelpListener(URL baseURL, String locale) {
+    if (baseURL == null || "".equals(baseURL)) {
+      throw new RuntimeException("no help URL provided");
+    }
+    this.helpURLBase = baseURL.toString();
+    this.locale = locale;
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    log.debug("received help action: " + e.getActionCommand());
+    URL helpURL;
+    try {
+      String urlString = helpURLBase;
+      if (locale != null) {
+        urlString = appendParameter(urlString, "locale", locale);
+      } 
+      if (e.getActionCommand() != null && !"".equals(e.getActionCommand())) {
+        urlString = appendParameter(urlString, "topic", e.getActionCommand());
+      }
+      helpURL = new URL(urlString);
+    } catch (MalformedURLException ex) {
+      try {
+        log.error("failed to create help URL: " + ex.getMessage());
+        helpURL = new URL(helpURLBase);
+      } catch (MalformedURLException ex1) {
+        log.error("failed to create default help URL, requested help will not be displayed");
+        return;
+      }
+    }
+    try {
+      showDocument(helpURL);
+    } catch (Exception ex) {
+      log.error("could not display help document " + helpURL + ": " + ex.getMessage());
+    }
+  }
+  
+  private String appendParameter(String url, String paramName, String paramValue) {
+    if (url.indexOf('?') < 0) {
+      return url + "?" + paramName + "=" + paramValue;
+    } else {
+      return url + "&" + paramName + "=" + paramValue;
+    }
+  }
+  
+  public abstract void showDocument(URL helpDocument) throws Exception;
+  
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 872f1874..4ef1b7d9 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -35,6 +35,8 @@ public interface BKUGUIFacade {
   public static final String ERR_DISPLAY_HASHDATA = "error.display.hashdata";
   public static final String ERR_WRITE_HASHDATA = "error.write.hashdata";
   public static final String ERR_INVALID_HASH = "error.invalid.hash";
+  public static final String ERR_CARD_LOCKED = "error.card.locked";
+  public static final String ERR_CARD_NOTACTIVATED = "error.card.notactivated";
   
     public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
     public static final String DEFAULT_BACKGROUND = "/images/BackgroundChipperling.png";
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 5a427360..1f51de77 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -58,4 +58,6 @@ error.ws.unreachable=<html>Das Web-Service ist nicht erreichbar: {0}</html>
 error.pcsc=<html>Java(TM) scheint keine PC/SC Schnittstelle f\u00FCr den Smartcard-Zugriff zur Verf\u00FCgung zu stellen.</html>
 error.cardterminal=<html>Es konnte kein Smartcard-Leser gefunden werden.<p>Entweder ist kein Leser angeschlossen oder kein PC/SC Treiber installiert.</p></html>
 error.unknown=<html>Leider trat ein Fehler auf: {0}</html>
-error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
\ No newline at end of file
+error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
+error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
+error.card.notactivated=<html>B\u00FCrgerkartenfunktion ist nicht aktiviert</html>
\ No newline at end of file
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 204fa6b9..03a6a10b 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<parent>
-		<artifactId>bku</artifactId>
-		<groupId>at.gv.egiz</groupId>
-		<version>1.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>at.gv.egiz</groupId>
-	<artifactId>BKULocal</artifactId>
-	<packaging>war</packaging>
-	<name>BKU Local</name>
-	<version>1.0-SNAPSHOT</version>
-	<description />
+<project 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>
+		<version>1.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>at.gv.egiz</groupId>
+	<artifactId>BKULocal</artifactId>
+	<packaging>war</packaging>
+	<name>BKU Local</name>
+	<version>1.0-SNAPSHOT</version>
 
 	<scm>
 		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
 		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
 		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
-	</scm>
+	</scm>
   <build>
     <plugins>
       <plugin>
@@ -27,15 +24,11 @@
         <version>2.0.2</version>
         <configuration>
           <manifest>
-            <addDefaultImplementationEntries>
-              true
-            </addDefaultImplementationEntries>
+            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
           </manifest>
           <archive>
             <manifestEntries>
-              <Implementation-Build>
-                ${project.version}-r${buildNumber}
-              </Implementation-Build>
+              <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build>
             </manifestEntries>
           </archive>
         </configuration>
@@ -59,47 +52,47 @@
       </plugin>
     </plugins>
   </build>
-
-	<dependencies>
-		<dependency>
-			<groupId>at.gv.egiz</groupId>
-			<artifactId>STAL</artifactId>
-			<version>1.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>at.gv.egiz</groupId>
-			<artifactId>bkucommon</artifactId>
-			<version>1.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>at.gv.egiz</groupId>
-			<artifactId>smcc</artifactId>
-			<version>1.0-SNAPSHOT</version>
+
+	<dependencies>
+		<dependency>
+			<groupId>at.gv.egiz</groupId>
+			<artifactId>STAL</artifactId>
+			<version>1.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz</groupId>
+			<artifactId>bkucommon</artifactId>
+			<version>1.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz</groupId>
+			<artifactId>smcc</artifactId>
+			<version>1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
 			<version>1.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>2.5.5</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>2.5.5</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>2.5.5</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>2.5.5</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
@@ -110,6 +103,10 @@
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
 			<version>1.0-SNAPSHOT</version>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file
+		</dependency>
+	</dependencies>
+
+	<properties>
+        <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
+    </properties>
+</project>
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java
new file mode 100644
index 00000000..ebec9c65
--- /dev/null
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.local.gui;
+
+import at.gv.egiz.bku.gui.AbstractHelpListener;
+import java.awt.Desktop;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class LocalHelpListener extends AbstractHelpListener {
+
+  public LocalHelpListener(URL baseURL, String locale) {
+    super(baseURL, locale);
+  }
+
+  @Override
+  public void showDocument(URL helpDocument) throws IOException, URISyntaxException {
+    Desktop.getDesktop().browse(helpDocument.toURI());
+  }
+
+}
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
index df5c2b28..d3530332 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
@@ -18,6 +18,7 @@ package at.gv.egiz.bku.local.stal;
 
 import java.awt.Dimension;
 import java.awt.Toolkit;
+import java.net.MalformedURLException;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
@@ -26,9 +27,11 @@ import javax.swing.WindowConstants;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.BKUGUIFactory;
+import at.gv.egiz.bku.local.gui.LocalHelpListener;
 import at.gv.egiz.bku.online.applet.BKUApplet;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.STALFactory;
+import java.net.URL;
 
 public class SMCCSTALFactory implements STALFactory {
 
@@ -48,7 +51,13 @@ public class SMCCSTALFactory implements STALFactory {
     }
     dialog = new JDialog();
     BKUGUIFacade gui = BKUGUIFactory.createGUI(BKUGUIFactory.ADVANCED_GUI);
-    gui.init(dialog.getContentPane(), locale.toString(), null, null);
+    LocalHelpListener helpListener =null;
+    try {
+      helpListener = new LocalHelpListener(new URL("http://localhost:3495/help"), "en");
+    } catch (MalformedURLException ex) {
+      ex.printStackTrace();
+    }
+    gui.init(dialog.getContentPane(), locale.toString(), null, helpListener);
     stal = new SMCCSTAL(new BKUGuiProxy(dialog, gui), dialog, resourceBundle);
     dialog.setPreferredSize(new Dimension(400, 200));
     dialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
diff --git a/BKUOnline/src/main/webapp/HTTP-ohne.html b/BKUOnline/src/main/webapp/HTTP-ohne.html
index 044432ce..47c059f2 100644
--- a/BKUOnline/src/main/webapp/HTTP-ohne.html
+++ b/BKUOnline/src/main/webapp/HTTP-ohne.html
@@ -98,7 +98,7 @@ legend {
 	<input type="radio" name="appletGuiStyle" value="advanced">advanced
 </p>
 <p>
-	<label for="appletHashDataDisplay">GUI Style</label> 
+	<label for="appletHashDataDisplay">HashData Display</label> 
 	<input type="radio" name="appletHashDataDisplay" value="external" checked="checked">external
 	<input type="radio" name="appletHashDataDisplay" value="internal">internal
 </p>
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
index cfac8cf5..cfc5c4bd 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
@@ -16,6 +16,7 @@
 */
 package at.gv.egiz.bku.smccstal;
 
+import at.gv.egiz.bku.gui.BKUGUIFacade;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -104,9 +105,15 @@ public class InfoBoxReadRequestHandler extends AbstractRequestHandler implements
         }
       } catch (NotActivatedException e) {
         log.info("Citizen card not activated.", e);
+        gui.showErrorDialog(BKUGUIFacade.ERR_CARD_NOTACTIVATED, null, this, null);
+        waitForAction();
+        gui.showWaitDialog(null);
         return new ErrorResponse(6001);
       } catch (LockedException e) {
         log.info("Citizen card locked.", e);
+        gui.showErrorDialog(BKUGUIFacade.ERR_CARD_LOCKED, null, this, null);
+        waitForAction();
+        gui.showWaitDialog(null);
         return new ErrorResponse(6001);
       } catch (CancelledException cx) {
         log.debug("User cancelled request", cx);
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index 466ec2a9..dbc70bff 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -94,9 +94,15 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
                 return stalResp;
             } catch (NotActivatedException e) {
               log.info("Citizen card not activated.", e);
+              gui.showErrorDialog(BKUGUIFacade.ERR_CARD_NOTACTIVATED, null, this, null);
+              waitForAction();
+              gui.showWaitDialog(null);
               return new ErrorResponse(6001);
             } catch (LockedException e) {
               log.info("Citizen card locked.", e);
+              gui.showErrorDialog(BKUGUIFacade.ERR_CARD_LOCKED, null, this, null);
+              waitForAction();
+              gui.showWaitDialog(null);
               return new ErrorResponse(6001);
             } catch (CancelledException cx) {
                 log.debug("User cancelled request");
-- 
cgit v1.2.3


From 9829de9c9b19dcca15676aaf9737195cc059a66c Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 3 Nov 2008 09:37:14 +0000
Subject: local HelpListener DesktopAPI

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@138 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../egiz/bku/online/applet/AppletHelpListener.java |  3 +-
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |  6 ++--
 .../at/gv/egiz/bku/gui/AbstractHelpListener.java   |  7 +++--
 .../gv/egiz/bku/local/gui/LocalHelpListener.java   | 20 +++++++++---
 .../at/gv/egiz/bku/local/stal/SMCCSTALFactory.java | 30 +++++++++++++-----
 .../egiz/bku/local/webapp/BKURequestHandler.java   |  5 +--
 .../src/main/webapp/WEB-INF/applicationContext.xml | 36 ++++++++++++----------
 7 files changed, 69 insertions(+), 38 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java
index a0305eb4..4040431f 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java
@@ -20,6 +20,7 @@ package at.gv.egiz.bku.online.applet;
 import at.gv.egiz.bku.gui.AbstractHelpListener;
 import java.applet.AppletContext;
 import java.net.URL;
+import java.util.Locale;
 
 /**
  *
@@ -29,7 +30,7 @@ public class AppletHelpListener extends AbstractHelpListener {
 
   protected AppletContext ctx;
 
-  public AppletHelpListener(AppletContext ctx, URL helpURL, String locale) {
+  public AppletHelpListener(AppletContext ctx, URL helpURL, Locale locale) {
     super(helpURL, locale);
     if (ctx == null) {
       throw new RuntimeException("no applet context provided");
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 2b0188bb..50d66d80 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -65,9 +65,11 @@ public class BKUApplet extends JApplet {
     log.debug("Called init()");
     HttpsURLConnection.setDefaultSSLSocketFactory(InternalSSLSocketFactory.getInstance());
     String localeString = getMyAppletParameter(LOCALE_PARAM_KEY);
+    Locale locale = null;
     if (localeString != null) {
+      locale = new Locale(localeString);
       resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE_BASE,
-              new Locale(localeString));
+              locale);
     } else {
       resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE_BASE);
     }
@@ -85,7 +87,7 @@ public class BKUApplet extends JApplet {
     AppletHelpListener helpListener = null;
     try {
       URL helpURL = getMyAppletParameterURL(HELP_URL);
-      helpListener = new AppletHelpListener(getAppletContext(), helpURL, localeString);
+      helpListener = new AppletHelpListener(getAppletContext(), helpURL, locale);
     } catch (MalformedURLException ex) {
       log.error("invalid help URL: " + ex.getMessage());
     }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
index 68d61bef..6e3167c1 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
@@ -21,6 +21,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Locale;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -32,9 +33,9 @@ public abstract class AbstractHelpListener implements ActionListener {
 
   protected final static Log log = LogFactory.getLog(AbstractHelpListener.class);
   protected String helpURLBase;
-  protected String locale;
+  protected Locale locale;
 
-  public AbstractHelpListener(URL baseURL, String locale) {
+  public AbstractHelpListener(URL baseURL, Locale locale) {
     if (baseURL == null || "".equals(baseURL)) {
       throw new RuntimeException("no help URL provided");
     }
@@ -49,7 +50,7 @@ public abstract class AbstractHelpListener implements ActionListener {
     try {
       String urlString = helpURLBase;
       if (locale != null) {
-        urlString = appendParameter(urlString, "locale", locale);
+        urlString = appendParameter(urlString, "locale", locale.toString());
       } 
       if (e.getActionCommand() != null && !"".equals(e.getActionCommand())) {
         urlString = appendParameter(urlString, "topic", e.getActionCommand());
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java
index ebec9c65..e32c9c3d 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package at.gv.egiz.bku.local.gui;
 
 import at.gv.egiz.bku.gui.AbstractHelpListener;
@@ -22,6 +21,7 @@ import java.awt.Desktop;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.Locale;
 
 /**
  *
@@ -29,13 +29,25 @@ import java.net.URL;
  */
 public class LocalHelpListener extends AbstractHelpListener {
 
-  public LocalHelpListener(URL baseURL, String locale) {
+  protected Desktop desktop;
+
+  public LocalHelpListener(URL baseURL, Locale locale) {
     super(baseURL, locale);
+    if (Desktop.isDesktopSupported()) {
+      desktop = Desktop.getDesktop();
+    }
   }
 
   @Override
   public void showDocument(URL helpDocument) throws IOException, URISyntaxException {
-    Desktop.getDesktop().browse(helpDocument.toURI());
+    if (desktop == null) {
+      log.error("Failed to open default browser: Desktop API not available (libgnome installed?)");
+    } else {
+      if (!desktop.isSupported(Desktop.Action.BROWSE)) {
+        log.error("Failed to open default browser: The system provides the Desktop API, but does not support the BROWSE action");
+      } else {
+        Desktop.getDesktop().browse(helpDocument.toURI());
+      }
+    }
   }
-
 }
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
index d3530332..4cc7bcd3 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
@@ -32,30 +32,38 @@ import at.gv.egiz.bku.online.applet.BKUApplet;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.STALFactory;
 import java.net.URL;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public class SMCCSTALFactory implements STALFactory {
 
-  private Locale locale;
+  protected static final Log log = LogFactory.getLog(SMCCSTALFactory.class);
+  protected String helpURL;
+  protected Locale locale;
 
   @Override
   public STAL createSTAL() {
-    
+
     SMCCSTAL stal;
     JDialog dialog;
     ResourceBundle resourceBundle;
     if (locale != null) {
       resourceBundle = ResourceBundle.getBundle(BKUApplet.RESOURCE_BUNDLE_BASE,
-          locale);
+              locale);
     } else {
       resourceBundle = ResourceBundle.getBundle(BKUApplet.RESOURCE_BUNDLE_BASE);
     }
     dialog = new JDialog();
     BKUGUIFacade gui = BKUGUIFactory.createGUI(BKUGUIFactory.ADVANCED_GUI);
-    LocalHelpListener helpListener =null;
+    LocalHelpListener helpListener = null;
     try {
-      helpListener = new LocalHelpListener(new URL("http://localhost:3495/help"), "en");
+      if (helpURL != null) {
+        helpListener = new LocalHelpListener(new URL(helpURL), locale);
+      } else {
+        log.warn("no HELP URL configured, help system disabled");
+      }
     } catch (MalformedURLException ex) {
-      ex.printStackTrace();
+      log.error("failed to configure help listener: " + ex.getMessage(), ex);
     }
     gui.init(dialog.getContentPane(), locale.toString(), null, helpListener);
     stal = new SMCCSTAL(new BKUGuiProxy(dialog, gui), dialog, resourceBundle);
@@ -72,7 +80,7 @@ public class SMCCSTALFactory implements STALFactory {
       frameSize.width = screenSize.width;
     }
     dialog.setLocation((screenSize.width - frameSize.width) / 2,
-        (screenSize.height - frameSize.height) / 2);
+            (screenSize.height - frameSize.height) / 2);
     return stal;
   }
 
@@ -80,4 +88,12 @@ public class SMCCSTALFactory implements STALFactory {
   public void setLocale(Locale locale) {
     this.locale = locale;
   }
+
+  public String getHelpURL() {
+    return helpURL;
+  }
+
+  public void setHelpURL(String helpURL) {
+    this.helpURL = helpURL;
+  }
 }
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java
index f19b86b5..62705d1e 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java
@@ -16,7 +16,6 @@
  */
 package at.gv.egiz.bku.local.webapp;
 
-import java.io.IOException;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -30,12 +29,10 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.web.HttpRequestHandler;
 
 import at.gv.egiz.bku.binding.BindingProcessorManager;
 import at.gv.egiz.bku.binding.HTTPBindingProcessor;
 import at.gv.egiz.bku.binding.HttpUtil;
-import at.gv.egiz.bku.utils.StreamUtil;
 import at.gv.egiz.org.apache.tomcat.util.http.AcceptLanguage;
 
 public abstract class BKURequestHandler extends HttpServlet {
@@ -68,7 +65,7 @@ public abstract class BKURequestHandler extends HttpServlet {
 		bindingProcessor.setHTTPHeaders(headerMap);
 		bindingProcessor.consumeRequestStream(req.getInputStream());
 
-		// fixxme just for testing
+		// fixxme just for testing
 		bindingProcessor.run();
 		if (bindingProcessor.getRedirectURL() != null) {
 			resp.sendRedirect(bindingProcessor.getRedirectURL());
diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index a951f056..3191f82f 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
+<!--
+  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.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
   <bean id="STALFactory" class="at.gv.egiz.bku.local.stal.SMCCSTALFactory"
-    scope="singleton" />
+    scope="singleton">
+    <property name="helpURL" value="http://localhost:3495/help"/>
+  </bean>
   
    
   <bean id="bindingProcessorManager" class="at.gv.egiz.bku.binding.BindingProcessorManagerImpl"
-- 
cgit v1.2.3


From 6211ed7f96c4ee6e1616a7c1e44477b9f3e8117f Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 3 Nov 2008 12:36:42 +0000
Subject: localization

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@140 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |  20 ++---
 .../at/gv/egiz/bku/online/applet/BKUWorker.java    |  17 ++--
 .../at/gv/egiz/bku/online/applet/images/logo.png   | Bin 4035 -> 0 bytes
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   |  11 ++-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   9 ++-
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    |  11 ++-
 .../at/gv/egiz/bku/gui/Messages.properties         |  86 ++++++++++-----------
 .../at/gv/egiz/bku/gui/Messages_de.properties      |  62 +++++++++++++++
 .../at/gv/egiz/bku/local/stal/BKUGuiProxy.java     |  10 ++-
 .../java/at/gv/egiz/bku/local/stal/SMCCSTAL.java   |   6 +-
 .../at/gv/egiz/bku/local/stal/SMCCSTALFactory.java |  16 ++--
 11 files changed, 156 insertions(+), 92 deletions(-)
 delete mode 100644 BKUApplet/src/main/resources/at/gv/egiz/bku/online/applet/images/logo.png
 create mode 100644 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 50d66d80..bde055ec 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -40,7 +40,6 @@ public class BKUApplet extends JApplet {
 
   private static Log log = LogFactory.getLog(BKUApplet.class);
   public static final String GUI_STYLE = "GuiStyle";
-  public final static String RESOURCE_BUNDLE_BASE = "at/gv/egiz/bku/online/applet/Messages";
   public final static String LOCALE_PARAM_KEY = "Locale";
   public final static String LOGO_URL_KEY = "LogoURL";
   public final static String WSDL_URL = "WSDL_URL";
@@ -52,7 +51,6 @@ public class BKUApplet extends JApplet {
   public static final String REDIRECT_URL = "RedirectURL";
   public static final String REDIRECT_TARGET = "RedirectTarget";
   public static final String HASHDATA_DISPLAY_INTERNAL = "internal";
-  protected ResourceBundle resourceBundle;
   protected BKUWorker worker;
   protected Thread workerThread;
 
@@ -64,14 +62,9 @@ public class BKUApplet extends JApplet {
     log.info("Welcome to MOCCA\n");
     log.debug("Called init()");
     HttpsURLConnection.setDefaultSSLSocketFactory(InternalSSLSocketFactory.getInstance());
-    String localeString = getMyAppletParameter(LOCALE_PARAM_KEY);
-    Locale locale = null;
-    if (localeString != null) {
-      locale = new Locale(localeString);
-      resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE_BASE,
-              locale);
-    } else {
-      resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE_BASE);
+    String locale = getMyAppletParameter(LOCALE_PARAM_KEY);
+    if (locale != null) {
+      this.setLocale(new Locale(locale));
     }
     String backgroundString = getMyAppletParameter(BACKGROUND_PARAM);
     URL background = null;
@@ -84,15 +77,16 @@ public class BKUApplet extends JApplet {
     }
     String guiStyle = getMyAppletParameter(GUI_STYLE);
     BKUGUIFacade gui = BKUGUIFactory.createGUI(guiStyle);
+    log.debug("setting GUI locale to " + getLocale());
     AppletHelpListener helpListener = null;
     try {
       URL helpURL = getMyAppletParameterURL(HELP_URL);
-      helpListener = new AppletHelpListener(getAppletContext(), helpURL, locale);
+      helpListener = new AppletHelpListener(getAppletContext(), helpURL, getLocale());
     } catch (MalformedURLException ex) {
       log.error("invalid help URL: " + ex.getMessage());
     }
-    gui.init(getContentPane(), localeString, background, helpListener);
-    worker = new BKUWorker(gui, this, resourceBundle);
+    gui.init(getContentPane(), getLocale(), background, helpListener);
+    worker = new BKUWorker(gui, this);
   }
 
   @Override
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
index 78f3dc12..843f6c4c 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
@@ -48,7 +48,6 @@ import at.gv.egiz.stal.service.types.ObjectFactory;
 import at.gv.egiz.stal.service.types.RequestType;
 import at.gv.egiz.stal.service.types.ResponseType;
 import at.gv.egiz.stal.util.STALTranslator;
-import javax.naming.ConfigurationException;
 
 public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
     ActionListener, SMCCSTALRequestHandler {
@@ -57,25 +56,22 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
   protected BKUGUIFacade gui;
   protected BKUApplet parent;
   private STALPortType stalPort;
-//  private URL hashDataURL;
   protected List<String> actionCommandList = new ArrayList<String>();
   protected Boolean actionPerformed = false;
   protected boolean finished = false;
-  protected ResourceBundle errorMessages;
 
   /**
    * 
    * @param gui
    *          must not be null
    */
-  public BKUWorker(BKUGUIFacade gui, BKUApplet parent,
-      ResourceBundle errorMessageBundle) {
-    if ((gui == null) || (parent == null) || (errorMessageBundle == null)) {
+  public BKUWorker(BKUGUIFacade gui, BKUApplet parent) {
+    if (gui == null || parent == null) {
         throw new NullPointerException("Parameter must not be set to null");
     }
     this.gui = gui;
+    this.locale = gui.getLocale();
     this.parent = parent;
-    this.errorMessages = errorMessageBundle;
     addRequestHandler(QuitRequest.class, this);
     // register SignRequestHandler once we have a webservice port
   }
@@ -86,9 +82,9 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
    * @param gui
    * @param errorMessageBundle
    */
-  protected BKUWorker(BKUGUIFacade gui, ResourceBundle errorMessageBundle) {
+  protected BKUWorker(BKUGUIFacade gui) {
     this.gui = gui;
-    this.errorMessages = errorMessageBundle;
+    this.locale = gui.getLocale();
     addRequestHandler(QuitRequest.class, this);
   }
 
@@ -342,8 +338,7 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
         }
         break;
       case SMCCHelper.CARD_FOUND:
-        // gui.showWaitDialog(null);
-        signatureCard = smccHelper.getSignatureCard(errorMessages.getLocale());
+        signatureCard = smccHelper.getSignatureCard(locale);
         return false;
       }
       smccHelper.update(3000);
diff --git a/BKUApplet/src/main/resources/at/gv/egiz/bku/online/applet/images/logo.png b/BKUApplet/src/main/resources/at/gv/egiz/bku/online/applet/images/logo.png
deleted file mode 100644
index eee4be4f..00000000
Binary files a/BKUApplet/src/main/resources/at/gv/egiz/bku/online/applet/images/logo.png and /dev/null differ
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 27841d1c..9f733a14 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
@@ -92,10 +92,10 @@ public class BKUGUI implements BKUGUIFacade {
      * @param localeString may be null
      */
     @Override
-    public void init(final Container contentPane, String localeString, final URL background, ActionListener helpListener) {
+    public void init(final Container contentPane, Locale locale, final URL background, ActionListener helpListener) {
 
-        if (localeString != null) {
-            messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, new Locale(localeString));
+        if (locale != null) {
+            messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, locale);
         } else {
             messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
         }
@@ -248,6 +248,11 @@ public class BKUGUI implements BKUGUIFacade {
             .addContainerGap());
     }
 
+    @Override
+    public Locale getLocale() {
+      return messages.getLocale();
+    }
+
     @Override
     public void showLoginDialog(ActionListener loginListener, String actionCommand) {
       
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 4ef1b7d9..6655cf64 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -24,6 +24,7 @@ import java.awt.Container;
 import java.awt.event.ActionListener;
 import java.net.URL;
 import java.util.List;
+import java.util.Locale;
 
 public interface BKUGUIFacade {
   
@@ -85,7 +86,13 @@ public interface BKUGUIFacade {
     public static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
     
     
-    public void init(Container contentPane, String localeString, URL background, ActionListener helpListener);
+    public void init(Container contentPane, Locale locale, URL background, ActionListener helpListener);
+    
+    /**
+     * 
+     * @return the locale of the message bundle (what if no message bundle could be loaded for the requested locale?)
+     */
+    public Locale getLocale();
     
     public void showWelcomeDialog();
     
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index 195db27a..a005292e 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -90,10 +90,10 @@ public class SimpleGUI implements BKUGUIFacade {
      * @param localeString may be null
      */
     @Override
-    public void init(final Container contentPane, String localeString, final URL background, ActionListener helpListener) {
+    public void init(final Container contentPane, Locale locale, final URL background, ActionListener helpListener) {
 
-        if (localeString != null) {
-            messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, new Locale(localeString));
+        if (locale != null) {
+            messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, locale);
         } else {
             messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
         }
@@ -243,6 +243,11 @@ public class SimpleGUI implements BKUGUIFacade {
             .addContainerGap());
     }
 
+    @Override
+    public Locale getLocale() {
+      return messages.getLocale();
+    }
+
     @Override
     public void showLoginDialog(ActionListener loginListener, String actionCommand) {
       
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 1f51de77..2e6b7b14 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -13,51 +13,49 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-title.welcome=<html>Willkommen</html>
-title.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken</html>
-title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
-title.cardpin=<html>{0} eingeben</html>
-title.sign=<html>Signatur erstellen</html>
-title.error=<html>Ein Fehler trat auf</html>
-title.retry=<html>Falscher PIN</html>
-title.wait=<html>Bitte warten</html>
-title.hashdata=<html>Signaturdaten</html>
-windowtitle.save=Signaturdaten speichern
-windowtitle.savedir=Signaturdaten in Verzeichnis speichern
-windowtitle.overwrite=Datei \u00FCberschreiben?
-message.wait=<html>Bitte warten...</html>
-message.insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
-message.enterpin=<html>{0} eingeben</html>
-message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
-message.hashdata=<html>Signaturdaten:</html> 
-#message.hashdata=<html>Referenz Id: {0}</html>
-message.hashdatalist=<html>{0} Signaturdaten:</html>
-message.retries=<html>Noch {0} Versuch(e)</html>
-message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
+title.welcome=<html>Welcome</html>
+title.insertcard=<html>Please insert your citizen-card into the reader</html>
+title.cardnotsupported=<html>This card is not supported</html>
+title.cardpin=<html>Enter {0}</html>
+title.sign=<html>Create signature</html>
+title.error=<html>Error</html>
+title.retry=<html>Wrong PIN</html>
+title.wait=<html>Please wait</html>
+title.hashdata=<html>Signature data</html>
+windowtitle.save=Save signature data
+windowtitle.savedir=Save signature data to directory
+windowtitle.overwrite=Overwrite file?
+message.wait=<html>Please wait...</html>
+message.insertcard=<html>Please insert your citizen-card into the reader</html>
+message.enterpin=<html>Enter {0}</html>
+message.hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
+message.hashdata=<html>Signature data:</html> 
+message.hashdatalist=<html>{0} signature data objects:</html>
+message.retries=<html>{0} tries left</html>
+message.overwrite=<html>Overwrite {0}?</html>
 label.pin=<html>{0}:</html>
-label.pinsize=<html>({0} stellig)</html>
+label.pinsize=<html>({0} digits)</html>
 button.ok=OK
-button.cancel=Abbrechen
-button.back=Zur\u00FCck
-button.sign=Signieren
-button.save=Speichern...
-mimetype.desc.xml=XML-Dateien (.xml)
-mimetype.desc.html=HTML-Dateien (.html, .htm)
-mimetype.desc.xhtml=XHTML-Dateien (.xhtml)
-mimetype.desc.txt=Textdateien (.txt)
-mimetype.desc.pdf=Adobe PDF-Dateien (.pdf)
-mimetype.desc.bin=Bin\u00E4rdateien (.bin)
-save.hashdatainput.prefix=Signaturdaten
+button.cancel=Cancel
+button.back=Back
+button.sign=Sign
+button.save=Save...
+mimetype.desc.xml=XML-files (.xml)
+mimetype.desc.html=HTML-files (.html, .htm)
+mimetype.desc.xhtml=XHTML-files (.xhtml)
+mimetype.desc.txt=Textfiles (.txt)
+mimetype.desc.pdf=Adobe PDF-files (.pdf)
+mimetype.desc.bin=Binary files (.bin)
+save.hashdatainput.prefix=signaturedata
 
 # Error Messages
-error.no.hashdata=<html>Keine Signaturdaten verf\u00FCgbar: {0}</html>
-error.display.hashdata=<html>Signaturdaten konnten nicht dargestellt werden: {0}</html>
-error.write.hashdata=<html>Die Signaturdaten konnten nicht gespeichert werden: {0}</html>
-error.invalid.hash=<html>Die Signaturdaten sind ung\u00FCltig: {0}</html>
-error.ws.unreachable=<html>Das Web-Service ist nicht erreichbar: {0}</html>
-error.pcsc=<html>Java(TM) scheint keine PC/SC Schnittstelle f\u00FCr den Smartcard-Zugriff zur Verf\u00FCgung zu stellen.</html>
-error.cardterminal=<html>Es konnte kein Smartcard-Leser gefunden werden.<p>Entweder ist kein Leser angeschlossen oder kein PC/SC Treiber installiert.</p></html>
-error.unknown=<html>Leider trat ein Fehler auf: {0}</html>
-error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
-error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
-error.card.notactivated=<html>B\u00FCrgerkartenfunktion ist nicht aktiviert</html>
\ No newline at end of file
+error.no.hashdata=<html>No signature data available: {0}</html>
+error.display.hashdata=<html>Could not display signature data: {0}</html>
+error.write.hashdata=<html>Could not save signature data: {0}</html>
+error.invalid.hash=<html>Invalid signature data: {0}</html>
+error.ws.unreachable=<html>Web-service unreachable: {0}</html>
+error.pcsc=<html>No PC/SC interface for smartcard access provided</html>
+error.cardterminal=<html>Could not find smartcard reader</html>
+error.unknown=<html>An error occured: {0}</html>
+error.card.locked=<html>Citizen-card is locked</html>
+error.card.notactivated=<html>Citizen-card not activated</html>
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties
new file mode 100644
index 00000000..af0cb016
--- /dev/null
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties
@@ -0,0 +1,62 @@
+# 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.
+
+title.welcome=<html>Willkommen</html>
+title.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken</html>
+title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
+title.cardpin=<html>{0} eingeben</html>
+title.sign=<html>Signatur erstellen</html>
+title.error=<html>Fehler</html>
+title.retry=<html>Falscher PIN</html>
+title.wait=<html>Bitte warten</html>
+title.hashdata=<html>Signaturdaten</html>
+windowtitle.save=Signaturdaten speichern
+windowtitle.savedir=Signaturdaten in Verzeichnis speichern
+windowtitle.overwrite=Datei \u00FCberschreiben?
+message.wait=<html>Bitte warten...</html>
+message.insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
+message.enterpin=<html>{0} eingeben</html>
+message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
+message.hashdata=<html>Signaturdaten:</html> 
+message.hashdatalist=<html>{0} Signaturdaten:</html>
+message.retries=<html>Noch {0} Versuch(e)</html>
+message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
+label.pin=<html>{0}:</html>
+label.pinsize=<html>({0} stellig)</html>
+button.ok=OK
+button.cancel=Abbrechen
+button.back=Zur\u00FCck
+button.sign=Signieren
+button.save=Speichern...
+mimetype.desc.xml=XML-Dateien (.xml)
+mimetype.desc.html=HTML-Dateien (.html, .htm)
+mimetype.desc.xhtml=XHTML-Dateien (.xhtml)
+mimetype.desc.txt=Textdateien (.txt)
+mimetype.desc.pdf=Adobe PDF-Dateien (.pdf)
+mimetype.desc.bin=Bin\u00E4rdateien (.bin)
+save.hashdatainput.prefix=Signaturdaten
+
+# Error Messages
+error.no.hashdata=<html>Keine Signaturdaten verf\u00FCgbar: {0}</html>
+error.display.hashdata=<html>Signaturdaten konnten nicht dargestellt werden: {0}</html>
+error.write.hashdata=<html>Die Signaturdaten konnten nicht gespeichert werden: {0}</html>
+error.invalid.hash=<html>Die Signaturdaten sind ung\u00FCltig: {0}</html>
+error.ws.unreachable=<html>Das Web-Service ist nicht erreichbar: {0}</html>
+error.pcsc=<html>Java(TM) scheint keine PC/SC Schnittstelle f\u00FCr den Smartcard-Zugriff zur Verf\u00FCgung zu stellen.</html>
+error.cardterminal=<html>Es konnte kein Smartcard-Leser gefunden werden.<p>Entweder ist kein Leser angeschlossen oder kein PC/SC Treiber installiert.</p></html>
+error.unknown=<html>Leider trat ein Fehler auf: {0}</html>
+error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
+error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
+error.card.notactivated=<html>B\u00FCrgerkartenfunktion ist nicht aktiviert</html>
\ No newline at end of file
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
index 8a850549..44cae8a0 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
@@ -10,6 +10,7 @@ import java.awt.event.WindowEvent;
 import java.net.URL;
 import java.util.List;
 
+import java.util.Locale;
 import javax.swing.JDialog;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
@@ -37,8 +38,13 @@ public class BKUGuiProxy implements BKUGUIFacade {
   }
 
   @Override
-  public void init(Container contentPane, String localeString, URL bgImage, ActionListener helpListener) {
-    delegate.init(contentPane, localeString, bgImage, helpListener);
+  public void init(Container contentPane, Locale locale, URL bgImage, ActionListener helpListener) {
+    delegate.init(contentPane, locale, bgImage, helpListener);
+  }
+
+  @Override
+  public Locale getLocale() {
+    return delegate.getLocale();
   }
 
   @Override
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTAL.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTAL.java
index 1bbb2e3c..6bf37c40 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTAL.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTAL.java
@@ -1,7 +1,6 @@
 package at.gv.egiz.bku.local.stal;
 
 import java.util.List;
-import java.util.ResourceBundle;
 
 import javax.swing.JDialog;
 
@@ -16,9 +15,8 @@ public class SMCCSTAL extends BKUWorker {
 
   private JDialog container;
 
-  public SMCCSTAL(BKUGUIFacade gui, JDialog container,
-      ResourceBundle errorMessageBundle) {
-    super(gui, errorMessageBundle);
+  public SMCCSTAL(BKUGUIFacade gui, JDialog container) {
+    super(gui);
     this.container = container;
     addRequestHandler(SignRequest.class, new LocalSignRequestHandler());
   }
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
index 4cc7bcd3..ad7b9646 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
@@ -28,7 +28,6 @@ import javax.swing.WindowConstants;
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.BKUGUIFactory;
 import at.gv.egiz.bku.local.gui.LocalHelpListener;
-import at.gv.egiz.bku.online.applet.BKUApplet;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.STALFactory;
 import java.net.URL;
@@ -45,28 +44,23 @@ public class SMCCSTALFactory implements STALFactory {
   public STAL createSTAL() {
 
     SMCCSTAL stal;
-    JDialog dialog;
-    ResourceBundle resourceBundle;
+    JDialog dialog = new JDialog();
     if (locale != null) {
-      resourceBundle = ResourceBundle.getBundle(BKUApplet.RESOURCE_BUNDLE_BASE,
-              locale);
-    } else {
-      resourceBundle = ResourceBundle.getBundle(BKUApplet.RESOURCE_BUNDLE_BASE);
+      dialog.setLocale(locale);
     }
-    dialog = new JDialog();
     BKUGUIFacade gui = BKUGUIFactory.createGUI(BKUGUIFactory.ADVANCED_GUI);
     LocalHelpListener helpListener = null;
     try {
       if (helpURL != null) {
-        helpListener = new LocalHelpListener(new URL(helpURL), locale);
+        helpListener = new LocalHelpListener(new URL(helpURL), dialog.getLocale());
       } else {
         log.warn("no HELP URL configured, help system disabled");
       }
     } catch (MalformedURLException ex) {
       log.error("failed to configure help listener: " + ex.getMessage(), ex);
     }
-    gui.init(dialog.getContentPane(), locale.toString(), null, helpListener);
-    stal = new SMCCSTAL(new BKUGuiProxy(dialog, gui), dialog, resourceBundle);
+    gui.init(dialog.getContentPane(), dialog.getLocale(), null, helpListener);
+    stal = new SMCCSTAL(new BKUGuiProxy(dialog, gui), dialog);
     dialog.setPreferredSize(new Dimension(400, 200));
     dialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
     dialog.setTitle("MOCCA");
-- 
cgit v1.2.3


From 4d27cbd65e358f9ae778b6911e8de527e86f6bda Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 3 Nov 2008 14:31:47 +0000
Subject: Localization default language set to German (de).

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@141 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../gv/egiz/bku/online/applet/Messages.properties  | 58 -------------
 .../egiz/bku/online/applet/Messages_de.properties  | 42 ---------
 .../at/gv/egiz/bku/gui/Messages.properties         | 85 ++++++++++---------
 .../at/gv/egiz/bku/gui/Messages_de.properties      | 62 --------------
 .../at/gv/egiz/bku/gui/Messages_en.properties      | 62 ++++++++++++++
 .../slexceptions/SLExceptionMessages_de.properties | 99 ----------------------
 .../main/java/at/gv/egiz/smcc/util/SMCCHelper.java |  4 +-
 .../resources/at/gv/egiz/smcc/ACOSCard.properties  |  2 +-
 .../at/gv/egiz/smcc/ACOSCard_de.properties         | 21 -----
 .../at/gv/egiz/smcc/ACOSCard_en.properties         | 21 -----
 .../at/gv/egiz/smcc/STARCOSCard.properties         |  4 +-
 .../at/gv/egiz/smcc/STARCOSCard_de.properties      | 20 -----
 .../at/gv/egiz/smcc/STARCOSCard_en.properties      | 20 -----
 13 files changed, 110 insertions(+), 390 deletions(-)
 delete mode 100644 BKUApplet/src/main/resources/at/gv/egiz/bku/online/applet/Messages.properties
 delete mode 100644 BKUApplet/src/main/resources/at/gv/egiz/bku/online/applet/Messages_de.properties
 delete mode 100644 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties
 create mode 100644 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
 delete mode 100644 bkucommon/src/main/resources/at/gv/egiz/bku/slexceptions/SLExceptionMessages_de.properties
 delete mode 100644 smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard_de.properties
 delete mode 100644 smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard_en.properties
 delete mode 100644 smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard_de.properties
 delete mode 100644 smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard_en.properties

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/resources/at/gv/egiz/bku/online/applet/Messages.properties b/BKUApplet/src/main/resources/at/gv/egiz/bku/online/applet/Messages.properties
deleted file mode 100644
index 752004e8..00000000
--- a/BKUApplet/src/main/resources/at/gv/egiz/bku/online/applet/Messages.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.
-
-# -------- BEGIN bootstrap applet -----------#
-java16required=<html>This Applet requires Java 1.6 or higher to run. \
- Please download and install a recent version of Java. \
- <p>For Windows, Linux and Solaris plattforms you can download Java from \
- <a href='http://java.sun.com/javase/downloads'>http://java.sun.com/javase/downloads</a>.\
- </p></html>
-
-failedtostart=<html>Failed to start Applet. \
- <p><pre>{0}</pre></p></html>
-# -------- END bootstrap applet -----------#
- 
- 
-applet.name=Online Citicen Card Environment (CCE)
-
-nopcscsupport=The Java plattform does not seem to provide \ 
-a PC/SC interface to acces a smartcard.
-
-nocardterminal=Can not find a connected smartcard reader.\ 
- <p>Either there is no smartcard reader connected, or \
- no PC/SC driver is installed for a connected smartcard reader.</p>
-
-insertcard=Please insert your citicen card (B\u00FCrgerkarte) into your \
- smartcard reader.
-
-unsupportedcard=The inserted smartcard is not supported.\
- <p>Please insert your citicen card (B\u00FCrgerkarte) \
- into your smartcard reader.</p>
-
-enterpin=Please enter {0} \(min {1}, max {2} digits\).
-
-enterpinretries=Please enter {0} \(min {1}, max {2} digits, {3} retries left\).
-
-pinwrong=Entered PIN is wrong.
-
-button.ok=Ok
-
-button.cancel=Cancel
-
-status.findpcsc=Looking for PC/SC support
-
-status.findsupportedcard=Looking for a supported smartcard
-
-failed.WS=Webservice cannot be reached.
\ No newline at end of file
diff --git a/BKUApplet/src/main/resources/at/gv/egiz/bku/online/applet/Messages_de.properties b/BKUApplet/src/main/resources/at/gv/egiz/bku/online/applet/Messages_de.properties
deleted file mode 100644
index e6b815e9..00000000
--- a/BKUApplet/src/main/resources/at/gv/egiz/bku/online/applet/Messages_de.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.
-
-# -------- BEGIN bootstrap applet -----------#
-java16required=<html>Dieses Applet ben\u00F6tigt Java Version 1.6 oder h\u00F6her. \
- Bitte installieren sie eine aktulle Version von Java. \
- <p>F\u00FCr Windows, Linux and Solaris kann Java von \
- <a href='http://java.sun.com/javase/downloads'>http://java.sun.com/javase/downloads</a> \
- heruntergeladen werden.</p></html>
-
-failedtostart=<html>Das Applet konnte nicht gestartet werden. \
- <p><pre>{0}</pre></p></html>
-# -------- END bootstrap applet -----------#
-
-applet.name=Online B\u00FCrgerkartenumgebung (BKU)
-
-nopcscsupport=Die Java-Installation stellt keine \
- PC/SC-Schnittstelle zum Zugriff auf eine Chipkarte zur Verf\u00FCgung.
-
-nocardterminal=Es konnte kein Chipkartenleser gefunden werden.\
- <p>Entweder, es ist kein Chipkartenleser angeschlossen, oder \
- f\u00FCr den angeschlossenen Chipkartenleser ist kein PC/SC-Treiber \
- installiert.</p>
-
-insertcard=Bitte stecken Sie ihre B\u00FCrgerkarte in den Chipkartenleser.
-
-unsupportedcard=Die gesteckte Chipkarte wird nicht unterst\u00FCtzt.\
- <p>Bitte stecken Sie ihre B\u00FCrgerkare in den Chipkartenleser</p>
-
-failed.WS=Das Webservice kann nicht erreicht werden.
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 2e6b7b14..aeabc5c1 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -13,49 +13,50 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-title.welcome=<html>Welcome</html>
-title.insertcard=<html>Please insert your citizen-card into the reader</html>
-title.cardnotsupported=<html>This card is not supported</html>
-title.cardpin=<html>Enter {0}</html>
-title.sign=<html>Create signature</html>
-title.error=<html>Error</html>
-title.retry=<html>Wrong PIN</html>
-title.wait=<html>Please wait</html>
-title.hashdata=<html>Signature data</html>
-windowtitle.save=Save signature data
-windowtitle.savedir=Save signature data to directory
-windowtitle.overwrite=Overwrite file?
-message.wait=<html>Please wait...</html>
-message.insertcard=<html>Please insert your citizen-card into the reader</html>
-message.enterpin=<html>Enter {0}</html>
-message.hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
-message.hashdata=<html>Signature data:</html> 
-message.hashdatalist=<html>{0} signature data objects:</html>
-message.retries=<html>{0} tries left</html>
-message.overwrite=<html>Overwrite {0}?</html>
+title.welcome=<html>Willkommen</html>
+title.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken</html>
+title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
+title.cardpin=<html>{0} eingeben</html>
+title.sign=<html>Signatur erstellen</html>
+title.error=<html>Fehler</html>
+title.retry=<html>Falscher PIN</html>
+title.wait=<html>Bitte warten</html>
+title.hashdata=<html>Signaturdaten</html>
+windowtitle.save=Signaturdaten speichern
+windowtitle.savedir=Signaturdaten in Verzeichnis speichern
+windowtitle.overwrite=Datei \u00FCberschreiben?
+message.wait=<html>Bitte warten...</html>
+message.insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
+message.enterpin=<html>{0} eingeben</html>
+message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
+message.hashdata=<html>Signaturdaten:</html> 
+message.hashdatalist=<html>{0} Signaturdaten:</html>
+message.retries=<html>Noch {0} Versuch(e)</html>
+message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
 label.pin=<html>{0}:</html>
-label.pinsize=<html>({0} digits)</html>
+label.pinsize=<html>({0} stellig)</html>
 button.ok=OK
-button.cancel=Cancel
-button.back=Back
-button.sign=Sign
-button.save=Save...
-mimetype.desc.xml=XML-files (.xml)
-mimetype.desc.html=HTML-files (.html, .htm)
-mimetype.desc.xhtml=XHTML-files (.xhtml)
-mimetype.desc.txt=Textfiles (.txt)
-mimetype.desc.pdf=Adobe PDF-files (.pdf)
-mimetype.desc.bin=Binary files (.bin)
-save.hashdatainput.prefix=signaturedata
+button.cancel=Abbrechen
+button.back=Zur\u00FCck
+button.sign=Signieren
+button.save=Speichern...
+mimetype.desc.xml=XML-Dateien (.xml)
+mimetype.desc.html=HTML-Dateien (.html, .htm)
+mimetype.desc.xhtml=XHTML-Dateien (.xhtml)
+mimetype.desc.txt=Textdateien (.txt)
+mimetype.desc.pdf=Adobe PDF-Dateien (.pdf)
+mimetype.desc.bin=Bin\u00E4rdateien (.bin)
+save.hashdatainput.prefix=Signaturdaten
 
 # Error Messages
-error.no.hashdata=<html>No signature data available: {0}</html>
-error.display.hashdata=<html>Could not display signature data: {0}</html>
-error.write.hashdata=<html>Could not save signature data: {0}</html>
-error.invalid.hash=<html>Invalid signature data: {0}</html>
-error.ws.unreachable=<html>Web-service unreachable: {0}</html>
-error.pcsc=<html>No PC/SC interface for smartcard access provided</html>
-error.cardterminal=<html>Could not find smartcard reader</html>
-error.unknown=<html>An error occured: {0}</html>
-error.card.locked=<html>Citizen-card is locked</html>
-error.card.notactivated=<html>Citizen-card not activated</html>
\ No newline at end of file
+error.no.hashdata=<html>Keine Signaturdaten verf\u00FCgbar: {0}</html>
+error.display.hashdata=<html>Signaturdaten konnten nicht dargestellt werden: {0}</html>
+error.write.hashdata=<html>Die Signaturdaten konnten nicht gespeichert werden: {0}</html>
+error.invalid.hash=<html>Die Signaturdaten sind ung\u00FCltig: {0}</html>
+error.ws.unreachable=<html>Das Web-Service ist nicht erreichbar: {0}</html>
+error.pcsc=<html>Es konnte keine PC/SC Schnittstelle gefunden werden</html>
+error.cardterminal=<html>Es konnte kein Smartcard-Leser gefunden werden</html>
+error.unknown=<html>Leider trat ein Fehler auf: {0}</html>
+error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
+error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
+error.card.notactivated=<html>B\u00FCrgerkartenfunktion ist nicht aktiviert</html>
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties
deleted file mode 100644
index af0cb016..00000000
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.
-
-title.welcome=<html>Willkommen</html>
-title.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken</html>
-title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
-title.cardpin=<html>{0} eingeben</html>
-title.sign=<html>Signatur erstellen</html>
-title.error=<html>Fehler</html>
-title.retry=<html>Falscher PIN</html>
-title.wait=<html>Bitte warten</html>
-title.hashdata=<html>Signaturdaten</html>
-windowtitle.save=Signaturdaten speichern
-windowtitle.savedir=Signaturdaten in Verzeichnis speichern
-windowtitle.overwrite=Datei \u00FCberschreiben?
-message.wait=<html>Bitte warten...</html>
-message.insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
-message.enterpin=<html>{0} eingeben</html>
-message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
-message.hashdata=<html>Signaturdaten:</html> 
-message.hashdatalist=<html>{0} Signaturdaten:</html>
-message.retries=<html>Noch {0} Versuch(e)</html>
-message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
-label.pin=<html>{0}:</html>
-label.pinsize=<html>({0} stellig)</html>
-button.ok=OK
-button.cancel=Abbrechen
-button.back=Zur\u00FCck
-button.sign=Signieren
-button.save=Speichern...
-mimetype.desc.xml=XML-Dateien (.xml)
-mimetype.desc.html=HTML-Dateien (.html, .htm)
-mimetype.desc.xhtml=XHTML-Dateien (.xhtml)
-mimetype.desc.txt=Textdateien (.txt)
-mimetype.desc.pdf=Adobe PDF-Dateien (.pdf)
-mimetype.desc.bin=Bin\u00E4rdateien (.bin)
-save.hashdatainput.prefix=Signaturdaten
-
-# Error Messages
-error.no.hashdata=<html>Keine Signaturdaten verf\u00FCgbar: {0}</html>
-error.display.hashdata=<html>Signaturdaten konnten nicht dargestellt werden: {0}</html>
-error.write.hashdata=<html>Die Signaturdaten konnten nicht gespeichert werden: {0}</html>
-error.invalid.hash=<html>Die Signaturdaten sind ung\u00FCltig: {0}</html>
-error.ws.unreachable=<html>Das Web-Service ist nicht erreichbar: {0}</html>
-error.pcsc=<html>Java(TM) scheint keine PC/SC Schnittstelle f\u00FCr den Smartcard-Zugriff zur Verf\u00FCgung zu stellen.</html>
-error.cardterminal=<html>Es konnte kein Smartcard-Leser gefunden werden.<p>Entweder ist kein Leser angeschlossen oder kein PC/SC Treiber installiert.</p></html>
-error.unknown=<html>Leider trat ein Fehler auf: {0}</html>
-error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
-error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
-error.card.notactivated=<html>B\u00FCrgerkartenfunktion ist nicht aktiviert</html>
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
new file mode 100644
index 00000000..3b8ac1bc
--- /dev/null
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -0,0 +1,62 @@
+# 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.
+
+title.welcome=<html>Welcome</html>
+title.insertcard=<html>Please insert your citizen-card into the reader</html>
+title.cardnotsupported=<html>This card is not supported</html>
+title.cardpin=<html>Enter {0}</html>
+title.sign=<html>Create signature</html>
+title.error=<html>Error</html>
+title.retry=<html>Wrong PIN</html>
+title.wait=<html>Please wait</html>
+title.hashdata=<html>Signature data</html>
+windowtitle.save=Save signature data
+windowtitle.savedir=Save signature data to directory
+windowtitle.overwrite=Overwrite file?
+message.wait=<html>Please wait...</html>
+message.insertcard=<html>Please insert your citizen-card into the reader</html>
+message.enterpin=<html>Enter {0}</html>
+message.hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
+message.hashdata=<html>Signature data:</html> 
+message.hashdatalist=<html>{0} signature data objects:</html>
+message.retries=<html>{0} tries left</html>
+message.overwrite=<html>Overwrite {0}?</html>
+label.pin=<html>{0}:</html>
+label.pinsize=<html>({0} digits)</html>
+button.ok=OK
+button.cancel=Cancel
+button.back=Back
+button.sign=Sign
+button.save=Save...
+mimetype.desc.xml=XML-files (.xml)
+mimetype.desc.html=HTML-files (.html, .htm)
+mimetype.desc.xhtml=XHTML-files (.xhtml)
+mimetype.desc.txt=Textfiles (.txt)
+mimetype.desc.pdf=Adobe PDF-files (.pdf)
+mimetype.desc.bin=Binary files (.bin)
+save.hashdatainput.prefix=signaturedata
+
+# Error Messages
+error.no.hashdata=<html>No signature data available: {0}</html>
+error.display.hashdata=<html>Could not display signature data: {0}</html>
+error.write.hashdata=<html>Could not save signature data: {0}</html>
+error.invalid.hash=<html>Invalid signature data: {0}</html>
+error.ws.unreachable=<html>Web-service unreachable: {0}</html>
+error.pcsc=<html>No PC/SC interface for smartcard access provided</html>
+error.cardterminal=<html>Could not find smartcard reader</html>
+error.unknown=<html>An error occured: {0}</html>
+error.test=<html>Error1 {0} - Error2 {1}</html>
+error.card.locked=<html>Citizen-card is locked</html>
+error.card.notactivated=<html>Citizen-card not activated</html>
\ No newline at end of file
diff --git a/bkucommon/src/main/resources/at/gv/egiz/bku/slexceptions/SLExceptionMessages_de.properties b/bkucommon/src/main/resources/at/gv/egiz/bku/slexceptions/SLExceptionMessages_de.properties
deleted file mode 100644
index 73409c8b..00000000
--- a/bkucommon/src/main/resources/at/gv/egiz/bku/slexceptions/SLExceptionMessages_de.properties
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.
-
-test.noerror=Das ist eine Test-Fehlermeldung. Es ist kein Fehler aufgetreten.
-
-ec1000=Unklassifizierter Fehler.
-ec2000=Unklassifizierter Fehler in der Transportbindung.
-ec2001=HTTP/HTTPS-Bindung: DataURL kann nicht aufgel�st werden.
-ec2002=HTTP/HTTPS-Bindung: StylesheetURL kann nicht aufgel�st werden.
-ec2003=HTTP/HTTPS-Bindung: RedirectURL kann nicht aufgel�st werden.
-ec2004=HTTP/HTTPS-Bindung: Parameter XMLRequest fehlt.
-ec2005=HTTP/HTTPS-Bindung: Unbekannte Kodierung der Parameter.
-ec2006=HTTP/HTTPS-Bindung: Fehlerhafte Kodierung der Parameter.
-ec2007=HTTP/HTTPS-Bindung: DataURL-Server sendet Fehler oder unerwartete Antwort.
-ec2008=HTTP/HTTPS-Bindung: Fehler im Stylesheet, der von der StylesheetURL bezogen wurde.
-ec2009=HTTP/HTTPS-Bindung: HTTP-Anfrage an lokale BKU wurde an unerlaubte URL gerichtet.
-ec2010=HTTPS-Bindung: Fehler beim Aufbau der TLS-Verbindung.
-ec3000=Unklassifizierter Fehler in der XML-Struktur der Befehlsanfrage.
-ec3001=XML-Struktur der Befehlsanfrage ist nicht wohlgeformt.
-ec3002=XML-Struktur der Befehlsanfrage entspricht nicht dem Schema des Security-Layers.
-ec3003=XML-Struktur der Befehlsanfrage enth�lt eine unerlaubte Kombination aus optionalen Elementen oder Attributen.
-ec3004=XML-Struktur enth�lt ein Element oder Attribut, dessen Syntax nicht der Spezifikation des Security-Layer entspricht.
-ec3005=Protokollversion des Security-Layer wird nicht unterst�tzt.
-ec4000=Unklassifizierter Fehler in der Befehlsabarbeitung.
-ec4001=Unbekannter Keyboxbezeichner.
-ec4002=Unbekannter Infoboxbezeichner.
-ec4003=Zu signierendes Datum kann nicht aufgel�st werden.
-ec4004=Erg�nzungsobjekt kann nicht aufgel�st werden.
-ec4005=Zu verschl�sselndes Datum kann nicht aufgel�st werden.
-ec4006=Algorithmus (Signatur, Verschl�sselung, Digest, Kanonisierung, Transformation) wird nicht unterst�tzt.
-ec4007=Fehler bei der Algorithmusausf�hrung (Signatur, Verschl�sselung, Digest, Kanonisierung, Transformation).
-ec4008=Fehler beim Parsen der CMS-Nachricht.
-ec4009=Kein passender Entschl�sselungsschl�ssel vorhanden.
-ec4010=Parameter des Infobox-Befehls passen nicht zum Typ der Infobox.
-ec4011=Befehl ist nicht implementiert.
-ec4100=XML-Dokument, in das die Signatur integriert werden soll, kann nicht aufgel�st werden.
-ec4101=XML-Dokument, in das die Signatur integriert werden soll, kann nicht geparst werden.
-ec4102=Signatur kann nicht am spezifizierten Ort in das bestehende XML-Dokument integriert werden.
-ec4103=Signatorzertifikat ist nicht in der CMS-Signatur enthalten.
-ec4104=Signierte Daten sind weder in der CMS-Signatur noch im XML-Request enthalten.
-ec4105=XML-Dokument, das die zu pr�fende Signatur enth�lt, kann nicht aufgel�st werden.
-ec4106=XML-Dokument, das die zu pr�fende Signatur enth�lt, kann nicht geparst werden.
-ec4107=Am spezifizierten Ort innerhalb des XML-Dokuments befindet sich keine XML-Signatur.
-ec4108=Verschl�sseltes Datum kann nicht am spezifizierten Ort in das bestehende XML-Dokument eingef�gt werden.
-ec4109=Bestehendes XML-Dokument ist notwendig, aber nicht vorhanden.
-ec4110=Bestehendes XML-Dokument kann nicht aufgel�st werden.
-ec4111=Bestehendes XML-Dokument kann nicht geparst werden.
-ec4112=Verschl�sselte Datenverschl�sselungsschl�ssel k�nnen nicht am spezifizierten Ort in das bestehende XML-Dokument eingef�gt werden.
-ec4113=Zu entschl�sselnde Daten sind weder in der CMS-Nachricht noch im XML-Request enthalten.
-ec4114=Zu entschl�sselndes XML-Dokument kann nicht aufgel�st werden.
-ec4115=Zu entschl�sselndes XML-Dokument kann nicht geparst werden.
-ec4116=Zumindest ein spezifiziertes Verschl�sselungselement kann nicht im zu entschl�sselnden XML-Dokument gefunden werden.
-ec4117=Kein Verschl�sselungselement f�r Bin�rantwort vorhanden.
-ec4118=Zu hashendes Datum kann nicht aufgel�st werden.
-ec4119=Datum, f�r das der Hashwert zu pr�fen ist, kann nicht aufgel�st werden.
-ec4120=Gew�hlter Infoboxbezeichner bereits vergeben.
-ec4121=Infobox mit spezifiziertem Bezeichner existiert nicht.
-ec4122=Inhalt der ausgew�hlten Infobox kann nicht als XML dargestellt werden.
-ec4123=Assoziatives Array: Zum spezifizierten Schl�ssel existiert kein Eintrag.
-ec4500=Die Sitzung ist abgelaufen.
-ec5000=Unklassifizierter Fehler in der Anzeigekomponente.
-ec5001=Anzeige von Daten des in der Befehlsanfrage angegebenen Mime-Types wird nicht unterst�tzt.
-ec5002=Zeichenkodierung der anzuzeigenden Daten ist fehlerhaft oder wird nicht unterst�tzt.
-ec5003=Anzuzeigende Daten enhalten nicht unterst�tzte Zeichen.
-ec5004=Standardanzeigeformat: HTML ist nicht spezifikationskonform.
-ec5005=Standardanzeigeformat: CSS ist nicht spezifikationskonform.
-ec5006=Standardanzeigeformat: Format eines eingebundenen Bildes ist nicht spezifikationskonform.
-ec5007=Standardanzeigeformat: Signatur �ber eingebundene Bilder fehlt oder ist nicht spezifikationskonform.
-ec6000=Unklassifizierter Abbruch durch den B�rger.
-ec6001=Abbruch durch den B�rger �ber die Benutzerschnittstelle.
-ec6002=Abbruch auf Grund mangelnder Rechte zur Befehlsausf�hrung.
-
-# 3xxx
-#
-
-ec3000.unclassified=Unklassifizierter Fehler in der XML-Struktur der Befehlsanfrage. {0}
-ec3002.invalid=XML-Struktur der Befehlsanfrage entspricht nicht dem Schema des Security-Layers. {0} 
-
-# 4xxx
-#
-
-ec4000.infobox.invalid=Die Infobox '{0}' enth�lt ung�ltige Daten.
-ec4000.idlink.transfomation.failed=Die komprimierte Personenbindung konnte mit dem Stylesheet {0} nicht transformiert werden.
-ec4002.infobox.unknown=Unbekannter Infoboxbezeichner {0}.
-ec4003.not.resolved=Zu signierendes Datum kann nicht aufgel�st werden (URI={0}).
-ec4011.notimplemented=Befehl {0} ist nicht implementiert.
-
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java b/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java
index 15971497..4dae7975 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java
@@ -87,7 +87,7 @@ public class SMCCHelper {
             ATR atr = newCards.get(cardTerminal).getATR();
             log.trace("Found supported card (" + signatureCard.toString() + ") "
                 + "in terminal '" + cardTerminal.getName() + "', ATR = "
-                + toString(atr.getHistoricalBytes()) + ".");
+                + toString(atr.getBytes()) + ".");
             resultCode = CARD_FOUND;
             break;
 
@@ -97,7 +97,7 @@ public class SMCCHelper {
               ATR atr = c.getATR();
               log.info("Found unsupported card" + " in terminal '"
                   + cardTerminal.getName() + "', ATR = "
-                  + toString(atr.getHistoricalBytes()) + ".");
+                  + toString(atr.getBytes()) + ".");
             } else {
               log.info("Found unsupported card in terminal '"
                   + cardTerminal.getName() + "' without ATR");
diff --git a/smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard.properties b/smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard.properties
index 9142841c..d2bbe4f9 100644
--- a/smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard.properties
+++ b/smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard.properties
@@ -17,5 +17,5 @@
 # and open the template in the editor.
 
 dec.pin.name=Geheimhaltungs-PIN
-sig.pin.name=Signature-PIN
+sig.pin.name=Signatur-PIN
 inf.pin.name=Infobox-PIN
diff --git a/smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard_de.properties b/smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard_de.properties
deleted file mode 100644
index d2bbe4f9..00000000
--- a/smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard_de.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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.
-
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-
-dec.pin.name=Geheimhaltungs-PIN
-sig.pin.name=Signatur-PIN
-inf.pin.name=Infobox-PIN
diff --git a/smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard_en.properties b/smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard_en.properties
deleted file mode 100644
index 9142841c..00000000
--- a/smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard_en.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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.
-
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-
-dec.pin.name=Geheimhaltungs-PIN
-sig.pin.name=Signature-PIN
-inf.pin.name=Infobox-PIN
diff --git a/smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard.properties b/smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard.properties
index 77935333..6fa5f0fa 100644
--- a/smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard.properties
+++ b/smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard.properties
@@ -16,5 +16,5 @@
 # To change this template, choose Tools | Templates
 # and open the template in the editor.
 
-sig.pin.name=Signature-PIN
-card.pin.name=Card-PIN
+sig.pin.name=Signatur-PIN
+card.pin.name=Karten-PIN
diff --git a/smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard_de.properties b/smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard_de.properties
deleted file mode 100644
index 6fa5f0fa..00000000
--- a/smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard_de.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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.
-
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-
-sig.pin.name=Signatur-PIN
-card.pin.name=Karten-PIN
diff --git a/smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard_en.properties b/smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard_en.properties
deleted file mode 100644
index 77935333..00000000
--- a/smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard_en.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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.
-
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-
-sig.pin.name=Signature-PIN
-card.pin.name=Card-PIN
-- 
cgit v1.2.3


From 9fcce6749092eb6c5d266dd1dd7099e88014fbd7 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 4 Nov 2008 12:03:15 +0000
Subject: simplegui messages on top

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@143 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   |  6 +-
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    | 93 ++++++++++++----------
 .../bku/binding/BindingProcessorManagerImpl.java   |  5 +-
 smcc/pom.xml                                       | 35 +-------
 4 files changed, 59 insertions(+), 80 deletions(-)

(limited to 'BKUCommonGUI')

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 9f733a14..cb99a872 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
@@ -14,10 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.smcc.PINSpec;
@@ -819,7 +815,7 @@ public class BKUGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-//                titleLabel.setText(messages.getString(TITLE_WAIT));
+                titleLabel.setText(messages.getString(TITLE_WAIT));
 
                 helpListener.setHelpTopic(HELP_WAIT);
                 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index a005292e..6bf6df84 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -312,15 +312,14 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addGroup(mainPanelLayout.createSequentialGroup()
+                    mainPanelLayout.createSequentialGroup()
+                      .addComponent(welcomeMsgLabel)
                       .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                      .addComponent(helpLabel))
-                    .addComponent(welcomeMsgLabel));
+                      .addComponent(helpLabel));
                 mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addComponent(helpLabel)
-                    .addComponent(welcomeMsgLabel));
+                    mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(welcomeMsgLabel)
+                      .addComponent(helpLabel));
                 
                 contentPanel.validate();
 
@@ -355,15 +354,14 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addGroup(mainPanelLayout.createSequentialGroup()
+                    mainPanelLayout.createSequentialGroup()
+                      .addComponent(insertCardMsgLabel)
                       .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                      .addComponent(helpLabel))
-                    .addComponent(insertCardMsgLabel));
+                      .addComponent(helpLabel));
                 mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addComponent(helpLabel)
-                    .addComponent(insertCardMsgLabel));
+                    mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(insertCardMsgLabel)
+                      .addComponent(helpLabel));
                 
 //                JButton cancelButton = new JButton();
 //                cancelButton.setText(messages.getString(BUTTON_CANCEL));
@@ -418,15 +416,14 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addGroup(mainPanelLayout.createSequentialGroup()
+                    mainPanelLayout.createSequentialGroup()
+                      .addComponent(insertCardMsgLabel)
                       .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                      .addComponent(helpLabel))
-                    .addComponent(insertCardMsgLabel));
+                      .addComponent(helpLabel));
                 mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addComponent(helpLabel)
-                    .addComponent(insertCardMsgLabel));
+                    mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(insertCardMsgLabel)
+                      .addComponent(helpLabel));
                 
 //                JButton cancelButton = new JButton();
 //                cancelButton.setText(messages.getString(BUTTON_CANCEL));
@@ -764,6 +761,11 @@ public class SimpleGUI implements BKUGUIFacade {
 
                 helpListener.setHelpTopic(errorMsgKey);
                 
+                JLabel errorTitleLabel = new JLabel();
+                errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                errorTitleLabel.setText(messages.getString(TITLE_ERROR));
+                errorTitleLabel.setForeground(ERROR_COLOR);
+                
                 String errorMsgPattern = messages.getString(errorMsgKey);
                 String errorMsg = MessageFormat.format(errorMsgPattern, errorMsgParams);
                 
@@ -778,12 +780,15 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                     .addGroup(mainPanelLayout.createSequentialGroup()
+                      .addComponent(errorTitleLabel)
                       .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
                       .addComponent(helpLabel))
                     .addComponent(errorMsgLabel));
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-                    .addComponent(helpLabel)
+                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(errorTitleLabel)
+                      .addComponent(helpLabel))
                     .addComponent(errorMsgLabel));
                 
                 JButton okButton = new JButton();
@@ -827,27 +832,34 @@ public class SimpleGUI implements BKUGUIFacade {
 
           helpListener.setHelpTopic(errorMsgKey);
           
+          JLabel errorTitleLabel = new JLabel();
+          errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
+          errorTitleLabel.setText(messages.getString(TITLE_ERROR));
+          errorTitleLabel.setForeground(ERROR_COLOR);
+      
           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);
-
+          
           GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
           mainPanel.setLayout(mainPanelLayout);
 
           mainPanelLayout.setHorizontalGroup(
-            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-              .addGroup(mainPanelLayout.createSequentialGroup()
-                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                .addComponent(helpLabel))
-              .addComponent(errorMsgLabel));
-          mainPanelLayout.setVerticalGroup(
-            mainPanelLayout.createSequentialGroup()
-              .addComponent(helpLabel)
-              .addComponent(errorMsgLabel));
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addGroup(mainPanelLayout.createSequentialGroup()
+                      .addComponent(errorTitleLabel)
+                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                      .addComponent(helpLabel))
+                    .addComponent(errorMsgLabel));
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createSequentialGroup()
+                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(errorTitleLabel)
+                      .addComponent(helpLabel))
+                    .addComponent(errorMsgLabel));
 
           contentPanel.validate();
         }
@@ -885,16 +897,15 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.setLayout(mainPanelLayout);
 
                 mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addGroup(mainPanelLayout.createSequentialGroup()
+                    mainPanelLayout.createSequentialGroup()
+                      .addComponent(waitMsgLabel)
                       .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                      .addComponent(helpLabel))
-                    .addComponent(waitMsgLabel));
+                      .addComponent(helpLabel));
                 mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addComponent(helpLabel)
-                    .addComponent(waitMsgLabel));
-
+                    mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(waitMsgLabel)
+                      .addComponent(helpLabel));
+                
                 contentPanel.validate();
             }
         });
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java
index cc1b7532..9757f7cc 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java
@@ -285,16 +285,19 @@ public class BindingProcessorManagerImpl implements BindingProcessorManager {
     log.debug("Removing binding processor: " + sessionId);
     ProcessingContext ctx = contextMap.get(sessionId);
     if (ctx == null) {
+      log.warn("no processing context to remove for session " + sessionId);
       return;
     }
     Future f = ctx.getFuture();
-      
+    
 //    MapEntityWrapper wrapper = bindingProcessorMap.get(sessionId);
 //    if (wrapper == null) {
 //      return;
 //    }
 //    Future<?> f = wrapper.getFuture();
+    
     if (!f.isDone()) {
+      log.trace("canceling " + sessionId);
       f.cancel(true);
     }
     contextMap.remove(sessionId);
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 3e3dfe14..9fa81387 100644
--- a/smcc/pom.xml
+++ b/smcc/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>
@@ -15,36 +14,6 @@
   <url>http://bku.egiz.gv.at</url>
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>sign</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <archive>
-            <addMavenDescriptor>false</addMavenDescriptor>
-            <index>false</index>
-            <manifest>
-              <addClasspath>false</addClasspath>
-            </manifest>
-          </archive>
-          <alias>test-applet signer</alias>
-          <keystore>keystore.ks</keystore>
-          <storepass>storepass</storepass>
-          <keypass>keypass</keypass>
-          <verify>true</verify>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
         <configuration>
@@ -70,4 +39,4 @@
       <artifactId>iaik_jce_full_signed</artifactId>
     </dependency> -->
   </dependencies> 
-</project>
\ No newline at end of file
+</project>
-- 
cgit v1.2.3


From 3049d65de7c8ca9c25756db5648b6f268d675df9 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 4 Nov 2008 12:24:39 +0000
Subject: error foreground color remove showLoginDialog()

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@145 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 37 ---------------------
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |  7 ++--
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    | 38 ----------------------
 3 files changed, 2 insertions(+), 80 deletions(-)

(limited to 'BKUCommonGUI')

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 cb99a872..d96d22c8 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
@@ -249,43 +249,6 @@ public class BKUGUI implements BKUGUIFacade {
       return messages.getLocale();
     }
 
-    @Override
-    public void showLoginDialog(ActionListener loginListener, String actionCommand) {
-      
-      log.debug("scheduling login dialog");
-        
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-              
-              log.debug("show login dialog");
-              
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                titleLabel.setText(messages.getString(TITLE_ERROR));
-
-                JLabel waitMsgLabel = new JLabel();
-                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                waitMsgLabel.setText("<html>LoginDialog not supported yet.</html>");
-                waitMsgLabel.setForeground(ERROR_COLOR);
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                  .addComponent(waitMsgLabel));
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(waitMsgLabel));
-
-                contentPanel.validate();
-            }
-        });
-    }
-
     @Override
     public void showWelcomeDialog() {
       
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 6655cf64..ad489c2e 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -97,12 +97,9 @@ public interface BKUGUIFacade {
     public void showWelcomeDialog();
     
     /**
-     * MOA-ID only
-     * @param loginListener
+     * 
+     * @param waitMessage if null, a simple 'wait' text is displayed
      */
-    public void showLoginDialog(ActionListener loginListener, String actionCommand);
-
-   /** optional wait message */
     public void showWaitDialog(String waitMessage);
 
     public void showInsertCardDialog(ActionListener cancelListener, String actionCommand);
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index 6bf6df84..f2a8466b 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -248,43 +248,6 @@ public class SimpleGUI implements BKUGUIFacade {
       return messages.getLocale();
     }
 
-    @Override
-    public void showLoginDialog(ActionListener loginListener, String actionCommand) {
-      
-      log.debug("scheduling login dialog");
-        
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-              
-              log.debug("show login dialog");
-              
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-//                titleLabel.setText(messages.getString(TITLE_ERROR));
-
-                JLabel waitMsgLabel = new JLabel();
-                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                waitMsgLabel.setText("<html>LoginDialog not supported yet.</html>");
-                waitMsgLabel.setForeground(ERROR_COLOR);
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                  .addComponent(waitMsgLabel));
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addComponent(waitMsgLabel));
-
-                contentPanel.validate();
-            }
-        });
-    }
-
     @Override
     public void showWelcomeDialog() {
       
@@ -772,7 +735,6 @@ public class SimpleGUI implements BKUGUIFacade {
                 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);
-- 
cgit v1.2.3


From 2cf6fcb31e85b0e3b367121219932ec86b205da8 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 5 Nov 2008 14:42:05 +0000
Subject: help jsp

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@151 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |  2 +-
 .../at/gv/egiz/bku/gui/AbstractHelpListener.java   | 45 +++++++++-------------
 BKUOnline/src/main/webapp/WEB-INF/web.xml          | 11 ++++--
 BKUOnline/src/main/webapp/appletPage.jsp           |  2 +-
 BKUOnline/src/main/webapp/help.jsp                 |  7 ++++
 BKUOnline/src/main/webapp/helpfiles/index.html     | 17 ++++++++
 6 files changed, 53 insertions(+), 31 deletions(-)
 create mode 100644 BKUOnline/src/main/webapp/help.jsp
 create mode 100644 BKUOnline/src/main/webapp/helpfiles/index.html

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index f3eecdf9..4eab7e89 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -89,7 +89,7 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
     URL backgroundImgURL = null;
     URL helpURL = null;
     try {
-      helpURL = getURLParameter(HELP_URL, getAppletParameter(SESSION_ID));
+      helpURL = getURLParameter(HELP_URL); //, getAppletParameter(SESSION_ID));
     } catch (MalformedURLException ex) {
       log.warn("failed to load help URL, disabling help: " + ex.getMessage());
     }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
index 6e3167c1..a249a376 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
@@ -32,39 +32,22 @@ import org.apache.commons.logging.LogFactory;
 public abstract class AbstractHelpListener implements ActionListener {
 
   protected final static Log log = LogFactory.getLog(AbstractHelpListener.class);
-  protected String helpURLBase;
+//  protected String helpURLBase;
+  protected URL baseURL;
   protected Locale locale;
 
   public AbstractHelpListener(URL baseURL, Locale locale) {
     if (baseURL == null || "".equals(baseURL)) {
       throw new RuntimeException("no help URL provided");
     }
-    this.helpURLBase = baseURL.toString();
+    this.baseURL = baseURL;
     this.locale = locale;
   }
 
   @Override
   public void actionPerformed(ActionEvent e) {
     log.debug("received help action: " + e.getActionCommand());
-    URL helpURL;
-    try {
-      String urlString = helpURLBase;
-      if (locale != null) {
-        urlString = appendParameter(urlString, "locale", locale.toString());
-      } 
-      if (e.getActionCommand() != null && !"".equals(e.getActionCommand())) {
-        urlString = appendParameter(urlString, "topic", e.getActionCommand());
-      }
-      helpURL = new URL(urlString);
-    } catch (MalformedURLException ex) {
-      try {
-        log.error("failed to create help URL: " + ex.getMessage());
-        helpURL = new URL(helpURLBase);
-      } catch (MalformedURLException ex1) {
-        log.error("failed to create default help URL, requested help will not be displayed");
-        return;
-      }
-    }
+    URL helpURL = constructHelpURL(baseURL, e.getActionCommand());
     try {
       showDocument(helpURL);
     } catch (Exception ex) {
@@ -72,12 +55,22 @@ public abstract class AbstractHelpListener implements ActionListener {
     }
   }
   
-  private String appendParameter(String url, String paramName, String paramValue) {
-    if (url.indexOf('?') < 0) {
-      return url + "?" + paramName + "=" + paramValue;
-    } else {
-      return url + "&" + paramName + "=" + paramValue;
+  private URL constructHelpURL(URL baseURL, String helpItem) {
+    URL helpURL = baseURL;
+    log.trace("constructing help URL: " + helpURL);
+    try {
+      if (locale != null) {
+        helpURL = new URL(helpURL, locale.toString() + "/");
+        log.trace("constructing help URL: " + helpURL);
+      } 
+      if (helpItem != null && !"".equals(helpItem)) {
+        helpURL = new URL(helpURL, helpItem + ".html");
+        log.trace("constructing help URL: " + helpURL);
+      }
+    } catch (MalformedURLException ex) {
+      log.error("Failed to construct help URL for help item " + helpItem + ": " + ex.getMessage());
     }
+    return helpURL;
   }
   
   public abstract void showDocument(URL helpDocument) throws Exception;
diff --git a/BKUOnline/src/main/webapp/WEB-INF/web.xml b/BKUOnline/src/main/webapp/WEB-INF/web.xml
index 6b2ec35c..f6fdbefc 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/web.xml
+++ b/BKUOnline/src/main/webapp/WEB-INF/web.xml
@@ -52,6 +52,10 @@
 		<servlet-name>HashDataInputServlet</servlet-name>
 		<servlet-class>at.gv.egiz.bku.online.webapp.HashDataInputServlet</servlet-class>
 	</servlet>
+    <servlet>
+      <servlet-name>help</servlet-name>
+      <jsp-file>/help.jsp</jsp-file>
+    </servlet>
 	<servlet-mapping>
 		<servlet-name>BKUServlet</servlet-name>
 		<url-pattern>/http-security-layer-request</url-pattern>
@@ -68,9 +72,10 @@
 		<servlet-name>HashDataInputServlet</servlet-name>
 		<url-pattern>/hashDataInput</url-pattern>
 	</servlet-mapping>
-
-
-
+    <servlet-mapping>
+      <servlet-name>help</servlet-name>
+      <url-pattern>/help/*</url-pattern>
+    </servlet-mapping>
 
 	<!--  End BKU Config -->
 
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp
index 8ddbed13..ff52fe51 100644
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ b/BKUOnline/src/main/webapp/appletPage.jsp
@@ -53,7 +53,7 @@
             GuiStyle : '<%=guiStyle%>',
 			Background : '<%=backgroundImg%>',
 			WSDL_URL :'../stal?wsdl',
-                        HelpURL : '../help',
+                        HelpURL : '../help/',
                         HashDataDisplay : 'external',
                         HashDataURL : '../hashDataInput',
 			SessionID : '<%=session.getId()%>',
diff --git a/BKUOnline/src/main/webapp/help.jsp b/BKUOnline/src/main/webapp/help.jsp
new file mode 100644
index 00000000..29343171
--- /dev/null
+++ b/BKUOnline/src/main/webapp/help.jsp
@@ -0,0 +1,7 @@
+<%-- 
+    Document   : help
+    Created on : 05.11.2008, 10:55:52
+    Author     : Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+--%>
+
+<jsp:include page="/helpfiles/index.html"/>
diff --git a/BKUOnline/src/main/webapp/helpfiles/index.html b/BKUOnline/src/main/webapp/helpfiles/index.html
new file mode 100644
index 00000000..84db59c6
--- /dev/null
+++ b/BKUOnline/src/main/webapp/helpfiles/index.html
@@ -0,0 +1,17 @@
+<!-- 
+    Document   : index
+    Created on : 05.11.2008, 14:09:23
+    Author     : Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  </head>
+  <body>
+  
+  <h2>No help item provided</h2>
+  
+  </body>
+</html>
-- 
cgit v1.2.3


From 1a459eb89e4e91308e1022abb8ddd0cae1d8e619 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 6 Nov 2008 12:24:24 +0000
Subject: error msg ws.unreachable dummy helplistener

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@153 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java | 6 +++---
 .../src/main/resources/at/gv/egiz/bku/gui/Messages.properties       | 3 ++-
 .../java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java     | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 482273b0..829cc79d 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -83,9 +83,10 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
     String locale = getAppletParameter(LOCALE_PARAM_KEY);
     String guiStyle = getAppletParameter(GUI_STYLE);
     URL backgroundImgURL = null;
-    URL helpURL = null;
+    AppletHelpListener helpListener = null;
     try {
-      helpURL = getURLParameter(HELP_URL); //, getAppletParameter(SESSION_ID));
+      URL helpURL = getURLParameter(HELP_URL); //, getAppletParameter(SESSION_ID));
+      helpListener = new AppletHelpListener(helpURL, getLocale()); //getAppletContext(),
     } catch (MalformedURLException ex) {
       log.warn("failed to load help URL, disabling help: " + ex.getMessage());
     }
@@ -101,7 +102,6 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
     log.debug("setting locale to " + getLocale());
 
     BKUGUIFacade gui = BKUGUIFactory.createGUI(guiStyle);
-    AppletHelpListener helpListener = new AppletHelpListener(helpURL, getLocale()); //getAppletContext(),
     gui.init(getContentPane(), getLocale(), backgroundImgURL, helpListener);
 
     worker = new AppletBKUWorker(gui, getAppletContext(), this);
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index aeabc5c1..2dc03491 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -53,7 +53,8 @@ error.no.hashdata=<html>Keine Signaturdaten verf\u00FCgbar: {0}</html>
 error.display.hashdata=<html>Signaturdaten konnten nicht dargestellt werden: {0}</html>
 error.write.hashdata=<html>Die Signaturdaten konnten nicht gespeichert werden: {0}</html>
 error.invalid.hash=<html>Die Signaturdaten sind ung\u00FCltig: {0}</html>
-error.ws.unreachable=<html>Das Web-Service ist nicht erreichbar: {0}</html>
+error.ws.unreachable=<html>Der Server ist nicht erreichbar</html>
+#error.ws.unreachable=<html>Das Web-Service ist nicht erreichbar: {0}</html>
 error.pcsc=<html>Es konnte keine PC/SC Schnittstelle gefunden werden</html>
 error.cardterminal=<html>Es konnte kein Smartcard-Leser gefunden werden</html>
 error.unknown=<html>Leider trat ein Fehler auf: {0}</html>
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
index d5702e0e..19a56502 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
@@ -25,7 +25,6 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import at.gv.egiz.bku.smccstal.SMCCSTALRequestHandler;
 import at.gv.egiz.bku.smccstal.SignRequestHandler;
 import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.stal.STALRequest;
-- 
cgit v1.2.3


From 82c59c9d862d3ee9ad43fdc1509d0b5a61cc107c Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 11 Nov 2008 12:15:15 +0000
Subject: Frame HashData Display Interrupt in waitForAction (applet closed)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@161 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../gv/egiz/bku/online/applet/AppletBKUWorker.java |  12 +-
 .../bku/online/applet/AppletHashDataDisplay.java   | 167 +++++++++++++
 .../egiz/bku/online/applet/AppletHelpListener.java |  33 +--
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |   4 +-
 .../bku/online/applet/BrowserHashDataDisplay.java  |  52 +++++
 .../applet/ExternalDisplaySignRequestHandler.java  |  66 ------
 .../bku/online/applet/JDialogHashDataDisplay.java  | 221 ++++++++++++++++++
 .../applet/WebServiceSignRequestHandler.java       | 164 -------------
 BKUApplet/src/main/resources/simplelog.properties  |   2 +-
 BKUApplet/src/test/resources/appletTest.html       |   4 +-
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   |   2 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   5 +-
 .../java/at/gv/egiz/bku/gui/HashDataViewer.java    | 260 +++++++++++++++++++++
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    |  38 ++-
 .../at/gv/egiz/bku/gui/Messages.properties         |   2 +
 .../at/gv/egiz/bku/gui/Messages_en.properties      |   2 +
 .../gv/egiz/bku/local/gui/LocalHelpListener.java   |   1 -
 .../bku/local/stal/LocalSignRequestHandler.java    |   4 +-
 BKUOnline/src/main/webapp/HTTP-ohne.html           |   5 +-
 BKUOnline/src/main/webapp/appletPage.jsp           |   4 +-
 20 files changed, 773 insertions(+), 275 deletions(-)
 create mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
 create mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHashDataDisplay.java
 delete mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalDisplaySignRequestHandler.java
 create mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/JDialogHashDataDisplay.java
 delete mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WebServiceSignRequestHandler.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
index cf842d55..8e88c012 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
@@ -31,6 +31,7 @@ import at.gv.egiz.stal.service.types.RequestType;
 import at.gv.egiz.stal.service.types.ResponseType;
 import at.gv.egiz.stal.util.STALTranslator;
 import java.applet.AppletContext;
+import java.awt.Dimension;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -194,12 +195,15 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
     String hashDataDisplayStyle = params.getAppletParameter(BKUApplet.HASHDATA_DISPLAY);
     if (BKUApplet.HASHDATA_DISPLAY_INTERNAL.equals(hashDataDisplayStyle)) {
       log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
-      addRequestHandler(SignRequest.class, new WebServiceSignRequestHandler(stalPort, sessionId));
-    } else {
-      //if (HASHDATADISPLAY_EXTERNAL.equals(displayStyle)) {
+      addRequestHandler(SignRequest.class, new AppletHashDataDisplay(stalPort, sessionId));
+    } else if (BKUApplet.HASHDATA_DISPLAY_BROWSER.equals(hashDataDisplayStyle)) {
       URL hashDataURL = params.getURLParameter(BKUApplet.HASHDATA_URL, sessionId);
       log.debug("register SignRequestHandler for HashDataURL " + hashDataURL);
-      addRequestHandler(SignRequest.class, new ExternalDisplaySignRequestHandler(hashDataURL)); //
+      addRequestHandler(SignRequest.class, new BrowserHashDataDisplay(ctx, hashDataURL));
+    } else {
+      //BKUApplet.HASHDATA_DISPLAY_FRAME
+      log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
+      addRequestHandler(SignRequest.class, new JDialogHashDataDisplay(stalPort, sessionId, new Dimension(400, 300), locale));
     }
   }
 }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
new file mode 100644
index 00000000..b77485d9
--- /dev/null
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
@@ -0,0 +1,167 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.online.applet;
+
+import java.security.DigestException;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.bku.smccstal.SignRequestHandler;
+import at.gv.egiz.stal.HashDataInput;
+import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
+import at.gv.egiz.stal.service.STALPortType;
+import at.gv.egiz.stal.service.types.GetHashDataInputResponseType;
+import at.gv.egiz.stal.service.types.GetHashDataInputType;
+import at.gv.egiz.stal.signedinfo.DigestMethodType;
+import at.gv.egiz.stal.signedinfo.ReferenceType;
+
+/**
+ * A SignRequesthandler displaying hashdata inputs in the applet 
+ * (only plaintext data is displayed, other hashdata inputs may be saved to disk).
+ * 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class AppletHashDataDisplay extends SignRequestHandler {
+
+  private static final Log log = LogFactory.getLog(AppletHashDataDisplay.class);
+  STALPortType stalPort;
+  String sessId;
+
+    public AppletHashDataDisplay(STALPortType stalPort, String sessId) {
+    if (stalPort == null || sessId == null) {
+      throw new NullPointerException("STAL port must not be null");
+    }
+    this.sessId = sessId;
+    this.stalPort = stalPort;
+  }
+
+  @Override
+  public void displayHashDataInputs(List<ReferenceType> signedReferences) throws Exception {
+  
+    GetHashDataInputType request = new GetHashDataInputType();
+    request.setSessionId(sessId);
+
+    HashMap<String, ReferenceType> idSignedRefMap = new HashMap<String, ReferenceType>();
+    for (ReferenceType signedRef : signedReferences) {
+      //don't get Manifest, QualifyingProperties, ...
+      if (signedRef.getType() == null) {
+        String signedRefId = signedRef.getId();
+        if (signedRefId != null) {
+          if (log.isTraceEnabled()) {
+            log.trace("requesting hashdata input for reference " + signedRefId);
+          }
+          idSignedRefMap.put(signedRefId, signedRef);
+          GetHashDataInputType.Reference ref = new GetHashDataInputType.Reference();
+          ref.setID(signedRefId);
+          request.getReference().add(ref);
+
+        } else {
+          throw new Exception("Cannot resolve HashDataInput for reference without Id attribute");
+        }
+      }
+    }
+
+    if (log.isDebugEnabled()) {
+      log.debug("Calling GetHashDataInput for " + request.getReference().size() + " references in session " + sessId);
+    }
+    GetHashDataInputResponseType response = stalPort.getHashDataInput(request);
+    ArrayList<HashDataInput> hashDataInputs = new ArrayList<HashDataInput>();
+
+    //hashdata inputs returned from service
+    HashMap<String, GetHashDataInputResponseType.Reference> idRefMap = new HashMap<String, GetHashDataInputResponseType.Reference>();
+    for (GetHashDataInputResponseType.Reference reference : response.getReference()) {
+      String id = reference.getID();
+      byte[] hdi = reference.getValue();
+      if (hdi == null) {
+        throw new Exception("Did not receive hashdata input for reference " + id);
+      }
+      idRefMap.put(id, reference);
+    }
+    
+    for (String signedRefId : idSignedRefMap.keySet()) {
+      log.info("validating hashdata input for reference " + signedRefId);
+      
+      GetHashDataInputResponseType.Reference reference = idRefMap.get(signedRefId);
+      if (reference == null) {
+        throw new Exception("No hashdata input for reference " + signedRefId + " returned by service");
+      }
+      
+//    }
+//    
+//    for (GetHashDataInputResponseType.Reference reference : response.getReference()) {
+//
+//      String id = reference.getID();
+      byte[] hdi = reference.getValue();
+      String mimeType = reference.getMimeType();
+      String encoding = reference.getEncoding();
+
+      if (hdi == null) {
+        throw new Exception("No hashdata input provided for reference " + signedRefId);
+      }
+      if (log.isDebugEnabled()) {
+        log.debug("Got HashDataInput " + signedRefId + " (" + mimeType + ";" + encoding + ")");
+      }
+
+      ReferenceType dsigRef = idSignedRefMap.get(signedRefId);
+      DigestMethodType dm = dsigRef.getDigestMethod();
+      
+      if (dm == null) {
+        throw new Exception("Failed to verify digest value for reference " + signedRefId + ": no digest algorithm");
+      }
+      String mdAlg = dm.getAlgorithm();
+      if ("http://www.w3.org/2000/09/xmldsig#sha1".equals(mdAlg))
+        mdAlg = "SHA-1";
+      else if ("http://www.w3.org/2001/04/xmlenc#sha256".equals(mdAlg))
+        mdAlg = "SHA-256";
+      else if ("http://www.w3.org/2001/04/xmlenc#sha224 ".equals(mdAlg))
+        mdAlg = "SHA-224";
+      else if ("http://www.w3.org/2001/04/xmldsig-more#sha224  ".equals(mdAlg))
+        mdAlg = "SHA-224";
+      else if ("http://www.w3.org/2001/04/xmldsig-more#sha384".equals(mdAlg))
+        mdAlg = "SHA-384";
+      else if ("http://www.w3.org/2001/04/xmlenc#sha512".equals(mdAlg))
+        mdAlg = "SHA-512";
+      else if ("http://www.w3.org/2001/04/xmldsig-more#md2 ".equals(mdAlg))
+        mdAlg = "MD2";
+      else if ("http://www.w3.org/2001/04/xmldsig-more#md5".equals(mdAlg))
+        mdAlg = "MD5";
+      else if ("http://www.w3.org/2001/04/xmlenc#ripemd160 ".equals(mdAlg))
+        mdAlg = "RipeMD-160";
+      else {
+        throw new Exception("Failed to verify digest value for reference " + signedRefId + ": unsupported digest algorithm " + mdAlg);
+      }
+      MessageDigest md = MessageDigest.getInstance(mdAlg);
+      byte[] hdiDigest = md.digest(hdi);
+      if (log.isDebugEnabled())
+        log.debug("Comparing digest values... "); 
+      if (!Arrays.equals(hdiDigest, dsigRef.getDigestValue())) {
+        log.error("digest values differ: " + new String(hdiDigest) + ", " + new String(dsigRef.getDigestValue()));
+        throw new DigestException("Bad digest value for reference " + signedRefId + ": " + new String(dsigRef.getDigestValue()));
+      }
+      hashDataInputs.add(new ByteArrayHashDataInput(hdi, signedRefId, mimeType, encoding));
+    }
+    
+    gui.showHashDataInputDialog(hashDataInputs, false, this, "ok");
+  }
+}
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java
index 743dc7ef..5d199872 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java
@@ -18,45 +18,28 @@
 package at.gv.egiz.bku.online.applet;
 
 import at.gv.egiz.bku.gui.AbstractHelpListener;
-import java.awt.Desktop;
+import java.applet.AppletContext;
 import java.net.URL;
 import java.util.Locale;
 
 /**
- * Now uses java.awt.Desktop, which deprecates 
- * the distinction between local and applet help listener
- * TODO: integrate in AbstractHelpListener
  * 
- * @deprecated 
- * @author clemens
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class AppletHelpListener extends AbstractHelpListener {
 
-//  protected AppletContext ctx;
-  protected Desktop desktop;
+  protected AppletContext ctx;
 
-  public AppletHelpListener(URL helpURL, Locale locale) {
+  public AppletHelpListener(AppletContext ctx, URL helpURL, Locale locale) {
     super(helpURL, locale);
-//    if (ctx == null) {
-//      throw new RuntimeException("no applet context provided");
-//    }
-//    this.ctx = ctx;
-    if (Desktop.isDesktopSupported()) {
-      this.desktop = Desktop.getDesktop();
+    if (ctx == null) {
+      throw new RuntimeException("no applet context provided");
     }
+    this.ctx = ctx;
   }
 
   @Override
   public void showDocument(URL helpDocument) throws Exception {
-//    ctx.showDocument(helpDocument, "_blank");
-    if (desktop == null) {
-      log.error("Failed to open default browser: Desktop API not available (libgnome installed?)");
-    } else {
-      if (!desktop.isSupported(Desktop.Action.BROWSE)) {
-        log.error("Failed to open default browser: The system provides the Desktop API, but does not support the BROWSE action");
-      } else {
-        Desktop.getDesktop().browse(helpDocument.toURI());
-      }
-    }
+    ctx.showDocument(helpDocument, "_blank");
   }
 }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 829cc79d..9d640dee 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -52,6 +52,8 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
   public static final String REDIRECT_URL = "RedirectURL";
   public static final String REDIRECT_TARGET = "RedirectTarget";
   public static final String HASHDATA_DISPLAY_INTERNAL = "internal";
+  public static final String HASHDATA_DISPLAY_BROWSER = "browser";
+  public static final String HASHDATA_DISPLAY_FRAME = "frame";
   
   /**
    * STAL WSDL namespace and service name
@@ -86,7 +88,7 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
     AppletHelpListener helpListener = null;
     try {
       URL helpURL = getURLParameter(HELP_URL); //, getAppletParameter(SESSION_ID));
-      helpListener = new AppletHelpListener(helpURL, getLocale()); //getAppletContext(),
+      helpListener = new AppletHelpListener(getAppletContext(), helpURL, getLocale());
     } catch (MalformedURLException ex) {
       log.warn("failed to load help URL, disabling help: " + ex.getMessage());
     }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHashDataDisplay.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHashDataDisplay.java
new file mode 100644
index 00000000..c30921da
--- /dev/null
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHashDataDisplay.java
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.online.applet;
+
+import java.net.URL;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.bku.smccstal.SignRequestHandler;
+import at.gv.egiz.stal.signedinfo.ReferenceType;
+import java.applet.AppletContext;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class BrowserHashDataDisplay extends SignRequestHandler {
+
+  private static final Log log = LogFactory.getLog(BrowserHashDataDisplay.class);
+  
+  protected AppletContext ctx;
+  protected URL hashDataURL;
+
+  public BrowserHashDataDisplay(AppletContext ctx, URL hashDataURL) {
+    this.ctx = ctx;
+    this.hashDataURL = hashDataURL;
+  }
+
+  @Override
+  public void displayHashDataInputs(List<ReferenceType> signedReferences) throws Exception {
+    //TODO pass reference Id's to servlet (TODO servlet)
+    log.debug("displaying hashdata inputs at " + hashDataURL);
+    ctx.showDocument(hashDataURL, "_blank");
+  }
+}
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalDisplaySignRequestHandler.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalDisplaySignRequestHandler.java
deleted file mode 100644
index e4567a6c..00000000
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/ExternalDisplaySignRequestHandler.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.online.applet;
-
-import java.net.URL;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.bku.smccstal.SignRequestHandler;
-import at.gv.egiz.stal.signedinfo.ReferenceType;
-import java.awt.Desktop;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class ExternalDisplaySignRequestHandler extends SignRequestHandler {
-
-  private static final Log log = LogFactory.getLog(ExternalDisplaySignRequestHandler.class);
-  
-//  AppletContext ctx;
-  protected URL hashDataURL;
-  protected Desktop desktop;
-
-  public ExternalDisplaySignRequestHandler(URL hashDataURL) {
-//    this.ctx = ctx;
-    this.hashDataURL = hashDataURL;
-    if (Desktop.isDesktopSupported()) {
-      desktop = Desktop.getDesktop();
-    }
-  }
-
-  @Override
-  public void displayHashDataInputs(List<ReferenceType> signedReferences) throws Exception {
-    //TODO pass reference Id's to servlet (TODO servlet)
-    log.debug("displaying hashdata inputs at " + hashDataURL);
-//    ctx.showDocument(hashDataURL, "_blank");
-    if (desktop == null) {
-      log.error("Failed to open default browser: Desktop API not available (libgnome installed?)");
-    } else {
-      if (!desktop.isSupported(Desktop.Action.BROWSE)) {
-        log.error("Failed to open default browser: The system provides the Desktop API, but does not support the BROWSE action");
-      } else {
-        Desktop.getDesktop().browse(hashDataURL.toURI());
-      }
-    }
-  }
-
-}
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/JDialogHashDataDisplay.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/JDialogHashDataDisplay.java
new file mode 100644
index 00000000..1f0eda90
--- /dev/null
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/JDialogHashDataDisplay.java
@@ -0,0 +1,221 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.online.applet;
+
+import at.gv.egiz.bku.smccstal.SignRequestHandler;
+import at.gv.egiz.stal.HashDataInput;
+import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
+import at.gv.egiz.stal.service.GetHashDataInputFault;
+import at.gv.egiz.stal.service.STALPortType;
+import at.gv.egiz.stal.service.types.GetHashDataInputResponseType;
+import at.gv.egiz.stal.service.types.GetHashDataInputType;
+import at.gv.egiz.stal.signedinfo.ReferenceType;
+import java.awt.Dimension;
+import java.security.DigestException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+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 JDialogHashDataDisplay extends SignRequestHandler {
+
+  private static final Log log = LogFactory.getLog(JDialogHashDataDisplay.class);
+  protected STALPortType stalPort;
+  protected String sessId;
+//  protected HashDataViewer viewer;
+      
+  public JDialogHashDataDisplay(STALPortType stalPort, String sessId, Dimension viewerSize, Locale locale) {
+    if (stalPort == null || sessId == null) {
+      throw new NullPointerException("STAL port must not be null");
+    }
+    this.sessId = sessId;
+    this.stalPort = stalPort;
+//    this.viewer = new HashDataViewer(viewerSize, locale);
+  }
+
+  @Override
+  public void displayHashDataInputs(List<ReferenceType> signedReferences) throws DigestException, Exception {
+
+    List<GetHashDataInputResponseType.Reference> hdi = getHashDataInput(signedReferences);
+    final List<HashDataInput> verifiedHashDataInputs = verifyHashDataInput(signedReferences, hdi);
+
+    if (verifiedHashDataInputs.size() > 1) {
+      gui.showHashDataInputDialog(verifiedHashDataInputs, false, this, "ok");
+    } else if (verifiedHashDataInputs.size() == 1) {
+      gui.showHashDataInputDialog(verifiedHashDataInputs, true, this, "ok");
+//      SwingUtilities.invokeLater(new Runnable() {
+//
+//        @Override
+//        public void run() {
+//          viewer.displayHashData(verifiedHashDataInputs.get(0));
+//        }
+//      });
+      
+    } else {
+      log.error("No hashdata input to display");
+    }
+
+  }
+
+  /**
+   * Get all hashdata inputs that contain an ID attribute and no Type attribute.
+   * @param signedReferences
+   * @return
+   * @throws at.gv.egiz.stal.service.GetHashDataInputFault
+   */
+  private List<GetHashDataInputResponseType.Reference> getHashDataInput(List<ReferenceType> signedReferences) throws GetHashDataInputFault, Exception {
+    GetHashDataInputType request = new GetHashDataInputType();
+    request.setSessionId(sessId);
+
+//    HashMap<String, ReferenceType> idSignedRefMap = new HashMap<String, ReferenceType>();
+    for (ReferenceType signedRef : signedReferences) {
+      //don't get Manifest, QualifyingProperties, ...
+      if (signedRef.getType() == null) {
+        String signedRefId = signedRef.getId();
+        if (signedRefId != null) {
+          if (log.isTraceEnabled()) {
+            log.trace("requesting hashdata input for reference " + signedRefId);
+          }
+//          idSignedRefMap.put(signedRefId, signedRef);
+          GetHashDataInputType.Reference ref = new GetHashDataInputType.Reference();
+          ref.setID(signedRefId);
+          request.getReference().add(ref);
+
+        } else {
+          throw new Exception("Cannot resolve HashDataInput for reference without Id attribute");
+        }
+      }
+    }
+
+    if (log.isDebugEnabled()) {
+      log.debug("WebService call GetHashDataInput for " + request.getReference().size() + " references in session " + sessId);
+    }
+    GetHashDataInputResponseType response = stalPort.getHashDataInput(request);
+    return response.getReference();
+  }
+
+  /**
+   * Verifies all signed references and returns STAL HashDataInputs
+   * @param signedReferences
+   * @param hashDataInputs
+   * @return
+   * @throws java.security.DigestException
+   * @throws java.security.NoSuchAlgorithmException
+   * @throws Exception if no hashdata input is provided for a signed reference
+   */
+  private List<HashDataInput> verifyHashDataInput(List<ReferenceType> signedReferences, List<GetHashDataInputResponseType.Reference> hashDataInputs) throws DigestException, NoSuchAlgorithmException, Exception {
+
+    ArrayList<HashDataInput> verifiedHashDataInputs = new ArrayList<HashDataInput>();
+
+    //hashdata inputs returned from service
+//    HashMap<String, GetHashDataInputResponseType.Reference> idRefMap = new HashMap<String, GetHashDataInputResponseType.Reference>();
+//    for (GetHashDataInputResponseType.Reference hashDataInput : hashDataInputs) {
+//      String id = hashDataInput.getID();
+//      byte[] hdi = hashDataInput.getValue();
+//      if (hdi == null) {
+//        throw new Exception("Did not receive hashdata input for reference " + id);
+//      }
+//      idRefMap.put(id, hashDataInput);
+//    }
+
+    for (ReferenceType signedRef : signedReferences) {
+      if (signedRef.getType() == null) {
+        log.info("Verifying digest for signed reference " + signedRef.getId());
+
+        String signedRefId = signedRef.getId();
+        byte[] signedDigest = signedRef.getDigestValue();
+        String signedDigestAlg = null;
+        if (signedRef.getDigestMethod() != null) {
+          signedDigestAlg = signedRef.getDigestMethod().getAlgorithm();
+        } else {
+          throw new NoSuchAlgorithmException("Failed to verify digest value for reference " + signedRefId + ": no digest algorithm");
+        }
+
+        GetHashDataInputResponseType.Reference hashDataInput = null; //idRefMap.get(signedRefId);
+        for (GetHashDataInputResponseType.Reference hdi : hashDataInputs) {
+          if (signedRefId.equals(hdi.getID())) {
+            hashDataInput = hdi;
+          }
+        }
+        if (hashDataInput == null) {
+          throw new Exception("No hashdata input for reference " + signedRefId + " returned by service");
+        }
+
+        byte[] hdi = hashDataInput.getValue();
+        String mimeType = hashDataInput.getMimeType();
+        String encoding = hashDataInput.getEncoding();
+
+        if (hdi == null) {
+          throw new Exception("No hashdata input for reference " + signedRefId + " provided by service");
+        }
+        if (log.isDebugEnabled()) {
+          log.debug("Got HashDataInput " + signedRefId + " (" + mimeType + ";" + encoding + ")");
+        }
+
+        byte[] hashDataInputDigest = digest(hdi, signedDigestAlg);
+
+        if (log.isDebugEnabled()) {
+          log.debug("Comparing digest values... ");
+        }
+        log.warn("DISABLED DIGEST VERIFICATION FOR DEBUGGING");
+//        if (!Arrays.equals(hashDataInputDigest, signedDigest)) {
+//          log.error("Bad digest value for reference " + signedRefId);
+//          throw new DigestException("Bad digest value for reference " + signedRefId);
+//        }
+
+        verifiedHashDataInputs.add(new ByteArrayHashDataInput(hdi, signedRefId, mimeType, encoding));
+      }
+    }
+    
+    return verifiedHashDataInputs;
+  }
+
+  //TODO
+  private byte[] digest(byte[] hashDataInput, String mdAlg) throws NoSuchAlgorithmException {
+    if ("http://www.w3.org/2000/09/xmldsig#sha1".equals(mdAlg)) {
+      mdAlg = "SHA-1";
+    } else if ("http://www.w3.org/2001/04/xmlenc#sha256".equals(mdAlg)) {
+      mdAlg = "SHA-256";
+    } else if ("http://www.w3.org/2001/04/xmlenc#sha224".equals(mdAlg)) {
+      mdAlg = "SHA-224";
+    } else if ("http://www.w3.org/2001/04/xmldsig-more#sha224".equals(mdAlg)) {
+      mdAlg = "SHA-224";
+    } else if ("http://www.w3.org/2001/04/xmldsig-more#sha384".equals(mdAlg)) {
+      mdAlg = "SHA-384";
+    } else if ("http://www.w3.org/2001/04/xmlenc#sha512".equals(mdAlg)) {
+      mdAlg = "SHA-512";
+    } else if ("http://www.w3.org/2001/04/xmldsig-more#md2 ".equals(mdAlg)) {
+      mdAlg = "MD2";
+    } else if ("http://www.w3.org/2001/04/xmldsig-more#md5".equals(mdAlg)) {
+      mdAlg = "MD5";
+    } else if ("http://www.w3.org/2001/04/xmlenc#ripemd160 ".equals(mdAlg)) {
+      mdAlg = "RipeMD-160";
+    } else {
+      throw new NoSuchAlgorithmException("Failed to verify digest value: unsupported digest algorithm " + mdAlg);
+    }
+
+    MessageDigest md = MessageDigest.getInstance(mdAlg);
+    return md.digest(hashDataInput);
+  }
+}
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WebServiceSignRequestHandler.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WebServiceSignRequestHandler.java
deleted file mode 100644
index 014065f2..00000000
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/WebServiceSignRequestHandler.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.online.applet;
-
-import java.security.DigestException;
-import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.bku.smccstal.SignRequestHandler;
-import at.gv.egiz.stal.HashDataInput;
-import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
-import at.gv.egiz.stal.service.STALPortType;
-import at.gv.egiz.stal.service.types.GetHashDataInputResponseType;
-import at.gv.egiz.stal.service.types.GetHashDataInputType;
-import at.gv.egiz.stal.signedinfo.DigestMethodType;
-import at.gv.egiz.stal.signedinfo.ReferenceType;
-
-/**
- * @author clemens
- */
-public class WebServiceSignRequestHandler extends SignRequestHandler {
-
-  private static final Log log = LogFactory.getLog(WebServiceSignRequestHandler.class);
-  STALPortType stalPort;
-  String sessId;
-
-    public WebServiceSignRequestHandler(STALPortType stalPort, String sessId) {
-    if (stalPort == null || sessId == null) {
-      throw new NullPointerException("STAL port must not be null");
-    }
-    this.sessId = sessId;
-    this.stalPort = stalPort;
-  }
-
-  @Override
-  public void displayHashDataInputs(List<ReferenceType> signedReferences) throws Exception {
-  
-    GetHashDataInputType request = new GetHashDataInputType();
-    request.setSessionId(sessId);
-
-    HashMap<String, ReferenceType> idSignedRefMap = new HashMap<String, ReferenceType>();
-    for (ReferenceType signedRef : signedReferences) {
-      //don't get Manifest, QualifyingProperties, ...
-      if (signedRef.getType() == null) {
-        String signedRefId = signedRef.getId();
-        if (signedRefId != null) {
-          if (log.isTraceEnabled()) {
-            log.trace("requesting hashdata input for reference " + signedRefId);
-          }
-          idSignedRefMap.put(signedRefId, signedRef);
-          GetHashDataInputType.Reference ref = new GetHashDataInputType.Reference();
-          ref.setID(signedRefId);
-          request.getReference().add(ref);
-
-        } else {
-          throw new Exception("Cannot resolve HashDataInput for reference without Id attribute");
-        }
-      }
-    }
-
-    if (log.isDebugEnabled()) {
-      log.debug("Calling GetHashDataInput for " + request.getReference().size() + " references in session " + sessId);
-    }
-    GetHashDataInputResponseType response = stalPort.getHashDataInput(request);
-    ArrayList<HashDataInput> hashDataInputs = new ArrayList<HashDataInput>();
-
-    //hashdata inputs returned from service
-    HashMap<String, GetHashDataInputResponseType.Reference> idRefMap = new HashMap<String, GetHashDataInputResponseType.Reference>();
-    for (GetHashDataInputResponseType.Reference reference : response.getReference()) {
-      String id = reference.getID();
-      byte[] hdi = reference.getValue();
-      if (hdi == null) {
-        throw new Exception("Did not receive hashdata input for reference " + id);
-      }
-      idRefMap.put(id, reference);
-    }
-    
-    for (String signedRefId : idSignedRefMap.keySet()) {
-      log.info("validating hashdata input for reference " + signedRefId);
-      
-      GetHashDataInputResponseType.Reference reference = idRefMap.get(signedRefId);
-      if (reference == null) {
-        throw new Exception("No hashdata input for reference " + signedRefId + " returned by service");
-      }
-      
-//    }
-//    
-//    for (GetHashDataInputResponseType.Reference reference : response.getReference()) {
-//
-//      String id = reference.getID();
-      byte[] hdi = reference.getValue();
-      String mimeType = reference.getMimeType();
-      String encoding = reference.getEncoding();
-
-      if (hdi == null) {
-        throw new Exception("No hashdata input provided for reference " + signedRefId);
-      }
-      if (log.isDebugEnabled()) {
-        log.debug("Got HashDataInput " + signedRefId + " (" + mimeType + ";" + encoding + ")");
-      }
-
-      ReferenceType dsigRef = idSignedRefMap.get(signedRefId);
-      DigestMethodType dm = dsigRef.getDigestMethod();
-      
-      if (dm == null) {
-        throw new Exception("Failed to verify digest value for reference " + signedRefId + ": no digest algorithm");
-      }
-      String mdAlg = dm.getAlgorithm();
-      if ("http://www.w3.org/2000/09/xmldsig#sha1".equals(mdAlg))
-        mdAlg = "SHA-1";
-      else if ("http://www.w3.org/2001/04/xmlenc#sha256".equals(mdAlg))
-        mdAlg = "SHA-256";
-      else if ("http://www.w3.org/2001/04/xmlenc#sha224 ".equals(mdAlg))
-        mdAlg = "SHA-224";
-      else if ("http://www.w3.org/2001/04/xmldsig-more#sha224  ".equals(mdAlg))
-        mdAlg = "SHA-224";
-      else if ("http://www.w3.org/2001/04/xmldsig-more#sha384".equals(mdAlg))
-        mdAlg = "SHA-384";
-      else if ("http://www.w3.org/2001/04/xmlenc#sha512".equals(mdAlg))
-        mdAlg = "SHA-512";
-      else if ("http://www.w3.org/2001/04/xmldsig-more#md2 ".equals(mdAlg))
-        mdAlg = "MD2";
-      else if ("http://www.w3.org/2001/04/xmldsig-more#md5".equals(mdAlg))
-        mdAlg = "MD5";
-      else if ("http://www.w3.org/2001/04/xmlenc#ripemd160 ".equals(mdAlg))
-        mdAlg = "RipeMD-160";
-      else {
-        throw new Exception("Failed to verify digest value for reference " + signedRefId + ": unsupported digest algorithm " + mdAlg);
-      }
-      MessageDigest md = MessageDigest.getInstance(mdAlg);
-      byte[] hdiDigest = md.digest(hdi);
-      if (log.isDebugEnabled())
-        log.debug("Comparing digest values... "); 
-      if (!Arrays.equals(hdiDigest, dsigRef.getDigestValue())) {
-        log.error("digest values differ: " + new String(hdiDigest) + ", " + new String(dsigRef.getDigestValue()));
-        throw new DigestException("Bad digest value for reference " + signedRefId + ": " + new String(dsigRef.getDigestValue()));
-      }
-      hashDataInputs.add(new ByteArrayHashDataInput(hdi, signedRefId, mimeType, encoding));
-    }
-    
-    gui.showHashDataInputDialog(hashDataInputs, this, "ok");
-  }
-}
diff --git a/BKUApplet/src/main/resources/simplelog.properties b/BKUApplet/src/main/resources/simplelog.properties
index d62508cf..51be76a8 100644
--- a/BKUApplet/src/main/resources/simplelog.properties
+++ b/BKUApplet/src/main/resources/simplelog.properties
@@ -15,7 +15,7 @@
 
 # Logging detail level,
 # Must be one of ("trace", "debug", "info", "warn", "error", or "fatal").
-org.apache.commons.logging.simplelog.defaultlog=debug
+org.apache.commons.logging.simplelog.defaultlog=trace
 # Logs the Log instance used
 org.apache.commons.logging.simplelog.showlogname=true
 #Logs the class name with package(or Path)
diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
index 5aec1998..1ba88e47 100644
--- a/BKUApplet/src/test/resources/appletTest.html
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -20,11 +20,11 @@
       <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=300 height=200>
-              <param name="GuiStyle" value="advanced"/>
+              <param name="GuiStyle" value="simple"/>
               <param name="Background" value="http://localhost:3495/DemoIntegration/mocca_background.png"/>
               <param name="WSDL_URL" value="http://localhost:3495/stal?wsdl"/>
               <param name="HelpURL" value="http://localhost:3495/help/"/>
-              <param name="HashDataDisplay" value="internal"/>
+              <param name="HashDataDisplay" value="frame"/>
               <!--param name="HashDataURL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/hashDataInput"/-->
               <param name="SessionId" value="TestSession"/>
               <param name="RedirectURL" value="http://localhost:3495/bkuResult"/>
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 d96d22c8..d661c71a 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
@@ -814,7 +814,7 @@ public class BKUGUI implements BKUGUIFacade {
     }
     
     @Override
-    public void showHashDataInputDialog(final List<HashDataInput> signedReferences, final ActionListener okListener, final String okCommand) {
+    public void showHashDataInputDialog(final List<HashDataInput> signedReferences, boolean standalone, final ActionListener okListener, final String okCommand) {
       
       if (signedReferences == null) {
         showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {"No SignedReferences provided"}, okListener, okCommand);
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index ad489c2e..38638b5d 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -57,6 +57,7 @@ public interface BKUGUIFacade {
     public static final String WINDOWTITLE_SAVE = "windowtitle.save";
     public static final String WINDOWTITLE_SAVEDIR = "windowtitle.savedir";
     public static final String WINDOWTITLE_OVERWRITE = "windowtitle.overwrite";
+    public static final String WINDOWTITLE_VIEWER = "windowtitle.viewer";
     public static final String MESSAGE_WAIT = "message.wait";
     public static final String MESSAGE_INSERTCARD = "message.insertcard";
     public static final String MESSAGE_ENTERPIN = "message.enterpin";
@@ -77,12 +78,14 @@ public interface BKUGUIFacade {
     public static final String HELP_RETRY = "help.retry";
     public static final String HELP_HASHDATA = "help.hashdata";
     public static final String HELP_HASHDATALIST = "help.hashdatalist";
+    public static final String HELP_HASHDATAVIEWER = "help.hashdataviewer";
     
     public static final String BUTTON_OK = "button.ok";
     public static final String BUTTON_CANCEL = "button.cancel";
     public static final String BUTTON_BACK = "button.back";
     public static final String BUTTON_SIGN = "button.sign";
     public static final String BUTTON_SAVE = "button.save";
+    public static final String BUTTON_CLOSE = "button.close";
     public static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
     
     
@@ -116,7 +119,7 @@ public interface BKUGUIFacade {
     
     public char[] getPin();
     
-    public void showHashDataInputDialog(List<HashDataInput> signedReferences, ActionListener okListener, String actionCommand);
+    public void showHashDataInputDialog(List<HashDataInput> signedReferences, boolean standalone, ActionListener okListener, String actionCommand);
     
 //    public void showPlainTextHashDataInputDialog(String text, ActionListener saveListener, String saveCommand, ActionListener cancelListener, String cancelCommand);
     
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
new file mode 100644
index 00000000..3db06e19
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
@@ -0,0 +1,260 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.stal.HashDataInput;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.text.MessageFormat;
+import java.util.List;
+import java.util.ResourceBundle;
+import javax.swing.GroupLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle;
+import javax.swing.text.Document;
+import javax.swing.text.EditorKit;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class HashDataViewer extends JDialog
+        implements ActionListener, WindowListener {
+
+  public static final String PLAINTEXT_FONT = "Monospaced";
+    
+  protected static final Log log = LogFactory.getLog(HashDataViewer.class);
+  private static HashDataViewer dialog;
+
+  public static void showDialog(Component frameComp, List<HashDataInput> signedReferences, ResourceBundle messages, ActionListener saveListener, String saveCommand, HelpMouseListener helpListener) {
+    
+    log.info("******************* SHOW HASHDATA DIALOG");
+    
+    Frame frame = JOptionPane.getFrameForComponent(frameComp);
+
+    dialog = new HashDataViewer(frame, signedReferences.get(0), messages, saveListener, saveCommand, helpListener);
+    dialog.addWindowListener(dialog);
+    dialog.setVisible(true);
+
+  }
+
+  private HashDataViewer(Frame frame, HashDataInput hashData, ResourceBundle messages, ActionListener saveListener, String saveCommand, HelpMouseListener helpListener) {
+    super(frame, messages.getString(BKUGUIFacade.WINDOWTITLE_VIEWER), true);
+
+    JPanel viewerPanel = createViewerPanel(messages, hashData, helpListener);
+    JPanel buttonPanel = createButtonPanel(messages, saveListener, saveCommand);
+
+
+    Container contentPane = getContentPane();
+    contentPane.setPreferredSize(new Dimension(400, 300));
+
+    GroupLayout mainLayout = new GroupLayout(contentPane);
+    contentPane.setLayout(mainLayout);
+
+        mainLayout.setHorizontalGroup(
+          mainLayout.createSequentialGroup()
+            .addContainerGap()
+            .addGroup(
+              mainLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                .addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+            .addContainerGap());
+        mainLayout.setVerticalGroup(
+          mainLayout.createSequentialGroup()
+            .addContainerGap()
+            .addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 
+            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) 
+            .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+            .addContainerGap());
+
+    pack();
+    setLocationRelativeTo(frame);
+  }
+
+  private JPanel createViewerPanel(ResourceBundle messages, HashDataInput hashData, HelpMouseListener helpListener) {
+    String mimeType = hashData.getMimeType();
+    String encoding = hashData.getEncoding();
+
+    log.debug("display hashdata: " + mimeType + ";" + encoding);
+
+    if (mimeType == null) {
+      mimeType = "text/plain";
+    }
+    if (encoding == null) {
+      encoding = "UTF-8";
+    }
+
+    JEditorPane viewer = new JEditorPane();
+    viewer.setEditable(false);
+    viewer.setContentType(mimeType);
+    if ("text/plain".equals(mimeType)) {
+      viewer.setFont(new Font(PLAINTEXT_FONT, viewer.getFont().getStyle(), viewer.getFont().getSize()));
+    }
+    
+    EditorKit editorKit = viewer.getEditorKit();
+    Document document = editorKit.createDefaultDocument();
+
+    Reader reader;
+    try {
+      reader = new InputStreamReader(hashData.getHashDataInput(), encoding);
+      viewer.read(reader, document);
+    } catch (Exception ex) {
+      String p = messages.getString(BKUGUIFacade.ERR_DISPLAY_HASHDATA);
+      viewer.setText(MessageFormat.format(p, ex.getMessage()));
+    }
+
+    JScrollPane scrollPane = new JScrollPane(viewer);
+//    scrollPane.setPreferredSize(new Dimension(400, 300));
+    scrollPane.setPreferredSize(viewer.getPreferredSize());
+    scrollPane.setAlignmentX(LEFT_ALIGNMENT);
+
+    JLabel viewerTitle = new JLabel();
+    viewerTitle.setText(messages.getString(BKUGUIFacade.TITLE_HASHDATA));
+    viewerTitle.setFont(viewerTitle.getFont().deriveFont(viewerTitle.getFont().getStyle() | java.awt.Font.BOLD));
+    viewerTitle.setLabelFor(viewer);
+    
+    JLabel helpLabel = new JLabel();
+    helpListener.setHelpTopic(BKUGUIFacade.HELP_HASHDATAVIEWER);
+    helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG))); 
+    helpLabel.addMouseListener(helpListener);
+    helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+        
+    JPanel viewerPanel = new JPanel();
+    GroupLayout viewerPanelLayout = new GroupLayout(viewerPanel);
+    viewerPanel.setLayout(viewerPanelLayout);
+
+    viewerPanelLayout.setHorizontalGroup(
+     viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+      .addGroup(viewerPanelLayout.createSequentialGroup()
+        .addComponent(viewerTitle)
+        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+        .addComponent(helpLabel))
+      .addComponent(scrollPane)); //, 0, 0, Short.MAX_VALUE));
+
+    viewerPanelLayout.setVerticalGroup(
+      viewerPanelLayout.createSequentialGroup()
+        .addGroup(viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+          .addComponent(viewerTitle)
+          .addComponent(helpLabel))
+        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+        .addComponent(scrollPane)); //, 0, 0, Short.MAX_VALUE));
+    
+//    viewerPanel.setLayout(new BoxLayout(viewerPanel, BoxLayout.PAGE_AXIS));
+//    JLabel title = new JLabel(messages.getString(BKUGUIFacade.TITLE_HASHDATA));
+//    title.setLabelFor(viewer);
+//    viewerPanel.add(title);
+//    viewerPanel.add(Box.createRigidArea(new Dimension(0, 5)));
+//    viewerPanel.add(scrollPane);
+//    viewerPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+    
+    return viewerPanel;
+  }
+
+  private JPanel createButtonPanel(ResourceBundle messages, ActionListener saveListener, String saveCommand) {
+    JButton closeButton = new JButton();
+    closeButton.setText(messages.getString(BKUGUIFacade.BUTTON_CLOSE));
+    closeButton.addActionListener(this);
+
+    JButton saveButton = new JButton();
+    saveButton.setText(messages.getString(BKUGUIFacade.BUTTON_SAVE));
+    saveButton.setActionCommand(saveCommand);
+    saveButton.addActionListener(saveListener);
+
+    int buttonSize = closeButton.getPreferredSize().width;
+    if (saveButton.getPreferredSize().width > buttonSize) {
+      buttonSize = saveButton.getPreferredSize().width;
+    }
+
+    JPanel buttonPanel = new JPanel();
+    GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+    buttonPanel.setLayout(buttonPanelLayout);
+
+    buttonPanelLayout.setHorizontalGroup(
+            buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(saveButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(closeButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+    buttonPanelLayout.setVerticalGroup(
+            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(closeButton));
+
+    return buttonPanel;
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+//    if ("close".equals(e.getActionCommand())) {
+    HashDataViewer.dialog.setVisible(false);
+//    HashDataViewer.dialog.dispose();
+  }
+
+  @Override
+  public void windowOpened(WindowEvent e) {
+    log.debug("WINDOW OPENED");
+  }
+
+  @Override
+  public void windowClosing(WindowEvent e) {
+    log.debug("WINDOW CLOSING");
+  }
+
+  @Override
+  public void windowClosed(WindowEvent e) {
+    log.debug("WINDOW CLOSED");
+  }
+
+  @Override
+  public void windowIconified(WindowEvent e) {
+    log.debug("WINDOW ICONIFIED");
+  }
+
+  @Override
+  public void windowDeiconified(WindowEvent e) {
+  }
+
+  @Override
+  public void windowActivated(WindowEvent e) {
+    log.debug("WINDOW ACTIVATED");
+  }
+
+  @Override
+  public void windowDeactivated(WindowEvent e) {
+    log.debug("WINDOW DEACTIVATED");
+  }
+
+  
+  
+ 
+  
+  
+  
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index f2a8466b..583dae0f 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -882,14 +882,25 @@ public class SimpleGUI implements BKUGUIFacade {
     }
     
     @Override
-    public void showHashDataInputDialog(final List<HashDataInput> signedReferences, final ActionListener okListener, final String okCommand) {
+    public void showHashDataInputDialog(final List<HashDataInput> signedReferences, boolean standalone, final ActionListener okListener, final String okCommand) {
       
       if (signedReferences == null) {
         showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {"No SignedReferences provided"}, okListener, okCommand);
       }
       
       if (signedReferences.size() == 1) {
-
+        
+        if (standalone) {
+          ActionListener saveHashDataListener = new ActionListener() {
+
+              @Override
+              public void actionPerformed(ActionEvent e) {
+                  showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
+              }
+          };
+          showHashDataViewer(signedReferences, saveHashDataListener, "save");
+          
+        } else {
           if ("text/plain".equals(signedReferences.get(0).getMimeType())) {
             
             ActionListener saveHashDataListener = new ActionListener() {
@@ -910,7 +921,7 @@ public class SimpleGUI implements BKUGUIFacade {
           } else {
             showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
           }
-          
+        }
       } else {
 
         final HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
@@ -926,6 +937,27 @@ public class SimpleGUI implements BKUGUIFacade {
       }
     }
     
+    /**
+     * TODO 
+     * @param hashDataText
+     * @param saveListener
+     * @param saveCommand
+     */
+    private void showHashDataViewer(final List<HashDataInput> signedReferences, final ActionListener saveListener, final String saveCommand) {
+      log.debug("scheduling plaintext hashdatainput dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+        @Override
+        public void run() {
+          
+          log.debug("show plaintext hashdatainput dialog");
+      
+          HashDataViewer.showDialog(contentPane, signedReferences, messages, saveListener, saveCommand, helpListener);
+        }
+      });
+    }
+    
     private void showPlainTextHashDataInputDialog(final String hashDataText, final ActionListener saveListener, final String saveCommand, final ActionListener cancelListener, final String cancelCommand) {
       
       log.debug("scheduling plaintext hashdatainput dialog");
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 2dc03491..c47242b2 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -25,6 +25,7 @@ title.hashdata=<html>Signaturdaten</html>
 windowtitle.save=Signaturdaten speichern
 windowtitle.savedir=Signaturdaten in Verzeichnis speichern
 windowtitle.overwrite=Datei \u00FCberschreiben?
+windowtitle.viewer=Signaturedaten
 message.wait=<html>Bitte warten...</html>
 message.insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
 message.enterpin=<html>{0} eingeben</html>
@@ -40,6 +41,7 @@ button.cancel=Abbrechen
 button.back=Zur\u00FCck
 button.sign=Signieren
 button.save=Speichern...
+button.close=Schlie\u00DFen
 mimetype.desc.xml=XML-Dateien (.xml)
 mimetype.desc.html=HTML-Dateien (.html, .htm)
 mimetype.desc.xhtml=XHTML-Dateien (.xhtml)
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index 3b8ac1bc..c7cc9084 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -25,6 +25,7 @@ title.hashdata=<html>Signature data</html>
 windowtitle.save=Save signature data
 windowtitle.savedir=Save signature data to directory
 windowtitle.overwrite=Overwrite file?
+windowtitle.viewer=Signature data
 message.wait=<html>Please wait...</html>
 message.insertcard=<html>Please insert your citizen-card into the reader</html>
 message.enterpin=<html>Enter {0}</html>
@@ -40,6 +41,7 @@ button.cancel=Cancel
 button.back=Back
 button.sign=Sign
 button.save=Save...
+button.close=Close
 mimetype.desc.xml=XML-files (.xml)
 mimetype.desc.html=HTML-files (.html, .htm)
 mimetype.desc.xhtml=XHTML-files (.xhtml)
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java
index 2251a474..e32c9c3d 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java
@@ -25,7 +25,6 @@ import java.util.Locale;
 
 /**
  *
- * @deprecated see AppletHelpListener
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class LocalHelpListener extends AbstractHelpListener {
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
index 19a56502..19e6a657 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
@@ -53,7 +53,7 @@ public class LocalSignRequestHandler extends SignRequestHandler {
    */
   @SuppressWarnings("unchecked")
   @Override
-  public STALResponse handleRequest(STALRequest request) {
+  public STALResponse handleRequest(STALRequest request) throws InterruptedException {
     if (request instanceof SignRequest) {
       SignRequest signReq = (SignRequest) request;
       hashDataInputs = signReq.getHashDataInput();
@@ -109,7 +109,7 @@ public class LocalSignRequestHandler extends SignRequestHandler {
       log.error("dsig:SignedInfo does not contain a data reference");
       throw new Exception("dsig:SignedInfo does not contain a data reference");
     }
-    gui.showHashDataInputDialog(selectedHashDataInputs, this, "ok");
+    gui.showHashDataInputDialog(selectedHashDataInputs, false, this, "ok");
   }
 
   private ByteArrayHashDataInput getByteArrayHashDataInput(HashDataInput hashDataInput) throws IOException {
diff --git a/BKUOnline/src/main/webapp/HTTP-ohne.html b/BKUOnline/src/main/webapp/HTTP-ohne.html
index 47c059f2..112a1d92 100644
--- a/BKUOnline/src/main/webapp/HTTP-ohne.html
+++ b/BKUOnline/src/main/webapp/HTTP-ohne.html
@@ -99,8 +99,9 @@ legend {
 </p>
 <p>
 	<label for="appletHashDataDisplay">HashData Display</label> 
-	<input type="radio" name="appletHashDataDisplay" value="external" checked="checked">external
-	<input type="radio" name="appletHashDataDisplay" value="internal">internal
+    <input type="radio" name="appletHashDataDisplay" value="frame" checked="checked">Frame
+    <input type="radio" name="appletHashDataDisplay" value="browser">Browser
+	<input type="radio" name="appletHashDataDisplay" value="internal">Applet
 </p>
 
 <!-- 
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp
index 55b84231..51ab0006 100644
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ b/BKUOnline/src/main/webapp/appletPage.jsp
@@ -50,11 +50,11 @@
 			height :<%=height%>
 		};
 		var parameters = {
-            GuiStyle : '<%=guiStyle%>',
+                        GuiStyle : '<%=guiStyle%>',
 			Background : '<%=backgroundImg%>',
 			WSDL_URL :'../stal?wsdl',
                         HelpURL : '../help/',
-                        HashDataDisplay : <%=hashDataDisplay%>,
+                        HashDataDisplay : '<%=hashDataDisplay%>',
                         HashDataURL : '../hashDataInput',
 			SessionID : '<%=session.getId()%>',
 			RedirectURL : '../bkuResult'
-- 
cgit v1.2.3


From 9662ac90b6aa84bc54543d3c8670ba6c8e42bbac Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 13 Nov 2008 18:24:57 +0000
Subject: FRAME HashDataDisplay FRAME Help

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@165 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../gv/egiz/bku/online/applet/AppletBKUWorker.java |   6 +-
 .../bku/online/applet/AppletHashDataDisplay.java   | 217 ++++++++-----
 .../egiz/bku/online/applet/AppletHelpListener.java |  45 ---
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |   6 +-
 .../bku/online/applet/BrowserHelpListener.java     |  45 +++
 .../bku/online/applet/DefaultHelpListener.java     |  77 +++++
 .../bku/online/applet/JDialogHashDataDisplay.java  | 221 -------------
 .../at/gv/egiz/bku/gui/AbstractHelpListener.java   |  41 ++-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java | 219 +++++++------
 .../at/gv/egiz/bku/gui/HashDataTableModel.java     |  10 +-
 .../java/at/gv/egiz/bku/gui/HashDataViewer.java    | 260 ---------------
 .../java/at/gv/egiz/bku/gui/HyperLinkRenderer.java |  47 +++
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    |  35 +-
 .../gv/egiz/bku/gui/SimpleHashDataTableModel.java  |  60 ++++
 .../main/java/at/gv/egiz/bku/gui/ViewerDialog.java | 354 +++++++++++++++++++++
 .../at/gv/egiz/bku/gui/Messages.properties         |  20 +-
 .../at/gv/egiz/bku/gui/Messages_en.properties      |  17 +-
 BKUCommonGUI/src/main/resources/images/help.png    | Bin 746 -> 303 bytes
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |   2 +-
 .../gv/egiz/stal/service/impl/STALServiceImpl.java |   8 +-
 .../at/gv/egiz/bku/online/conf/SSLConfigTest.java  |   3 +-
 STALService/pom.xml                                |   4 +-
 .../at/gv/egiz/stal/util/HashDataInputProxy.java   |  67 ----
 .../gv/egiz/bku/smccstal/HashDataInputDisplay.java |  20 +-
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   |  16 +-
 25 files changed, 961 insertions(+), 839 deletions(-)
 delete mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java
 create mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHelpListener.java
 create mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/DefaultHelpListener.java
 delete mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/JDialogHashDataDisplay.java
 delete mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperLinkRenderer.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleHashDataTableModel.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerDialog.java
 delete mode 100644 STALService/src/main/java/at/gv/egiz/stal/util/HashDataInputProxy.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
index 8e88c012..db88c037 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
@@ -195,7 +195,8 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
     String hashDataDisplayStyle = params.getAppletParameter(BKUApplet.HASHDATA_DISPLAY);
     if (BKUApplet.HASHDATA_DISPLAY_INTERNAL.equals(hashDataDisplayStyle)) {
       log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
-      addRequestHandler(SignRequest.class, new AppletHashDataDisplay(stalPort, sessionId));
+      AppletHashDataDisplay handler = new AppletHashDataDisplay(stalPort, sessionId, AppletHashDataDisplay.DISPLAY.applet);
+      addRequestHandler(SignRequest.class, handler);
     } else if (BKUApplet.HASHDATA_DISPLAY_BROWSER.equals(hashDataDisplayStyle)) {
       URL hashDataURL = params.getURLParameter(BKUApplet.HASHDATA_URL, sessionId);
       log.debug("register SignRequestHandler for HashDataURL " + hashDataURL);
@@ -203,7 +204,8 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
     } else {
       //BKUApplet.HASHDATA_DISPLAY_FRAME
       log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
-      addRequestHandler(SignRequest.class, new JDialogHashDataDisplay(stalPort, sessionId, new Dimension(400, 300), locale));
+      AppletHashDataDisplay handler = new AppletHashDataDisplay(stalPort, sessionId, AppletHashDataDisplay.DISPLAY.frame);
+      addRequestHandler(SignRequest.class, handler);
     }
   }
 }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
index b77485d9..29a60f1d 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package at.gv.egiz.bku.online.applet;
 
+import at.gv.egiz.bku.gui.BKUGUIFacade;
 import java.security.DigestException;
 import java.security.MessageDigest;
 import java.util.ArrayList;
@@ -30,39 +30,69 @@ import org.apache.commons.logging.LogFactory;
 import at.gv.egiz.bku.smccstal.SignRequestHandler;
 import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
+import at.gv.egiz.stal.service.GetHashDataInputFault;
 import at.gv.egiz.stal.service.STALPortType;
 import at.gv.egiz.stal.service.types.GetHashDataInputResponseType;
 import at.gv.egiz.stal.service.types.GetHashDataInputType;
 import at.gv.egiz.stal.signedinfo.DigestMethodType;
 import at.gv.egiz.stal.signedinfo.ReferenceType;
+import java.security.NoSuchAlgorithmException;
 
 /**
- * A SignRequesthandler displaying hashdata inputs in the applet 
- * (only plaintext data is displayed, other hashdata inputs may be saved to disk).
+ * A SignRequesthandler that obtains hashdata inputs from a STAL webservice and
+ * displays these either within the applet or in a separate frame.
+ * The internal viewer displays plaintext data only, other mimetypes can be saved to disk.
+ * The standalone (frame) viewer displays all mimetypes.
+ * 
+ * (This class depends on STALService and therefore is not part of BKUCommonGUI.)
  * 
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class AppletHashDataDisplay extends SignRequestHandler {
 
+  public static enum DISPLAY {
+    applet, frame
+  }
   private static final Log log = LogFactory.getLog(AppletHashDataDisplay.class);
-  STALPortType stalPort;
-  String sessId;
+  protected STALPortType stalPort;
+  protected String sessId;
+  protected DISPLAY display;
 
-    public AppletHashDataDisplay(STALPortType stalPort, String sessId) {
+  public AppletHashDataDisplay(STALPortType stalPort, String sessId, DISPLAY display) {
     if (stalPort == null || sessId == null) {
       throw new NullPointerException("STAL port must not be null");
     }
     this.sessId = sessId;
     this.stalPort = stalPort;
+    this.display = display;
   }
 
   @Override
-  public void displayHashDataInputs(List<ReferenceType> signedReferences) throws Exception {
-  
+  public void displayHashDataInputs(List<ReferenceType> signedReferences) throws DigestException, Exception {
+
+    List<GetHashDataInputResponseType.Reference> hdi = getHashDataInput(signedReferences);
+    List<HashDataInput> verifiedHashDataInputs = verifyHashDataInput(signedReferences, hdi);
+
+    if (verifiedHashDataInputs.size() > 1) {
+      gui.showHashDataInputDialog(verifiedHashDataInputs, false, this, "ok");
+    } else if (verifiedHashDataInputs.size() == 1) {
+      gui.showHashDataInputDialog(verifiedHashDataInputs, display==DISPLAY.frame, this, "ok");
+    } else {
+      throw new Exception("No signature data (apart from any QualifyingProperties or a Manifest)");
+    }
+  }
+
+  /**
+   * Get all hashdata inputs that contain an ID attribute but no Type attribute.
+   * @param signedReferences
+   * @return
+   * @throws at.gv.egiz.stal.service.GetHashDataInputFault
+   */
+  private List<GetHashDataInputResponseType.Reference> getHashDataInput(List<ReferenceType> signedReferences) throws GetHashDataInputFault, Exception {
     GetHashDataInputType request = new GetHashDataInputType();
     request.setSessionId(sessId);
 
-    HashMap<String, ReferenceType> idSignedRefMap = new HashMap<String, ReferenceType>();
+//    HashMap<String, ReferenceType> idSignedRefMap = new HashMap<String, ReferenceType>();
     for (ReferenceType signedRef : signedReferences) {
       //don't get Manifest, QualifyingProperties, ...
       if (signedRef.getType() == null) {
@@ -71,97 +101,116 @@ public class AppletHashDataDisplay extends SignRequestHandler {
           if (log.isTraceEnabled()) {
             log.trace("requesting hashdata input for reference " + signedRefId);
           }
-          idSignedRefMap.put(signedRefId, signedRef);
+//          idSignedRefMap.put(signedRefId, signedRef);
           GetHashDataInputType.Reference ref = new GetHashDataInputType.Reference();
           ref.setID(signedRefId);
           request.getReference().add(ref);
 
         } else {
-          throw new Exception("Cannot resolve HashDataInput for reference without Id attribute");
+          throw new Exception("Cannot resolve signature data for dsig:Reference without Id attribute");
         }
       }
     }
 
     if (log.isDebugEnabled()) {
-      log.debug("Calling GetHashDataInput for " + request.getReference().size() + " references in session " + sessId);
+      log.debug("WebService call GetHashDataInput for " + request.getReference().size() + " references in session " + sessId);
     }
     GetHashDataInputResponseType response = stalPort.getHashDataInput(request);
-    ArrayList<HashDataInput> hashDataInputs = new ArrayList<HashDataInput>();
-
-    //hashdata inputs returned from service
-    HashMap<String, GetHashDataInputResponseType.Reference> idRefMap = new HashMap<String, GetHashDataInputResponseType.Reference>();
-    for (GetHashDataInputResponseType.Reference reference : response.getReference()) {
-      String id = reference.getID();
-      byte[] hdi = reference.getValue();
-      if (hdi == null) {
-        throw new Exception("Did not receive hashdata input for reference " + id);
+    return response.getReference();
+  }
+
+  /**
+   * Verifies all signed references and returns STAL HashDataInputs
+   * @param signedReferences
+   * @param hashDataInputs
+   * @return
+   * @throws java.security.DigestException
+   * @throws java.security.NoSuchAlgorithmException
+   * @throws Exception if no hashdata input is provided for a signed reference
+   */
+  private List<HashDataInput> verifyHashDataInput(List<ReferenceType> signedReferences, List<GetHashDataInputResponseType.Reference> hashDataInputs) throws DigestException, NoSuchAlgorithmException, Exception {
+
+    ArrayList<HashDataInput> verifiedHashDataInputs = new ArrayList<HashDataInput>();
+
+    for (ReferenceType signedRef : signedReferences) {
+      if (signedRef.getType() == null) {
+        log.info("Verifying digest for signed reference " + signedRef.getId());
+
+        String signedRefId = signedRef.getId();
+        byte[] signedDigest = signedRef.getDigestValue();
+        String signedDigestAlg = null;
+        if (signedRef.getDigestMethod() != null) {
+          signedDigestAlg = signedRef.getDigestMethod().getAlgorithm();
+        } else {
+          throw new NoSuchAlgorithmException("Failed to verify digest value for reference " + signedRefId + ": no digest algorithm");
+        }
+
+        // usually, there is just one item here
+        GetHashDataInputResponseType.Reference hashDataInput = null;
+        for (GetHashDataInputResponseType.Reference hdi : hashDataInputs) {
+          if (signedRefId.equals(hdi.getID())) {
+            hashDataInput = hdi;
+            break;
+          }
+        }
+        if (hashDataInput == null) {
+          throw new Exception("No hashdata input for reference " + signedRefId + " returned by service");
+        }
+
+        byte[] hdi = hashDataInput.getValue();
+        String mimeType = hashDataInput.getMimeType();
+        String encoding = hashDataInput.getEncoding();
+
+        if (hdi == null) {
+          throw new Exception("No hashdata input for reference " + signedRefId + " provided by service");
+        }
+        if (log.isDebugEnabled()) {
+          log.debug("Got HashDataInput " + signedRefId + " (" + mimeType + ";" + encoding + ")");
+        }
+
+        byte[] hashDataInputDigest = digest(hdi, signedDigestAlg);
+
+        if (log.isDebugEnabled()) {
+          log.debug("Comparing digest values... ");
+        }
+//        log.warn("***************** DISABLED HASHDATA VERIFICATION");
+        if (!Arrays.equals(hashDataInputDigest, signedDigest)) {
+          log.error("Bad digest value for reference " + signedRefId);
+          throw new DigestException("Bad digest value for reference " + signedRefId);
+        }
+
+        verifiedHashDataInputs.add(new ByteArrayHashDataInput(hdi, signedRefId, mimeType, encoding));
       }
-      idRefMap.put(id, reference);
     }
     
-    for (String signedRefId : idSignedRefMap.keySet()) {
-      log.info("validating hashdata input for reference " + signedRefId);
-      
-      GetHashDataInputResponseType.Reference reference = idRefMap.get(signedRefId);
-      if (reference == null) {
-        throw new Exception("No hashdata input for reference " + signedRefId + " returned by service");
-      }
-      
-//    }
-//    
-//    for (GetHashDataInputResponseType.Reference reference : response.getReference()) {
-//
-//      String id = reference.getID();
-      byte[] hdi = reference.getValue();
-      String mimeType = reference.getMimeType();
-      String encoding = reference.getEncoding();
-
-      if (hdi == null) {
-        throw new Exception("No hashdata input provided for reference " + signedRefId);
-      }
-      if (log.isDebugEnabled()) {
-        log.debug("Got HashDataInput " + signedRefId + " (" + mimeType + ";" + encoding + ")");
-      }
+    return verifiedHashDataInputs;
+  }
 
-      ReferenceType dsigRef = idSignedRefMap.get(signedRefId);
-      DigestMethodType dm = dsigRef.getDigestMethod();
-      
-      if (dm == null) {
-        throw new Exception("Failed to verify digest value for reference " + signedRefId + ": no digest algorithm");
-      }
-      String mdAlg = dm.getAlgorithm();
-      if ("http://www.w3.org/2000/09/xmldsig#sha1".equals(mdAlg))
-        mdAlg = "SHA-1";
-      else if ("http://www.w3.org/2001/04/xmlenc#sha256".equals(mdAlg))
-        mdAlg = "SHA-256";
-      else if ("http://www.w3.org/2001/04/xmlenc#sha224 ".equals(mdAlg))
-        mdAlg = "SHA-224";
-      else if ("http://www.w3.org/2001/04/xmldsig-more#sha224  ".equals(mdAlg))
-        mdAlg = "SHA-224";
-      else if ("http://www.w3.org/2001/04/xmldsig-more#sha384".equals(mdAlg))
-        mdAlg = "SHA-384";
-      else if ("http://www.w3.org/2001/04/xmlenc#sha512".equals(mdAlg))
-        mdAlg = "SHA-512";
-      else if ("http://www.w3.org/2001/04/xmldsig-more#md2 ".equals(mdAlg))
-        mdAlg = "MD2";
-      else if ("http://www.w3.org/2001/04/xmldsig-more#md5".equals(mdAlg))
-        mdAlg = "MD5";
-      else if ("http://www.w3.org/2001/04/xmlenc#ripemd160 ".equals(mdAlg))
-        mdAlg = "RipeMD-160";
-      else {
-        throw new Exception("Failed to verify digest value for reference " + signedRefId + ": unsupported digest algorithm " + mdAlg);
-      }
-      MessageDigest md = MessageDigest.getInstance(mdAlg);
-      byte[] hdiDigest = md.digest(hdi);
-      if (log.isDebugEnabled())
-        log.debug("Comparing digest values... "); 
-      if (!Arrays.equals(hdiDigest, dsigRef.getDigestValue())) {
-        log.error("digest values differ: " + new String(hdiDigest) + ", " + new String(dsigRef.getDigestValue()));
-        throw new DigestException("Bad digest value for reference " + signedRefId + ": " + new String(dsigRef.getDigestValue()));
-      }
-      hashDataInputs.add(new ByteArrayHashDataInput(hdi, signedRefId, mimeType, encoding));
+  //TODO
+  private byte[] digest(byte[] hashDataInput, String mdAlg) throws NoSuchAlgorithmException {
+    if ("http://www.w3.org/2000/09/xmldsig#sha1".equals(mdAlg)) {
+      mdAlg = "SHA-1";
+    } else if ("http://www.w3.org/2001/04/xmlenc#sha256".equals(mdAlg)) {
+      mdAlg = "SHA-256";
+    } else if ("http://www.w3.org/2001/04/xmlenc#sha224".equals(mdAlg)) {
+      mdAlg = "SHA-224";
+    } else if ("http://www.w3.org/2001/04/xmldsig-more#sha224".equals(mdAlg)) {
+      mdAlg = "SHA-224";
+    } else if ("http://www.w3.org/2001/04/xmldsig-more#sha384".equals(mdAlg)) {
+      mdAlg = "SHA-384";
+    } else if ("http://www.w3.org/2001/04/xmlenc#sha512".equals(mdAlg)) {
+      mdAlg = "SHA-512";
+    } else if ("http://www.w3.org/2001/04/xmldsig-more#md2".equals(mdAlg)) {
+      mdAlg = "MD2";
+    } else if ("http://www.w3.org/2001/04/xmldsig-more#md5".equals(mdAlg)) {
+      mdAlg = "MD5";
+    } else if ("http://www.w3.org/2001/04/xmlenc#ripemd160".equals(mdAlg)) {
+      mdAlg = "RipeMD-160";
+    } else {
+      throw new NoSuchAlgorithmException("Failed to verify digest value: unsupported digest algorithm " + mdAlg);
     }
-    
-    gui.showHashDataInputDialog(hashDataInputs, false, this, "ok");
+
+    MessageDigest md = MessageDigest.getInstance(mdAlg);
+    return md.digest(hashDataInput);
   }
 }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java
deleted file mode 100644
index 5d199872..00000000
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHelpListener.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.online.applet;
-
-import at.gv.egiz.bku.gui.AbstractHelpListener;
-import java.applet.AppletContext;
-import java.net.URL;
-import java.util.Locale;
-
-/**
- * 
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class AppletHelpListener extends AbstractHelpListener {
-
-  protected AppletContext ctx;
-
-  public AppletHelpListener(AppletContext ctx, URL helpURL, Locale locale) {
-    super(helpURL, locale);
-    if (ctx == null) {
-      throw new RuntimeException("no applet context provided");
-    }
-    this.ctx = ctx;
-  }
-
-  @Override
-  public void showDocument(URL helpDocument) throws Exception {
-    ctx.showDocument(helpDocument, "_blank");
-  }
-}
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 9d640dee..b4407b22 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -16,6 +16,7 @@
  */
 package at.gv.egiz.bku.online.applet;
 
+import at.gv.egiz.bku.gui.AbstractHelpListener;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Locale;
@@ -85,10 +86,11 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
     String locale = getAppletParameter(LOCALE_PARAM_KEY);
     String guiStyle = getAppletParameter(GUI_STYLE);
     URL backgroundImgURL = null;
-    AppletHelpListener helpListener = null;
+    AbstractHelpListener helpListener = null;
     try {
       URL helpURL = getURLParameter(HELP_URL); //, getAppletParameter(SESSION_ID));
-      helpListener = new AppletHelpListener(getAppletContext(), helpURL, getLocale());
+//      helpListener = new BrowserHelpListener(getAppletContext(), helpURL, getLocale());
+      helpListener = new DefaultHelpListener(helpURL, getLocale());
     } catch (MalformedURLException ex) {
       log.warn("failed to load help URL, disabling help: " + ex.getMessage());
     }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHelpListener.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHelpListener.java
new file mode 100644
index 00000000..265acca0
--- /dev/null
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHelpListener.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.online.applet;
+
+import at.gv.egiz.bku.gui.AbstractHelpListener;
+import java.applet.AppletContext;
+import java.net.URL;
+import java.util.Locale;
+
+/**
+ * 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class BrowserHelpListener extends AbstractHelpListener {
+
+  protected AppletContext ctx;
+
+  public BrowserHelpListener(AppletContext ctx, URL helpURL, Locale locale) {
+    super(helpURL, locale);
+    if (ctx == null) {
+      throw new RuntimeException("no applet context provided");
+    }
+    this.ctx = ctx;
+  }
+
+  @Override
+  public void showDocument(URL helpDocument, String helpTopic) throws Exception {
+    ctx.showDocument(helpDocument, "_blank");
+  }
+}
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/DefaultHelpListener.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/DefaultHelpListener.java
new file mode 100644
index 00000000..9876ef7e
--- /dev/null
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/DefaultHelpListener.java
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.online.applet;
+
+import at.gv.egiz.bku.gui.AbstractHelpListener;
+import at.gv.egiz.bku.gui.ViewerDialog;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Locale;
+import javax.swing.SwingUtilities;
+
+/**
+ * This class depends on BKU utils, and therefore is not part of BKUCommonGUI
+ * 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class DefaultHelpListener extends AbstractHelpListener {
+
+  public DefaultHelpListener(URL helpURL, Locale locale) {
+    super(helpURL, locale);
+  }
+
+  @Override
+  public void showDocument(URL helpURL, final String helpTopic) throws Exception {
+    log.debug("open connection " + helpURL);
+    URLConnection conn = helpURL.openConnection();
+    
+    log.debug("show help document " + conn.getContentType()); // + ";" + conn.getContentEncoding());
+    
+//    Charset cs;
+//    if (conn.getContentEncoding() == null) {
+//      cs = Charset.forName("UTF-8");
+//    } else {
+//      try {
+//        cs = Charset.forName(conn.getContentEncoding());
+//      } catch (Exception ex) {
+//        log.debug("charset " + conn.getContentEncoding() + " not supported, assuming UTF-8: " + ex.getMessage());
+//        cs = Charset.forName("UTF-8");
+//      }  
+//    }
+    
+//    InputStreamReader isr = new InputStreamReader(conn.getInputStream(), cs);
+//    final Reader content = new BufferedReader(isr);
+    final InputStream content = conn.getInputStream();
+    final String mimeType = conn.getContentType();
+      
+    log.debug("schedule help dialog");
+    
+    SwingUtilities.invokeLater(new Runnable() {
+
+        @Override
+        public void run() {
+          
+          log.debug("show help dialog");
+          
+          ViewerDialog.showHelp(null, helpTopic, content, mimeType, messages);
+      
+        }
+      });
+//    gui.showHelpDialog(helpDocument.getStream(), mimetype, encoding);
+  }
+}
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/JDialogHashDataDisplay.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/JDialogHashDataDisplay.java
deleted file mode 100644
index 1f0eda90..00000000
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/JDialogHashDataDisplay.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.online.applet;
-
-import at.gv.egiz.bku.smccstal.SignRequestHandler;
-import at.gv.egiz.stal.HashDataInput;
-import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
-import at.gv.egiz.stal.service.GetHashDataInputFault;
-import at.gv.egiz.stal.service.STALPortType;
-import at.gv.egiz.stal.service.types.GetHashDataInputResponseType;
-import at.gv.egiz.stal.service.types.GetHashDataInputType;
-import at.gv.egiz.stal.signedinfo.ReferenceType;
-import java.awt.Dimension;
-import java.security.DigestException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.List;
-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 JDialogHashDataDisplay extends SignRequestHandler {
-
-  private static final Log log = LogFactory.getLog(JDialogHashDataDisplay.class);
-  protected STALPortType stalPort;
-  protected String sessId;
-//  protected HashDataViewer viewer;
-      
-  public JDialogHashDataDisplay(STALPortType stalPort, String sessId, Dimension viewerSize, Locale locale) {
-    if (stalPort == null || sessId == null) {
-      throw new NullPointerException("STAL port must not be null");
-    }
-    this.sessId = sessId;
-    this.stalPort = stalPort;
-//    this.viewer = new HashDataViewer(viewerSize, locale);
-  }
-
-  @Override
-  public void displayHashDataInputs(List<ReferenceType> signedReferences) throws DigestException, Exception {
-
-    List<GetHashDataInputResponseType.Reference> hdi = getHashDataInput(signedReferences);
-    final List<HashDataInput> verifiedHashDataInputs = verifyHashDataInput(signedReferences, hdi);
-
-    if (verifiedHashDataInputs.size() > 1) {
-      gui.showHashDataInputDialog(verifiedHashDataInputs, false, this, "ok");
-    } else if (verifiedHashDataInputs.size() == 1) {
-      gui.showHashDataInputDialog(verifiedHashDataInputs, true, this, "ok");
-//      SwingUtilities.invokeLater(new Runnable() {
-//
-//        @Override
-//        public void run() {
-//          viewer.displayHashData(verifiedHashDataInputs.get(0));
-//        }
-//      });
-      
-    } else {
-      log.error("No hashdata input to display");
-    }
-
-  }
-
-  /**
-   * Get all hashdata inputs that contain an ID attribute and no Type attribute.
-   * @param signedReferences
-   * @return
-   * @throws at.gv.egiz.stal.service.GetHashDataInputFault
-   */
-  private List<GetHashDataInputResponseType.Reference> getHashDataInput(List<ReferenceType> signedReferences) throws GetHashDataInputFault, Exception {
-    GetHashDataInputType request = new GetHashDataInputType();
-    request.setSessionId(sessId);
-
-//    HashMap<String, ReferenceType> idSignedRefMap = new HashMap<String, ReferenceType>();
-    for (ReferenceType signedRef : signedReferences) {
-      //don't get Manifest, QualifyingProperties, ...
-      if (signedRef.getType() == null) {
-        String signedRefId = signedRef.getId();
-        if (signedRefId != null) {
-          if (log.isTraceEnabled()) {
-            log.trace("requesting hashdata input for reference " + signedRefId);
-          }
-//          idSignedRefMap.put(signedRefId, signedRef);
-          GetHashDataInputType.Reference ref = new GetHashDataInputType.Reference();
-          ref.setID(signedRefId);
-          request.getReference().add(ref);
-
-        } else {
-          throw new Exception("Cannot resolve HashDataInput for reference without Id attribute");
-        }
-      }
-    }
-
-    if (log.isDebugEnabled()) {
-      log.debug("WebService call GetHashDataInput for " + request.getReference().size() + " references in session " + sessId);
-    }
-    GetHashDataInputResponseType response = stalPort.getHashDataInput(request);
-    return response.getReference();
-  }
-
-  /**
-   * Verifies all signed references and returns STAL HashDataInputs
-   * @param signedReferences
-   * @param hashDataInputs
-   * @return
-   * @throws java.security.DigestException
-   * @throws java.security.NoSuchAlgorithmException
-   * @throws Exception if no hashdata input is provided for a signed reference
-   */
-  private List<HashDataInput> verifyHashDataInput(List<ReferenceType> signedReferences, List<GetHashDataInputResponseType.Reference> hashDataInputs) throws DigestException, NoSuchAlgorithmException, Exception {
-
-    ArrayList<HashDataInput> verifiedHashDataInputs = new ArrayList<HashDataInput>();
-
-    //hashdata inputs returned from service
-//    HashMap<String, GetHashDataInputResponseType.Reference> idRefMap = new HashMap<String, GetHashDataInputResponseType.Reference>();
-//    for (GetHashDataInputResponseType.Reference hashDataInput : hashDataInputs) {
-//      String id = hashDataInput.getID();
-//      byte[] hdi = hashDataInput.getValue();
-//      if (hdi == null) {
-//        throw new Exception("Did not receive hashdata input for reference " + id);
-//      }
-//      idRefMap.put(id, hashDataInput);
-//    }
-
-    for (ReferenceType signedRef : signedReferences) {
-      if (signedRef.getType() == null) {
-        log.info("Verifying digest for signed reference " + signedRef.getId());
-
-        String signedRefId = signedRef.getId();
-        byte[] signedDigest = signedRef.getDigestValue();
-        String signedDigestAlg = null;
-        if (signedRef.getDigestMethod() != null) {
-          signedDigestAlg = signedRef.getDigestMethod().getAlgorithm();
-        } else {
-          throw new NoSuchAlgorithmException("Failed to verify digest value for reference " + signedRefId + ": no digest algorithm");
-        }
-
-        GetHashDataInputResponseType.Reference hashDataInput = null; //idRefMap.get(signedRefId);
-        for (GetHashDataInputResponseType.Reference hdi : hashDataInputs) {
-          if (signedRefId.equals(hdi.getID())) {
-            hashDataInput = hdi;
-          }
-        }
-        if (hashDataInput == null) {
-          throw new Exception("No hashdata input for reference " + signedRefId + " returned by service");
-        }
-
-        byte[] hdi = hashDataInput.getValue();
-        String mimeType = hashDataInput.getMimeType();
-        String encoding = hashDataInput.getEncoding();
-
-        if (hdi == null) {
-          throw new Exception("No hashdata input for reference " + signedRefId + " provided by service");
-        }
-        if (log.isDebugEnabled()) {
-          log.debug("Got HashDataInput " + signedRefId + " (" + mimeType + ";" + encoding + ")");
-        }
-
-        byte[] hashDataInputDigest = digest(hdi, signedDigestAlg);
-
-        if (log.isDebugEnabled()) {
-          log.debug("Comparing digest values... ");
-        }
-        log.warn("DISABLED DIGEST VERIFICATION FOR DEBUGGING");
-//        if (!Arrays.equals(hashDataInputDigest, signedDigest)) {
-//          log.error("Bad digest value for reference " + signedRefId);
-//          throw new DigestException("Bad digest value for reference " + signedRefId);
-//        }
-
-        verifiedHashDataInputs.add(new ByteArrayHashDataInput(hdi, signedRefId, mimeType, encoding));
-      }
-    }
-    
-    return verifiedHashDataInputs;
-  }
-
-  //TODO
-  private byte[] digest(byte[] hashDataInput, String mdAlg) throws NoSuchAlgorithmException {
-    if ("http://www.w3.org/2000/09/xmldsig#sha1".equals(mdAlg)) {
-      mdAlg = "SHA-1";
-    } else if ("http://www.w3.org/2001/04/xmlenc#sha256".equals(mdAlg)) {
-      mdAlg = "SHA-256";
-    } else if ("http://www.w3.org/2001/04/xmlenc#sha224".equals(mdAlg)) {
-      mdAlg = "SHA-224";
-    } else if ("http://www.w3.org/2001/04/xmldsig-more#sha224".equals(mdAlg)) {
-      mdAlg = "SHA-224";
-    } else if ("http://www.w3.org/2001/04/xmldsig-more#sha384".equals(mdAlg)) {
-      mdAlg = "SHA-384";
-    } else if ("http://www.w3.org/2001/04/xmlenc#sha512".equals(mdAlg)) {
-      mdAlg = "SHA-512";
-    } else if ("http://www.w3.org/2001/04/xmldsig-more#md2 ".equals(mdAlg)) {
-      mdAlg = "MD2";
-    } else if ("http://www.w3.org/2001/04/xmldsig-more#md5".equals(mdAlg)) {
-      mdAlg = "MD5";
-    } else if ("http://www.w3.org/2001/04/xmlenc#ripemd160 ".equals(mdAlg)) {
-      mdAlg = "RipeMD-160";
-    } else {
-      throw new NoSuchAlgorithmException("Failed to verify digest value: unsupported digest algorithm " + mdAlg);
-    }
-
-    MessageDigest md = MessageDigest.getInstance(mdAlg);
-    return md.digest(hashDataInput);
-  }
-}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
index a249a376..f46f5227 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package at.gv.egiz.bku.gui;
 
 import java.awt.event.ActionEvent;
@@ -22,19 +21,24 @@ import java.awt.event.ActionListener;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Locale;
+import java.util.ResourceBundle;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- *
+ * Implement the showDocument(URL) method to provide an actual HelpListener.
+ * This class does not keep a GUI reference and subclasses should not interfere with the GUI.
+ * Therefore, any errors occurring in showDocument() should be handled/displayed within
+ * showDocument() and exceptions thrown from showDocument() are logged, not displayed in the GUI.
+ * 
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public abstract class AbstractHelpListener implements ActionListener {
 
   protected final static Log log = LogFactory.getLog(AbstractHelpListener.class);
-//  protected String helpURLBase;
   protected URL baseURL;
   protected Locale locale;
+  protected ResourceBundle messages;
 
   public AbstractHelpListener(URL baseURL, Locale locale) {
     if (baseURL == null || "".equals(baseURL)) {
@@ -42,6 +46,11 @@ public abstract class AbstractHelpListener implements ActionListener {
     }
     this.baseURL = baseURL;
     this.locale = locale;
+    if (locale != null) {
+      messages = ResourceBundle.getBundle(BKUGUIFacade.MESSAGES_BUNDLE, locale);
+    } else {
+      messages = ResourceBundle.getBundle(BKUGUIFacade.MESSAGES_BUNDLE);
+    }
   }
 
   @Override
@@ -49,30 +58,36 @@ public abstract class AbstractHelpListener implements ActionListener {
     log.debug("received help action: " + e.getActionCommand());
     URL helpURL = constructHelpURL(baseURL, e.getActionCommand());
     try {
-      showDocument(helpURL);
+      showDocument(helpURL, e.getActionCommand());
     } catch (Exception ex) {
       log.error("could not display help document " + helpURL + ": " + ex.getMessage());
     }
   }
-  
-  private URL constructHelpURL(URL baseURL, String helpItem) {
+
+  private URL constructHelpURL(URL baseURL, String helpTopic) {
     URL helpURL = baseURL;
     log.trace("constructing help URL: " + helpURL);
     try {
       if (locale != null) {
         helpURL = new URL(helpURL, locale.toString() + "/");
         log.trace("constructing help URL: " + helpURL);
-      } 
-      if (helpItem != null && !"".equals(helpItem)) {
-        helpURL = new URL(helpURL, helpItem + ".html");
+      }
+      if (helpTopic != null && !"".equals(helpTopic)) {
+        helpURL = new URL(helpURL, helpTopic + ".html");
         log.trace("constructing help URL: " + helpURL);
       }
     } catch (MalformedURLException ex) {
-      log.error("Failed to construct help URL for help item " + helpItem + ": " + ex.getMessage());
+      log.error("Failed to construct help URL for help item " + helpTopic + ": " + ex.getMessage());
     }
     return helpURL;
   }
-  
-  public abstract void showDocument(URL helpDocument) throws Exception;
-  
+
+  /**
+   * Errors from HelpListeners should not (are not) displayed in the applet, 
+   * but should rather be in the HelpListener specific way.
+   * Therefore, implementations SHOULD NOT throw exceptions (these are only logged).
+   * @param helpDocument
+   * @throws java.lang.Exception
+   */
+  public abstract void showDocument(URL helpDocument, String helpTopic) throws Exception;
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 38638b5d..2daf3300 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -1,20 +1,19 @@
 /*
-* 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.
-*/
-
+ * 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.
+ */
 package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.stal.HashDataInput;
@@ -27,7 +26,7 @@ import java.util.List;
 import java.util.Locale;
 
 public interface BKUGUIFacade {
-  
+
   public static final String ERR_UNKNOWN = "error.unknown";
   public static final String ERR_SERVICE_UNREACHABLE = "error.ws.unreachable";
   public static final String ERR_NO_PCSC = "error.pcsc";
@@ -38,92 +37,108 @@ public interface BKUGUIFacade {
   public static final String ERR_INVALID_HASH = "error.invalid.hash";
   public static final String ERR_CARD_LOCKED = "error.card.locked";
   public static final String ERR_CARD_NOTACTIVATED = "error.card.notactivated";
+  public static final String ERR_VIEWER = "error.viewer";
   
-    public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
-    public static final String DEFAULT_BACKGROUND = "/images/BackgroundChipperling.png";
-    public static final String HELP_IMG = "/images/help.png";
-    public static final String HASHDATA_FONT = "Monospaced";
-    public static final Color ERROR_COLOR = Color.RED;
-    public static final Color HYPERLINK_COLOR = Color.BLUE;
-    public static final String TITLE_WELCOME = "title.welcome";
-    public static final String TITLE_INSERTCARD = "title.insertcard";
-    public static final String TITLE_CARD_NOT_SUPPORTED = "title.cardnotsupported";
-    public static final String TITLE_CARDPIN = "title.cardpin";
-    public static final String TITLE_SIGN = "title.sign";
-    public static final String TITLE_ERROR = "title.error";
-    public static final String TITLE_RETRY = "title.retry";
-    public static final String TITLE_WAIT = "title.wait";
-    public static final String TITLE_HASHDATA = "title.hashdata";
-    public static final String WINDOWTITLE_SAVE = "windowtitle.save";
-    public static final String WINDOWTITLE_SAVEDIR = "windowtitle.savedir";
-    public static final String WINDOWTITLE_OVERWRITE = "windowtitle.overwrite";
-    public static final String WINDOWTITLE_VIEWER = "windowtitle.viewer";
-    public static final String MESSAGE_WAIT = "message.wait";
-    public static final String MESSAGE_INSERTCARD = "message.insertcard";
-    public static final String MESSAGE_ENTERPIN = "message.enterpin";
-    public static final String MESSAGE_HASHDATALINK = "message.hashdatalink";
-    public static final String MESSAGE_HASHDATA = "message.hashdata";
-    public static final String MESSAGE_HASHDATALIST = "message.hashdatalist";
-    public static final String MESSAGE_RETRIES = "message.retries";
-    public static final String MESSAGE_OVERWRITE = "message.overwrite";
-    public static final String LABEL_PIN = "label.pin";
-    public static final String LABEL_PINSIZE = "label.pinsize";
+  public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
+  public static final String DEFAULT_BACKGROUND = "/images/BackgroundChipperling.png";
+  public static final String HELP_IMG = "/images/help.png";
+  public static final String HASHDATA_FONT = "Monospaced";
+  public static final Color ERROR_COLOR = Color.RED;
+  public static final Color HYPERLINK_COLOR = Color.BLUE;
+  public static final String TITLE_WELCOME = "title.welcome";
+  public static final String TITLE_INSERTCARD = "title.insertcard";
+  public static final String TITLE_CARD_NOT_SUPPORTED = "title.cardnotsupported";
+  public static final String TITLE_CARDPIN = "title.cardpin";
+  public static final String TITLE_SIGN = "title.sign";
+  public static final String TITLE_ERROR = "title.error";
+  public static final String TITLE_RETRY = "title.retry";
+  public static final String TITLE_WAIT = "title.wait";
+  public static final String TITLE_HASHDATA = "title.hashdata";
+  public static final String WINDOWTITLE_SAVE = "windowtitle.save";
+  public static final String WINDOWTITLE_SAVEDIR = "windowtitle.savedir";
+  public static final String WINDOWTITLE_OVERWRITE = "windowtitle.overwrite";
+  public static final String WINDOWTITLE_VIEWER = "windowtitle.viewer";
+  public static final String WINDOWTITLE_HELP = "windowtitle.help";
+  public static final String MESSAGE_WAIT = "message.wait";
+  public static final String MESSAGE_INSERTCARD = "message.insertcard";
+  public static final String MESSAGE_ENTERPIN = "message.enterpin";
+  public static final String MESSAGE_HASHDATALINK = "message.hashdatalink";
+  public static final String MESSAGE_HASHDATA = "message.hashdata";
+  public static final String MESSAGE_HASHDATALIST = "message.hashdatalist";
+  public static final String MESSAGE_RETRIES = "message.retries";
+  public static final String MESSAGE_OVERWRITE = "message.overwrite";
+  public static final String MESSAGE_HELP = "message.help";
+  public static final String LABEL_PIN = "label.pin";
+  public static final String LABEL_PINSIZE = "label.pinsize";
 //    public static final String ERROR_NO_HASHDATA = "error.no.hashdata";
-    public static final String HELP_WELCOME = "help.welcome";
-    public static final String HELP_WAIT = "help.wait";
-    public static final String HELP_CARDNOTSUPPORTED = "help.cardnotsupported";
-    public static final String HELP_INSERTCARD = "help.insertcard";
-    public static final String HELP_CARDPIN = "help.cardpin";
-    public static final String HELP_SIGNPIN = "help.signpin";
-    public static final String HELP_RETRY = "help.retry";
-    public static final String HELP_HASHDATA = "help.hashdata";
-    public static final String HELP_HASHDATALIST = "help.hashdatalist";
-    public static final String HELP_HASHDATAVIEWER = "help.hashdataviewer";
-    
-    public static final String BUTTON_OK = "button.ok";
-    public static final String BUTTON_CANCEL = "button.cancel";
-    public static final String BUTTON_BACK = "button.back";
-    public static final String BUTTON_SIGN = "button.sign";
-    public static final String BUTTON_SAVE = "button.save";
-    public static final String BUTTON_CLOSE = "button.close";
-    public static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
-    
-    
-    public void init(Container contentPane, Locale locale, URL background, ActionListener helpListener);
-    
-    /**
-     * 
-     * @return the locale of the message bundle (what if no message bundle could be loaded for the requested locale?)
-     */
-    public Locale getLocale();
-    
-    public void showWelcomeDialog();
-    
-    /**
-     * 
-     * @param waitMessage if null, a simple 'wait' text is displayed
-     */
-    public void showWaitDialog(String waitMessage);
-
-    public void showInsertCardDialog(ActionListener cancelListener, String actionCommand);
-    
-    public void showCardNotSupportedDialog(ActionListener cancelListener, String actionCommand);
-    
-    public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand);
-    
-    public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand);
-    
-    public void showSignaturePINDialog(PINSpec pinSpec, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand);
-    
-    public void showSignaturePINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand);
-    
-    public char[] getPin();
-    
-    public void showHashDataInputDialog(List<HashDataInput> signedReferences, boolean standalone, ActionListener okListener, String actionCommand);
-    
+  public static final String HELP_WELCOME = "help.welcome";
+  public static final String HELP_WAIT = "help.wait";
+  public static final String HELP_CARDNOTSUPPORTED = "help.cardnotsupported";
+  public static final String HELP_INSERTCARD = "help.insertcard";
+  public static final String HELP_CARDPIN = "help.cardpin";
+  public static final String HELP_SIGNPIN = "help.signpin";
+  public static final String HELP_RETRY = "help.retry";
+  public static final String HELP_HASHDATA = "help.hashdata";
+  public static final String HELP_HASHDATALIST = "help.hashdatalist";
+  public static final String HELP_HASHDATAVIEWER = "help.hashdataviewer";
+  public static final String BUTTON_OK = "button.ok";
+  public static final String BUTTON_CANCEL = "button.cancel";
+  public static final String BUTTON_BACK = "button.back";
+  public static final String BUTTON_SIGN = "button.sign";
+  public static final String BUTTON_SAVE = "button.save";
+  public static final String BUTTON_CLOSE = "button.close";
+  public static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
+
+  public void init(Container contentPane, Locale locale, URL background, ActionListener helpListener);
+
+  /**
+   * 
+   * @return the locale of the message bundle (what if no message bundle could be loaded for the requested locale?)
+   */
+  public Locale getLocale();
+
+  public void showWelcomeDialog();
+
+  /**
+   * 
+   * @param waitMessage if null, a simple 'wait' text is displayed
+   */
+  public void showWaitDialog(String waitMessage);
+
+  public void showInsertCardDialog(ActionListener cancelListener, String actionCommand);
+
+  public void showCardNotSupportedDialog(ActionListener cancelListener, String actionCommand);
+
+  public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand);
+
+  public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand);
+
+  public void showSignaturePINDialog(PINSpec pinSpec, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand);
+
+  public void showSignaturePINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand);
+
+  public char[] getPin();
+
+  /**
+   * TODO move to HashDataDisplay implementations
+   * @param signedReferences
+   * @param externalDisplay
+   * @param okListener
+   * @param okCommand
+   */
+  public void showHashDataInputDialog(List<HashDataInput> signedReferences, boolean externalDisplay, ActionListener okListener, String okCommand);
+
+  /**
+   * TODO pull out from BKUGUIFacade. (or make this strictly an applet internal version)
+   * Problem: if standalone flag is provided, we also need the actionlistener..
+   * @param helpDocument
+   * @param mimeType
+   * @param encoding
+   */
+//  public void showHelpDialog(InputStream helpDocument, String mimeType, String encoding); //, boolean standalone); //, ActionListener okListener, String okCommand); 
+
 //    public void showPlainTextHashDataInputDialog(String text, ActionListener saveListener, String saveCommand, ActionListener cancelListener, String cancelCommand);
-    
-    public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams, ActionListener okListener, String actionCommand);
-    
-    public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams);
+  public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams, ActionListener okListener, String actionCommand);
+
+  public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams);
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
index aea85523..e8566fa6 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
@@ -64,13 +64,5 @@ class HashDataTableModel extends DefaultTableModel {
       }
     }
     return selection;
-  }//        public List<String> getSelectedReferenceIds() {
-//            ArrayList<String> selection = new ArrayList<String>();
-//            for (Object row : dataVector) {
-//                if ((Boolean) ((Vector) row).elementAt(1)) {
-//                    selection.add((String) ((Vector) row).elementAt(0));
-//                }
-//            }
-//            return selection;
-//        }
+  }
 }
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
deleted file mode 100644
index 3db06e19..00000000
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.gui;
-
-import at.gv.egiz.stal.HashDataInput;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.ResourceBundle;
-import javax.swing.GroupLayout;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JEditorPane;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.LayoutStyle;
-import javax.swing.text.Document;
-import javax.swing.text.EditorKit;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class HashDataViewer extends JDialog
-        implements ActionListener, WindowListener {
-
-  public static final String PLAINTEXT_FONT = "Monospaced";
-    
-  protected static final Log log = LogFactory.getLog(HashDataViewer.class);
-  private static HashDataViewer dialog;
-
-  public static void showDialog(Component frameComp, List<HashDataInput> signedReferences, ResourceBundle messages, ActionListener saveListener, String saveCommand, HelpMouseListener helpListener) {
-    
-    log.info("******************* SHOW HASHDATA DIALOG");
-    
-    Frame frame = JOptionPane.getFrameForComponent(frameComp);
-
-    dialog = new HashDataViewer(frame, signedReferences.get(0), messages, saveListener, saveCommand, helpListener);
-    dialog.addWindowListener(dialog);
-    dialog.setVisible(true);
-
-  }
-
-  private HashDataViewer(Frame frame, HashDataInput hashData, ResourceBundle messages, ActionListener saveListener, String saveCommand, HelpMouseListener helpListener) {
-    super(frame, messages.getString(BKUGUIFacade.WINDOWTITLE_VIEWER), true);
-
-    JPanel viewerPanel = createViewerPanel(messages, hashData, helpListener);
-    JPanel buttonPanel = createButtonPanel(messages, saveListener, saveCommand);
-
-
-    Container contentPane = getContentPane();
-    contentPane.setPreferredSize(new Dimension(400, 300));
-
-    GroupLayout mainLayout = new GroupLayout(contentPane);
-    contentPane.setLayout(mainLayout);
-
-        mainLayout.setHorizontalGroup(
-          mainLayout.createSequentialGroup()
-            .addContainerGap()
-            .addGroup(
-              mainLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                .addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-            .addContainerGap());
-        mainLayout.setVerticalGroup(
-          mainLayout.createSequentialGroup()
-            .addContainerGap()
-            .addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 
-            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) 
-            .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-            .addContainerGap());
-
-    pack();
-    setLocationRelativeTo(frame);
-  }
-
-  private JPanel createViewerPanel(ResourceBundle messages, HashDataInput hashData, HelpMouseListener helpListener) {
-    String mimeType = hashData.getMimeType();
-    String encoding = hashData.getEncoding();
-
-    log.debug("display hashdata: " + mimeType + ";" + encoding);
-
-    if (mimeType == null) {
-      mimeType = "text/plain";
-    }
-    if (encoding == null) {
-      encoding = "UTF-8";
-    }
-
-    JEditorPane viewer = new JEditorPane();
-    viewer.setEditable(false);
-    viewer.setContentType(mimeType);
-    if ("text/plain".equals(mimeType)) {
-      viewer.setFont(new Font(PLAINTEXT_FONT, viewer.getFont().getStyle(), viewer.getFont().getSize()));
-    }
-    
-    EditorKit editorKit = viewer.getEditorKit();
-    Document document = editorKit.createDefaultDocument();
-
-    Reader reader;
-    try {
-      reader = new InputStreamReader(hashData.getHashDataInput(), encoding);
-      viewer.read(reader, document);
-    } catch (Exception ex) {
-      String p = messages.getString(BKUGUIFacade.ERR_DISPLAY_HASHDATA);
-      viewer.setText(MessageFormat.format(p, ex.getMessage()));
-    }
-
-    JScrollPane scrollPane = new JScrollPane(viewer);
-//    scrollPane.setPreferredSize(new Dimension(400, 300));
-    scrollPane.setPreferredSize(viewer.getPreferredSize());
-    scrollPane.setAlignmentX(LEFT_ALIGNMENT);
-
-    JLabel viewerTitle = new JLabel();
-    viewerTitle.setText(messages.getString(BKUGUIFacade.TITLE_HASHDATA));
-    viewerTitle.setFont(viewerTitle.getFont().deriveFont(viewerTitle.getFont().getStyle() | java.awt.Font.BOLD));
-    viewerTitle.setLabelFor(viewer);
-    
-    JLabel helpLabel = new JLabel();
-    helpListener.setHelpTopic(BKUGUIFacade.HELP_HASHDATAVIEWER);
-    helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG))); 
-    helpLabel.addMouseListener(helpListener);
-    helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-        
-    JPanel viewerPanel = new JPanel();
-    GroupLayout viewerPanelLayout = new GroupLayout(viewerPanel);
-    viewerPanel.setLayout(viewerPanelLayout);
-
-    viewerPanelLayout.setHorizontalGroup(
-     viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-      .addGroup(viewerPanelLayout.createSequentialGroup()
-        .addComponent(viewerTitle)
-        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-        .addComponent(helpLabel))
-      .addComponent(scrollPane)); //, 0, 0, Short.MAX_VALUE));
-
-    viewerPanelLayout.setVerticalGroup(
-      viewerPanelLayout.createSequentialGroup()
-        .addGroup(viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-          .addComponent(viewerTitle)
-          .addComponent(helpLabel))
-        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-        .addComponent(scrollPane)); //, 0, 0, Short.MAX_VALUE));
-    
-//    viewerPanel.setLayout(new BoxLayout(viewerPanel, BoxLayout.PAGE_AXIS));
-//    JLabel title = new JLabel(messages.getString(BKUGUIFacade.TITLE_HASHDATA));
-//    title.setLabelFor(viewer);
-//    viewerPanel.add(title);
-//    viewerPanel.add(Box.createRigidArea(new Dimension(0, 5)));
-//    viewerPanel.add(scrollPane);
-//    viewerPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-    
-    return viewerPanel;
-  }
-
-  private JPanel createButtonPanel(ResourceBundle messages, ActionListener saveListener, String saveCommand) {
-    JButton closeButton = new JButton();
-    closeButton.setText(messages.getString(BKUGUIFacade.BUTTON_CLOSE));
-    closeButton.addActionListener(this);
-
-    JButton saveButton = new JButton();
-    saveButton.setText(messages.getString(BKUGUIFacade.BUTTON_SAVE));
-    saveButton.setActionCommand(saveCommand);
-    saveButton.addActionListener(saveListener);
-
-    int buttonSize = closeButton.getPreferredSize().width;
-    if (saveButton.getPreferredSize().width > buttonSize) {
-      buttonSize = saveButton.getPreferredSize().width;
-    }
-
-    JPanel buttonPanel = new JPanel();
-    GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-    buttonPanel.setLayout(buttonPanelLayout);
-
-    buttonPanelLayout.setHorizontalGroup(
-            buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(saveButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(closeButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-    buttonPanelLayout.setVerticalGroup(
-            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(closeButton));
-
-    return buttonPanel;
-  }
-
-  @Override
-  public void actionPerformed(ActionEvent e) {
-//    if ("close".equals(e.getActionCommand())) {
-    HashDataViewer.dialog.setVisible(false);
-//    HashDataViewer.dialog.dispose();
-  }
-
-  @Override
-  public void windowOpened(WindowEvent e) {
-    log.debug("WINDOW OPENED");
-  }
-
-  @Override
-  public void windowClosing(WindowEvent e) {
-    log.debug("WINDOW CLOSING");
-  }
-
-  @Override
-  public void windowClosed(WindowEvent e) {
-    log.debug("WINDOW CLOSED");
-  }
-
-  @Override
-  public void windowIconified(WindowEvent e) {
-    log.debug("WINDOW ICONIFIED");
-  }
-
-  @Override
-  public void windowDeiconified(WindowEvent e) {
-  }
-
-  @Override
-  public void windowActivated(WindowEvent e) {
-    log.debug("WINDOW ACTIVATED");
-  }
-
-  @Override
-  public void windowDeactivated(WindowEvent e) {
-    log.debug("WINDOW DEACTIVATED");
-  }
-
-  
-  
- 
-  
-  
-  
-}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperLinkRenderer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperLinkRenderer.java
new file mode 100644
index 00000000..d9606177
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperLinkRenderer.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.stal.HashDataInput;
+import java.awt.Color;
+import java.awt.Component;
+import javax.swing.JLabel;
+import javax.swing.JTable;
+import javax.swing.table.TableCellRenderer;
+
+/**
+ * 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class HyperLinkRenderer extends JLabel implements TableCellRenderer {
+
+  @Override
+  public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+    HashDataInput hdi = (HashDataInput) value;
+    setText(hdi.getReferenceId() + " (" + hdi.getMimeType() + ")");
+    setBackground(Color.CYAN);
+    return this;
+  }
+        
+//        extends DefaultTableCellRenderer {
+//
+//  @Override
+//  public void setValue(Object value) {
+//    HashDataInput hdi = (HashDataInput) value;
+//    setText(hdi.getReferenceId() + " (" + hdi.getMimeType() + ")");
+//  }
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index 583dae0f..6250dd0e 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -83,7 +83,7 @@ public class SimpleGUI implements BKUGUIFacade {
 
     protected int buttonSize;
     
-    private static final int CHECKBOX_WIDTH = new JCheckBox().getPreferredSize().width;
+//    private static final int CHECKBOX_WIDTH = new JCheckBox().getPreferredSize().width;
 
     /**
      * @param contentPane
@@ -924,16 +924,17 @@ public class SimpleGUI implements BKUGUIFacade {
         }
       } else {
 
-        final HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
-
-        ActionListener saveHashDataListener = new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-              showSaveHashDataInputDialog(tableModel.getSelectedHashData(), okListener, okCommand);
-            }
-        };
-        showMultipleHashDataInputDialog(tableModel, okListener, okCommand, saveHashDataListener, "save");
+        SimpleHashDataTableModel tableModel = new SimpleHashDataTableModel(signedReferences);
+//        final HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
+//
+//        ActionListener saveHashDataListener = new ActionListener() {
+//
+//            @Override
+//            public void actionPerformed(ActionEvent e) {
+//              showSaveHashDataInputDialog(tableModel.getSelectedHashData(), okListener, okCommand);
+//            }
+//        };
+        showMultipleHashDataInputDialog(tableModel, okListener, okCommand);
       }
     }
     
@@ -953,7 +954,7 @@ public class SimpleGUI implements BKUGUIFacade {
           
           log.debug("show plaintext hashdatainput dialog");
       
-          HashDataViewer.showDialog(contentPane, signedReferences, messages, saveListener, saveCommand, helpListener);
+          ViewerDialog.showHashDataInput(contentPane, signedReferences, messages, saveListener, saveCommand, helpListener);
         }
       });
     }
@@ -1052,7 +1053,8 @@ public class SimpleGUI implements BKUGUIFacade {
       });
     }
 
-    private void showMultipleHashDataInputDialog(final TableModel signedReferences, final ActionListener cancelListener, final String cancelCommand, final ActionListener saveListener, final String saveCommand) {
+    private void showMultipleHashDataInputDialog(final TableModel signedReferences, final ActionListener cancelListener, final String cancelCommand) {
+//      , final ActionListener saveListener, final String saveCommand
       
       log.debug("scheduling multiple hashdatainput dialog");
       
@@ -1076,13 +1078,14 @@ public class SimpleGUI implements BKUGUIFacade {
           refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{signedReferences.getRowCount()}));
 
           JTable hashDataTable = new JTable();
+          hashDataTable.setDefaultRenderer(HashDataInput.class, new HyperLinkRenderer());
           hashDataTable.setModel(signedReferences);
           hashDataTable.setTableHeader(null);
   //        hashDataTable.setShowVerticalLines(false);
   //        hashDataTable.setRowSelectionAllowed(false);
-          TableColumn selectCol = hashDataTable.getColumnModel().getColumn(1);
-          selectCol.setMinWidth(CHECKBOX_WIDTH);
-          selectCol.setMaxWidth(CHECKBOX_WIDTH);
+//          TableColumn selectCol = hashDataTable.getColumnModel().getColumn(1);
+//          selectCol.setMinWidth(CHECKBOX_WIDTH);
+//          selectCol.setMaxWidth(CHECKBOX_WIDTH);
 
 
 //          hashDataTable.setPreferredScrollableViewportSize(mainPanel.getPreferredSize());
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleHashDataTableModel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleHashDataTableModel.java
new file mode 100644
index 00000000..463dbe81
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleHashDataTableModel.java
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.stal.HashDataInput;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+import javax.swing.table.DefaultTableModel;
+
+/**
+ *
+ * @author clemens
+ */
+class SimpleHashDataTableModel extends DefaultTableModel {
+
+  protected List<HashDataInput> signedReferences;
+  
+  protected Class[] types = new Class[]{
+    java.lang.String.class
+  };
+
+  public SimpleHashDataTableModel(List<HashDataInput> signedReferences) {
+    super(0, 1);
+    this.signedReferences = signedReferences;
+    for (HashDataInput hashDataInput : signedReferences) {
+      
+//      String desc = hashDataInput.getReferenceId() + " (" + hashDataInput.getMimeType() + ")";
+      addRow(new Object[]{hashDataInput});
+    }
+  }
+
+  @Override
+  public Class getColumnClass(int columnIndex) {
+    return types[columnIndex];
+  }
+
+  @Override
+  public boolean isCellEditable(int rowIndex, int columnIndex) {
+    if (columnIndex == 1)
+      return true;
+    return false;
+  }
+}
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerDialog.java
new file mode 100644
index 00000000..cd04ad98
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerDialog.java
@@ -0,0 +1,354 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.stal.HashDataInput;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.Charset;
+import java.text.MessageFormat;
+import java.util.List;
+import java.util.ResourceBundle;
+import javax.swing.GroupLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle;
+import javax.swing.text.Document;
+import javax.swing.text.EditorKit;
+import javax.swing.text.html.HTMLDocument;
+import javax.swing.text.html.HTMLEditorKit;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class ViewerDialog extends JDialog
+        implements ActionListener {
+
+  public static final String PLAINTEXT_FONT = "Monospaced";
+  protected static final Log log = LogFactory.getLog(ViewerDialog.class);
+//  private ViewerDialog dialog;
+  
+  protected ResourceBundle messages;
+  
+  /**
+   * 
+   * @param frameComp
+   * @param signedReferences currently, only one hashdata input (the first in the list) is displayed
+   * @param messages
+   * @param saveListener
+   * @param saveCommand
+   * @param helpListener
+   */
+  public static void showHashDataInput(Component frameComp,
+          List<HashDataInput> hashDataInputs,
+          ResourceBundle messages,
+          ActionListener saveListener,
+          String saveCommand,
+          HelpMouseListener helpListener) {
+    
+    Frame frame = null;
+    if (frameComp != null) {
+      JOptionPane.getFrameForComponent(frameComp);
+    }
+    ViewerDialog viewer = new ViewerDialog(frame, 
+            messages,
+            hashDataInputs, 
+            saveListener, 
+            saveCommand, 
+            helpListener);
+    viewer.setVisible(true);
+  }
+
+  public static void showHelp(Component frameComp,
+          String helpTopic,
+//          Reader helpDocument,
+          InputStream helpDocument,
+          String mimeType,
+          ResourceBundle messages) {
+    
+    Frame frame = null;
+    if (frameComp != null) {
+      JOptionPane.getFrameForComponent(frameComp);
+    }
+    ViewerDialog viewer = new ViewerDialog(frame, messages, helpTopic, helpDocument, mimeType);
+    viewer.setVisible(true);
+  }
+
+  /**
+   * TODO make encoding aware!
+   * @param frame
+   * @param title
+   * @param messages
+   * @param hashDataInputs
+   * @param saveListener
+   * @param saveCommand
+   * @param helpListener
+   */
+  private ViewerDialog(Frame frame,
+          ResourceBundle messages,
+          List<HashDataInput> hashDataInputs,
+          ActionListener saveListener,
+          String saveCommand,
+          HelpMouseListener helpListener) {
+    super(frame, messages.getString(BKUGUIFacade.WINDOWTITLE_VIEWER), true);
+    this.messages = messages;
+
+    HashDataInput hashData = hashDataInputs.get(0);
+    
+//    Charset cs;
+//    if (hashData.getEncoding() == null) {
+//      cs = Charset.forName("UTF-8");
+//    } else {
+//      try {
+//        cs = Charset.forName(hashData.getEncoding());
+//      } catch (Exception ex) {
+//        log.debug("charset " + hashData.getEncoding() + " not supported, assuming UTF-8: " + ex.getMessage());
+//        cs = Charset.forName("UTF-8");
+//      }  
+//    }
+    
+//    InputStreamReader isr = new InputStreamReader(hashData.getHashDataInput(), cs);
+//    Reader content = new BufferedReader(isr);
+    InputStream content = hashData.getHashDataInput();
+    String mimeType = hashData.getMimeType();
+    String encoding = hashData.getEncoding();
+      
+    JPanel hashDataPanel = createViewerPanel(messages.getString(BKUGUIFacade.MESSAGE_HASHDATA), content, mimeType, encoding, helpListener);
+    JPanel buttonPanel = createButtonPanel(saveListener, saveCommand);
+    initContentPane(new Dimension(600, 400), hashDataPanel, buttonPanel);
+
+    pack();
+    if (frame != null) {
+      setLocationRelativeTo(frame);
+    } else {
+      setLocationByPlatform(true);
+    }
+  }
+
+  private ViewerDialog(Frame frame,
+          ResourceBundle messages,
+          String helpTopic,
+//          Reader helpDocument,
+          InputStream helpDocument,
+          String mimeType) {
+    super(frame, messages.getString(BKUGUIFacade.WINDOWTITLE_HELP), true);
+    this.messages = messages;
+    
+    String p = messages.getString(BKUGUIFacade.MESSAGE_HELP);
+    String helpItem = messages.getString(helpTopic);
+    String viewerLabel = MessageFormat.format(p, new Object[] {helpItem});
+    
+    JPanel helpPanel = createViewerPanel(viewerLabel, helpDocument, mimeType, null, null);
+    JPanel buttonPanel = createButtonPanel();
+    
+    initContentPane(new Dimension(600, 400), helpPanel, buttonPanel);
+    pack();
+    if (frame != null) {
+      setLocationRelativeTo(frame);
+    } else {
+      setLocationByPlatform(true);
+    }
+  }
+  
+  private void initContentPane(Dimension preferredSize, JPanel viewerPanel, JPanel buttonPanel) {
+    Container contentPane = getContentPane();
+    contentPane.setPreferredSize(preferredSize);
+
+    GroupLayout mainLayout = new GroupLayout(contentPane);
+    contentPane.setLayout(mainLayout);
+
+    mainLayout.setHorizontalGroup(
+            mainLayout.createSequentialGroup().addContainerGap().addGroup(
+            mainLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)).addContainerGap());
+    mainLayout.setVerticalGroup(
+            mainLayout.createSequentialGroup()
+              .addContainerGap()
+              .addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+              .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
+              .addComponent(buttonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+              .addContainerGap());
+  }
+
+  /**
+   * 
+   * @param messages
+   * @param content
+   * @param mimeType defaults to text/plain if null 
+   * @param encoding must be null if document contains charset declaration (e.g. HTML page), otherwise the parser crashes
+   * @param helpListener may be null
+   * @return
+   */
+  private JPanel createViewerPanel(String viewerLabelText, InputStream content, String mimeType, String encoding, HelpMouseListener helpListener) {
+    log.debug("viewer dialog: " + mimeType);
+
+    if (mimeType == null) {
+      mimeType = "text/plain";
+    } else if ("application/xhtml+xml".equals(mimeType)) {
+      mimeType = "text/html";
+    }
+
+    JEditorPane viewer = new JEditorPane();
+    viewer.setEditable(false);
+    viewer.setContentType(mimeType);
+    if ("text/plain".equals(mimeType)) {
+      viewer.setFont(new Font(PLAINTEXT_FONT, viewer.getFont().getStyle(), viewer.getFont().getSize()));
+    }
+
+    EditorKit editorKit = viewer.getEditorKit();
+    Document document = editorKit.createDefaultDocument();
+//    document.putProperty("IgnoreCharsetDirective", new Boolean(true));
+    
+    try {
+      if (encoding != null) {
+        BufferedReader contentReader = new BufferedReader(new InputStreamReader(content, encoding));
+        viewer.read(contentReader, document);
+        contentReader.close();
+      } else {
+        // charset declaration in content
+        viewer.read(content, document);
+        content.close();
+      }
+    } catch (Exception ex) {
+      log.error(ex.getMessage(), ex);
+      String p = messages.getString(BKUGUIFacade.ERR_VIEWER);
+      viewer.setText(MessageFormat.format(p, ex.getMessage()));
+    }
+
+    JScrollPane scrollPane = new JScrollPane(viewer);
+    scrollPane.setPreferredSize(viewer.getPreferredSize());
+    scrollPane.setAlignmentX(LEFT_ALIGNMENT);
+    viewer.setCaretPosition(0);
+
+    JLabel viewerLabel = new JLabel();
+    viewerLabel.setText(viewerLabelText);
+    viewerLabel.setFont(viewerLabel.getFont().deriveFont(viewerLabel.getFont().getStyle() | java.awt.Font.BOLD));
+    viewerLabel.setLabelFor(viewer);
+
+    JPanel viewerPanel = new JPanel();
+    GroupLayout viewerPanelLayout = new GroupLayout(viewerPanel);
+    viewerPanel.setLayout(viewerPanelLayout);
+
+    if (helpListener != null) {
+      JLabel helpLabel = new JLabel();
+      helpListener.setHelpTopic(BKUGUIFacade.HELP_HASHDATAVIEWER);
+      helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG)));
+      helpLabel.addMouseListener(helpListener);
+      helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+      viewerPanelLayout.setHorizontalGroup(
+            viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(viewerPanelLayout.createSequentialGroup().addComponent(viewerLabel).addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE).addComponent(helpLabel)).addComponent(scrollPane)); //, 0, 0, Short.MAX_VALUE));
+      viewerPanelLayout.setVerticalGroup(
+            viewerPanelLayout.createSequentialGroup()
+              .addGroup(viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                .addComponent(viewerLabel)
+                .addComponent(helpLabel))
+              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+              .addComponent(scrollPane)); 
+    } else {
+      viewerPanelLayout.setHorizontalGroup(
+            viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+              .addComponent(viewerLabel)
+              .addComponent(scrollPane)); 
+      viewerPanelLayout.setVerticalGroup(
+            viewerPanelLayout.createSequentialGroup()
+              .addComponent(viewerLabel)
+              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+              .addComponent(scrollPane)); 
+
+    }
+    
+    return viewerPanel;
+  }
+
+  private JPanel createButtonPanel() {
+    JButton closeButton = new JButton();
+    closeButton.setText(messages.getString(BKUGUIFacade.BUTTON_CLOSE));
+    closeButton.addActionListener(this);
+
+    JPanel buttonPanel = new JPanel();
+    GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+    buttonPanel.setLayout(buttonPanelLayout);
+
+    buttonPanelLayout.setHorizontalGroup(
+            buttonPanelLayout.createSequentialGroup()
+              .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+              .addComponent(closeButton));
+    buttonPanelLayout.setVerticalGroup(
+            buttonPanelLayout.createSequentialGroup()
+              .addComponent(closeButton));
+    return buttonPanel;
+  }
+  
+  private JPanel createButtonPanel(ActionListener saveListener, String saveCommand) {
+    JButton closeButton = new JButton();
+    closeButton.setText(messages.getString(BKUGUIFacade.BUTTON_CLOSE));
+    closeButton.addActionListener(this);
+
+    JButton saveButton = new JButton();
+    saveButton.setText(messages.getString(BKUGUIFacade.BUTTON_SAVE));
+    saveButton.setActionCommand(saveCommand);
+    saveButton.addActionListener(saveListener);
+
+    int buttonSize = closeButton.getPreferredSize().width;
+    if (saveButton.getPreferredSize().width > buttonSize) {
+      buttonSize = saveButton.getPreferredSize().width;
+    }
+
+    JPanel buttonPanel = new JPanel();
+    GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+    buttonPanel.setLayout(buttonPanelLayout);
+
+    buttonPanelLayout.setHorizontalGroup(
+            buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(saveButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(closeButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+    buttonPanelLayout.setVerticalGroup(
+            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(closeButton));
+
+    return buttonPanel;
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+//    if ("close".equals(e.getActionCommand())) {
+//    ViewerDialog.dialog.setVisible(false);
+//    HashDataViewer.dialog.dispose();
+    this.setVisible(false);
+  }
+}
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index c47242b2..ba20471d 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -26,14 +26,17 @@ windowtitle.save=Signaturdaten speichern
 windowtitle.savedir=Signaturdaten in Verzeichnis speichern
 windowtitle.overwrite=Datei \u00FCberschreiben?
 windowtitle.viewer=Signaturedaten
+windowtitle.help=Hilfe
 message.wait=<html>Bitte warten...</html>
 message.insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
 message.enterpin=<html>{0} eingeben</html>
 message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
-message.hashdata=<html>Signaturdaten:</html> 
+message.hashdata=<html>Dies ist eine Voransicht des zu signierenden Inhaltes. F\u00FCr Details siehe Hilfe.</html> 
+#verwenden sie bitte die von ihrem System zur Verf\u00FCgung gestellte {0} Anwendung. 
 message.hashdatalist=<html>{0} Signaturdaten:</html>
 message.retries=<html>Noch {0} Versuch(e)</html>
 message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
+message.help=<html>Hilfe zu {0}</html>
 label.pin=<html>{0}:</html>
 label.pinsize=<html>({0} stellig)</html>
 button.ok=OK
@@ -62,4 +65,17 @@ error.cardterminal=<html>Es konnte kein Smartcard-Leser gefunden werden</html>
 error.unknown=<html>Leider trat ein Fehler auf: {0}</html>
 error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
 error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
-error.card.notactivated=<html>B\u00FCrgerkartenfunktion ist nicht aktiviert</html>
\ No newline at end of file
+error.card.notactivated=<html>B\u00FCrgerkartenfunktion ist nicht aktiviert</html>
+error.viewer=Der Inhalt kann nicht dargestellt werden: {0}
+
+# Help Topics
+help.welcome=Startseite
+help.wait=Bitte Warten Bildschirm
+help.cardnotsupported=Nicht unterst\u00FCtzte B\u00FCrgerkarte
+help.insertcard=Keine B\u00FCrgerkarte im Kartenleser
+help.cardpin=Pineingabe
+help.signpin=Signatur-Pineingabe
+help.retry=Falscher Pin
+help.hashdata=Signierte Inhalte
+help.hashdatalist=Signierte Inhalte
+help.hashdataviewer=Anzeige signierter Inhalte
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index c7cc9084..edc5371d 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -26,6 +26,7 @@ windowtitle.save=Save signature data
 windowtitle.savedir=Save signature data to directory
 windowtitle.overwrite=Overwrite file?
 windowtitle.viewer=Signature data
+windowtitle.help=Help
 message.wait=<html>Please wait...</html>
 message.insertcard=<html>Please insert your citizen-card into the reader</html>
 message.enterpin=<html>Enter {0}</html>
@@ -34,6 +35,7 @@ message.hashdata=<html>Signature data:</html>
 message.hashdatalist=<html>{0} signature data objects:</html>
 message.retries=<html>{0} tries left</html>
 message.overwrite=<html>Overwrite {0}?</html>
+message.help=<html>Help topic {0}</html>
 label.pin=<html>{0}:</html>
 label.pinsize=<html>({0} digits)</html>
 button.ok=OK
@@ -61,4 +63,17 @@ error.cardterminal=<html>Could not find smartcard reader</html>
 error.unknown=<html>An error occured: {0}</html>
 error.test=<html>Error1 {0} - Error2 {1}</html>
 error.card.locked=<html>Citizen-card is locked</html>
-error.card.notactivated=<html>Citizen-card not activated</html>
\ No newline at end of file
+error.card.notactivated=<html>Citizen-card not activated</html>
+error.viewer=Failed to display contents: {0}
+
+# Help Topics
+help.welcome=Welcome page
+help.wait=Wait screen
+help.cardnotsupported=Unsupported citizen card
+help.insertcard=No citizen card found
+help.cardpin=Pin entry
+help.signpin=Signature pin entry
+help.retry=Wrong Pin
+help.hashdata=Signed contents
+help.hashdatalist=Signed contents
+help.hashdataviewer=Display of signed contents
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/resources/images/help.png b/BKUCommonGUI/src/main/resources/images/help.png
index 4ed65a97..5d6da3bf 100644
Binary files a/BKUCommonGUI/src/main/resources/images/help.png and b/BKUCommonGUI/src/main/resources/images/help.png differ
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 c366cb76..af1368e5 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
@@ -176,7 +176,7 @@ public class BKUGUIWorker implements Runnable {
 //                    signedRefs.add(signedRef4);
 //                    signedRefs.add(signedRef4);
 //                    signedRefs = Collections.singletonList(signedRef1);
-        gui.showHashDataInputDialog(signedRefs, returnListener, "return");
+        gui.showHashDataInputDialog(signedRefs, true, returnListener, "return");
       }
     };
 
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
index 7faad548..05a3f5e5 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
@@ -64,10 +64,14 @@ public class STALServiceImpl implements STALPortType {
   protected static final Log log = LogFactory.getLog(STALServiceImpl.class);
   
   static {
+    
     if (log.isTraceEnabled()) {
       log.trace("enabling webservice communication dump");
       System.setProperty("com.sun.xml.ws.transport.http.HttpAdapter.dump", "true");
+    } else {
+      System.setProperty("com.sun.xml.ws.fault.SOAPFaultBuilder.disableCaptureStackTrace", "false");
     }
+    
   }
   
   @Resource
@@ -291,8 +295,8 @@ public class STALServiceImpl implements STALPortType {
           throw new GetHashDataInputFault(msg, faultInfo);
         }
       } else {
-        String msg = "Failed to get STAL for session " + sessionId;
-        log.error(msg);
+        String msg = "Session timeout"; //Failed to get STAL for session " + sessionId;
+        log.error(msg + " " + sessionId);
         GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
         faultInfo.setErrorCode(1);
         faultInfo.setErrorMessage(msg);
diff --git a/BKUOnline/src/test/java/at/gv/egiz/bku/online/conf/SSLConfigTest.java b/BKUOnline/src/test/java/at/gv/egiz/bku/online/conf/SSLConfigTest.java
index 612480b2..eefaf5b6 100644
--- a/BKUOnline/src/test/java/at/gv/egiz/bku/online/conf/SSLConfigTest.java
+++ b/BKUOnline/src/test/java/at/gv/egiz/bku/online/conf/SSLConfigTest.java
@@ -11,6 +11,7 @@ import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
+@Ignore
 public class SSLConfigTest {
 	
 	private SpringConfigurator cfg;
@@ -21,7 +22,7 @@ public class SSLConfigTest {
 		ctx = new ClassPathXmlApplicationContext("applicationContext.xml");
 		
 	}
-	
+
 	@Ignore
 	@Test
 	public void testConnect() throws Exception {
diff --git a/STALService/pom.xml b/STALService/pom.xml
index e9c573f1..db126b3c 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -18,10 +18,10 @@
             <artifactId>STAL</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
+        <!--dependency>
         	<groupId>at.gv.egiz</groupId>
         	<artifactId>utils</artifactId>
         	<version>1.0-SNAPSHOT</version>
-        </dependency>
+        </dependency-->
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/src/main/java/at/gv/egiz/stal/util/HashDataInputProxy.java b/STALService/src/main/java/at/gv/egiz/stal/util/HashDataInputProxy.java
deleted file mode 100644
index 01d207d2..00000000
--- a/STALService/src/main/java/at/gv/egiz/stal/util/HashDataInputProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package at.gv.egiz.stal.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.bku.utils.StreamUtil;
-import at.gv.egiz.stal.HashDataInput;
-
-/**
- * Enables multiple read requests.
- * @deprecated use at.gv.egiz.stal.impl.ByteArrayHashDataInput
- */
-public class HashDataInputProxy implements HashDataInput {
-
-  private static Log log = LogFactory.getLog(HashDataInputProxy.class);
-
-  private HashDataInput delegate;
-  private byte[] hashInput;
-
-  /**
-   * 
-   * @param delegate
-   *          != null
-   */
-  public HashDataInputProxy(HashDataInput delegate) {
-    if (delegate == null) {
-      throw new NullPointerException("Constructor argument must not be null");
-    }
-    this.delegate = delegate;
-  }
-
-  @Override
-  public String getEncoding() {
-    return delegate.getEncoding();
-  }
-
-  @Override
-  public InputStream getHashDataInput() {
-    if (hashInput == null) {
-      ByteArrayOutputStream os = new ByteArrayOutputStream();
-      try {
-        StreamUtil.copyStream(delegate.getHashDataInput(), os);
-        hashInput = os.toByteArray();
-      } catch (IOException e) {
-        log.error("Cannot access hashdatainput stream", e);
-        hashInput = new byte[0];
-      }
-    }
-    return new ByteArrayInputStream(hashInput);
-  }
-
-  @Override
-  public String getMimeType() {
-    return delegate.getMimeType();
-  }
-
-  @Override
-  public String getReferenceId() {
-    return delegate.getReferenceId();
-  }
-
-}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/HashDataInputDisplay.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/HashDataInputDisplay.java
index f79a2027..59700d4a 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/HashDataInputDisplay.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/HashDataInputDisplay.java
@@ -1,6 +1,18 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * 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.
  */
 package at.gv.egiz.bku.smccstal;
 
@@ -14,7 +26,11 @@ import java.util.List;
  */
 public interface HashDataInputDisplay {
 
+
   /**
+   * TODO: (see AbstractHelpListener)
+   * 
+   * 
    * Displays the hashdata inputs for all provided dsig:SignedReferences.
    * Implementations may verify the digest value if necessary. 
    * (LocalSignRequestHandler operates on DataObjectHashDataInput, 
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index 6c30a68a..77ee45b6 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -192,7 +192,7 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
     
 
     
-  class STALPinProvider implements PINProvider, ActionListener {
+  class STALPinProvider implements PINProvider {
     
     protected SignedInfoType signedInfo;
     protected List<HashDataInput> hashDataInputs;
@@ -230,10 +230,10 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
             displayHashDataInputs(signedInfo.getReference());
           } catch (DigestException ex) { 
             log.error("Bad digest value: " + ex.getMessage());
-            gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH, new Object[] {ex.getMessage()});
+            gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH, new Object[] {ex.getMessage()}, SignRequestHandler.this, "error");
           } catch (Exception ex) {
             log.error("Could not display hashdata inputs: " + ex.getMessage());
-            gui.showErrorDialog(BKUGUIFacade.ERR_DISPLAY_HASHDATA, new Object[] {ex.getMessage()}, SignRequestHandler.this, "ok");
+            gui.showErrorDialog(BKUGUIFacade.ERR_DISPLAY_HASHDATA, new Object[] {ex.getMessage()}, SignRequestHandler.this, "error");
           }
         
         // OLD HASHDATA DISPLAY (in applet), 
@@ -261,13 +261,15 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
         return new String(gui.getPin());
       } else if (actionCommand.equals("ok")) {
         showSignaturePINDialog(spec, retries);
+      } else if (actionCommand.equals("error")) {
+        return null;
       }
     } while (true);
   }
 
-    @Override
-    public void actionPerformed(ActionEvent e) {
-      throw new UnsupportedOperationException("Not supported yet.");
-    }
+//    @Override
+//    public void actionPerformed(ActionEvent e) {
+//      throw new UnsupportedOperationException("Not supported yet.");
+//    }
   }
 }
-- 
cgit v1.2.3


From 547d2ac46ea1feb323fd945de690b8ee0ca9c5f3 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 13 Nov 2008 18:33:03 +0000
Subject: FRAME HashDataDisplay FRAME Help

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@167 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerDialog.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerDialog.java
index cd04ad98..e643c876 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerDialog.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerDialog.java
@@ -151,6 +151,9 @@ public class ViewerDialog extends JDialog
     InputStream content = hashData.getHashDataInput();
     String mimeType = hashData.getMimeType();
     String encoding = hashData.getEncoding();
+    if (encoding == null) {
+      encoding = "UTF-8";
+    }
       
     JPanel hashDataPanel = createViewerPanel(messages.getString(BKUGUIFacade.MESSAGE_HASHDATA), content, mimeType, encoding, helpListener);
     JPanel buttonPanel = createButtonPanel(saveListener, saveCommand);
-- 
cgit v1.2.3


From fef61ddc786960015c6fc416d4ad2d5d0f2048d1 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 13 Nov 2008 20:56:23 +0000
Subject: bugfix openwindow blocked bugfix helpTopic always hashdataviewer

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@168 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |   2 +-
 .../bku/online/applet/DefaultHelpListener.java     |  38 +--
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   1 +
 .../java/at/gv/egiz/bku/gui/HashDataViewer.java    | 288 +++++++++++++++++
 .../java/at/gv/egiz/bku/gui/HelpMouseListener.java |  10 +-
 .../main/java/at/gv/egiz/bku/gui/HelpViewer.java   | 211 ++++++++++++
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    |   3 +-
 .../main/java/at/gv/egiz/bku/gui/ViewerDialog.java | 357 ---------------------
 .../at/gv/egiz/bku/gui/Messages.properties         |   1 +
 .../at/gv/egiz/bku/gui/Messages_en.properties      |   1 +
 .../gv/egiz/bku/local/gui/LocalHelpListener.java   |   2 +-
 .../at/gv/egiz/bku/local/stal/BKUGuiProxy.java     |  18 +-
 12 files changed, 531 insertions(+), 401 deletions(-)
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
 delete mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerDialog.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index b4407b22..4b49c5d5 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -90,7 +90,7 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
     try {
       URL helpURL = getURLParameter(HELP_URL); //, getAppletParameter(SESSION_ID));
 //      helpListener = new BrowserHelpListener(getAppletContext(), helpURL, getLocale());
-      helpListener = new DefaultHelpListener(helpURL, getLocale());
+      helpListener = new DefaultHelpListener(getAppletContext(), helpURL, getLocale());
     } catch (MalformedURLException ex) {
       log.warn("failed to load help URL, disabling help: " + ex.getMessage());
     }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/DefaultHelpListener.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/DefaultHelpListener.java
index 9876ef7e..6eec5665 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/DefaultHelpListener.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/DefaultHelpListener.java
@@ -16,49 +16,28 @@
  */
 package at.gv.egiz.bku.online.applet;
 
+import at.gv.egiz.bku.gui.HelpViewer;
 import at.gv.egiz.bku.gui.AbstractHelpListener;
-import at.gv.egiz.bku.gui.ViewerDialog;
-import java.io.InputStream;
+import java.applet.AppletContext;
 import java.net.URL;
-import java.net.URLConnection;
 import java.util.Locale;
 import javax.swing.SwingUtilities;
 
 /**
- * This class depends on BKU utils, and therefore is not part of BKUCommonGUI
  * 
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class DefaultHelpListener extends AbstractHelpListener {
 
-  public DefaultHelpListener(URL helpURL, Locale locale) {
+  protected AppletContext ctx;
+  
+  public DefaultHelpListener(AppletContext ctx, URL helpURL, Locale locale) {
     super(helpURL, locale);
+    this.ctx = ctx;
   }
 
   @Override
-  public void showDocument(URL helpURL, final String helpTopic) throws Exception {
-    log.debug("open connection " + helpURL);
-    URLConnection conn = helpURL.openConnection();
-    
-    log.debug("show help document " + conn.getContentType()); // + ";" + conn.getContentEncoding());
-    
-//    Charset cs;
-//    if (conn.getContentEncoding() == null) {
-//      cs = Charset.forName("UTF-8");
-//    } else {
-//      try {
-//        cs = Charset.forName(conn.getContentEncoding());
-//      } catch (Exception ex) {
-//        log.debug("charset " + conn.getContentEncoding() + " not supported, assuming UTF-8: " + ex.getMessage());
-//        cs = Charset.forName("UTF-8");
-//      }  
-//    }
-    
-//    InputStreamReader isr = new InputStreamReader(conn.getInputStream(), cs);
-//    final Reader content = new BufferedReader(isr);
-    final InputStream content = conn.getInputStream();
-    final String mimeType = conn.getContentType();
-      
+  public void showDocument(final URL helpURL, final String helpTopic) throws Exception {
     log.debug("schedule help dialog");
     
     SwingUtilities.invokeLater(new Runnable() {
@@ -68,10 +47,9 @@ public class DefaultHelpListener extends AbstractHelpListener {
           
           log.debug("show help dialog");
           
-          ViewerDialog.showHelp(null, helpTopic, content, mimeType, messages);
+          HelpViewer.showHelpDialog(ctx, helpURL, helpTopic, messages);
       
         }
       });
-//    gui.showHelpDialog(helpDocument.getStream(), mimetype, encoding);
   }
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 2daf3300..c7032f90 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -38,6 +38,7 @@ public interface BKUGUIFacade {
   public static final String ERR_CARD_LOCKED = "error.card.locked";
   public static final String ERR_CARD_NOTACTIVATED = "error.card.notactivated";
   public static final String ERR_VIEWER = "error.viewer";
+  public static final String ERR_EXTERNAL_LINK = "error.external.link";
   
   public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
   public static final String DEFAULT_BACKGROUND = "/images/BackgroundChipperling.png";
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
new file mode 100644
index 00000000..8883098a
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
@@ -0,0 +1,288 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.stal.HashDataInput;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.Charset;
+import java.text.MessageFormat;
+import java.util.List;
+import java.util.ResourceBundle;
+import javax.swing.GroupLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle;
+import javax.swing.text.Document;
+import javax.swing.text.EditorKit;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class HashDataViewer extends JDialog
+        implements ActionListener {
+
+  public static final String PLAINTEXT_FONT = "Monospaced";
+  protected static final Log log = LogFactory.getLog(HashDataViewer.class);
+
+  private static HashDataViewer dialog;
+  
+  protected ResourceBundle messages;
+  
+  /**
+   * 
+   * @param signedReferences currently, only one hashdata input (the first in the list) is displayed
+   */
+  public static void showHashDataInput(List<HashDataInput> hashDataInputs,
+          ResourceBundle messages,
+          ActionListener saveListener,
+          String saveCommand,
+          ActionListener helpListener) {
+    showHashDataInput(null, hashDataInputs, messages, saveListener, saveCommand, helpListener);
+  }
+  
+  /**
+   * 
+   * @param frameComp owner
+   */
+  public static void showHashDataInput(Component frameComp,
+          List<HashDataInput> hashDataInputs,
+          ResourceBundle messages,
+          ActionListener saveListener,
+          String saveCommand,
+          ActionListener helpListener) {
+    
+    Frame frame = null;
+    if (frameComp != null) {
+      JOptionPane.getFrameForComponent(frameComp);
+    }
+    dialog = new HashDataViewer(frame, 
+            messages,
+            hashDataInputs, 
+            saveListener, 
+            saveCommand, 
+            helpListener);
+    dialog.setVisible(true);
+  }
+
+  private HashDataViewer(Frame frame,
+          ResourceBundle messages,
+          List<HashDataInput> hashDataInputs,
+          ActionListener saveListener,
+          String saveCommand,
+          ActionListener helpListener) {
+    super(frame, messages.getString(BKUGUIFacade.WINDOWTITLE_VIEWER), true);
+    this.messages = messages;
+
+    HashDataInput hashData = hashDataInputs.get(0);
+    
+    Charset cs;
+    if (hashData.getEncoding() == null) {
+      cs = Charset.forName("UTF-8");
+    } else {
+      try {
+        cs = Charset.forName(hashData.getEncoding());
+      } catch (Exception ex) {
+        log.debug("charset " + hashData.getEncoding() + " not supported, assuming UTF-8: " + ex.getMessage());
+        cs = Charset.forName("UTF-8");
+      }  
+    }
+    
+    
+    InputStreamReader isr = new InputStreamReader(hashData.getHashDataInput(), cs);
+    Reader content = new BufferedReader(isr);
+  
+    JPanel hashDataPanel = createViewerPanel(
+            messages.getString(BKUGUIFacade.MESSAGE_HASHDATA), 
+            content, 
+            hashData.getMimeType(), 
+            helpListener);
+    JPanel buttonPanel = createButtonPanel(saveListener, saveCommand);
+    initContentPane(new Dimension(600, 400), hashDataPanel, buttonPanel);
+
+    pack();
+    if (frame != null) {
+      setLocationRelativeTo(frame);
+    } else {
+      setLocationByPlatform(true);
+    }
+  }
+
+  private void initContentPane(Dimension preferredSize, JPanel viewerPanel, JPanel buttonPanel) {
+    Container contentPane = getContentPane();
+    contentPane.setPreferredSize(preferredSize);
+
+    GroupLayout mainLayout = new GroupLayout(contentPane);
+    contentPane.setLayout(mainLayout);
+
+    mainLayout.setHorizontalGroup(
+            mainLayout.createSequentialGroup().addContainerGap().addGroup(
+            mainLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)).addContainerGap());
+    mainLayout.setVerticalGroup(
+            mainLayout.createSequentialGroup()
+              .addContainerGap()
+              .addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+              .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
+              .addComponent(buttonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+              .addContainerGap());
+  }
+
+  /**
+   * 
+   * @param messages
+   * @param content
+   * @param mimeType defaults to text/plain if null 
+   * @param encoding must be null if document contains charset declaration (e.g. HTML page), otherwise the parser crashes
+   * @param helpListener may be null
+   * @return
+   */
+  private JPanel createViewerPanel(String viewerLabelText, 
+          Reader content, 
+          String mimeType, 
+          final ActionListener helpListener) {
+    log.debug("viewer dialog: " + mimeType);
+
+    if (mimeType == null) {
+      mimeType = "text/plain";
+    } else if ("application/xhtml+xml".equals(mimeType)) {
+      mimeType = "text/html";
+    }
+
+    JEditorPane viewer = new JEditorPane();
+    viewer.setEditable(false);
+    viewer.setContentType(mimeType);
+    if ("text/plain".equals(mimeType)) {
+      viewer.setFont(new Font(PLAINTEXT_FONT, viewer.getFont().getStyle(), viewer.getFont().getSize()));
+    }
+
+    EditorKit editorKit = viewer.getEditorKit();
+    Document document = editorKit.createDefaultDocument();
+//    document.putProperty("IgnoreCharsetDirective", new Boolean(true));
+    
+    try {
+        viewer.read(content, document);
+        content.close();
+    } catch (Exception ex) {
+      log.error(ex.getMessage(), ex);
+      String p = messages.getString(BKUGUIFacade.ERR_VIEWER);
+      viewer.setText(MessageFormat.format(p, ex.getMessage()));
+    }
+
+    JScrollPane scrollPane = new JScrollPane(viewer);
+    scrollPane.setPreferredSize(viewer.getPreferredSize());
+    scrollPane.setAlignmentX(LEFT_ALIGNMENT);
+    viewer.setCaretPosition(0);
+
+    JLabel viewerLabel = new JLabel();
+    viewerLabel.setText(viewerLabelText);
+    viewerLabel.setFont(viewerLabel.getFont().deriveFont(viewerLabel.getFont().getStyle() | java.awt.Font.BOLD));
+    viewerLabel.setLabelFor(viewer);
+
+    JPanel viewerPanel = new JPanel();
+    GroupLayout viewerPanelLayout = new GroupLayout(viewerPanel);
+    viewerPanel.setLayout(viewerPanelLayout);
+
+    if (helpListener != null) {
+      JLabel helpLabel = new JLabel();
+      helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG)));
+      helpLabel.addMouseListener(new MouseAdapter() {
+
+        @Override
+        public void mouseClicked(MouseEvent arg0) {
+            ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, BKUGUIFacade.HELP_HASHDATAVIEWER);
+            helpListener.actionPerformed(e);
+        }
+      });
+      helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+      viewerPanelLayout.setHorizontalGroup(
+            viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(viewerPanelLayout.createSequentialGroup().addComponent(viewerLabel).addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE).addComponent(helpLabel)).addComponent(scrollPane)); //, 0, 0, Short.MAX_VALUE));
+      viewerPanelLayout.setVerticalGroup(
+            viewerPanelLayout.createSequentialGroup()
+              .addGroup(viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                .addComponent(viewerLabel)
+                .addComponent(helpLabel))
+              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+              .addComponent(scrollPane)); 
+    } else {
+      viewerPanelLayout.setHorizontalGroup(
+            viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+              .addComponent(viewerLabel)
+              .addComponent(scrollPane)); 
+      viewerPanelLayout.setVerticalGroup(
+            viewerPanelLayout.createSequentialGroup()
+              .addComponent(viewerLabel)
+              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+              .addComponent(scrollPane)); 
+
+    }
+    
+    return viewerPanel;
+  }
+  
+  private JPanel createButtonPanel(ActionListener saveListener, String saveCommand) {
+    JButton closeButton = new JButton();
+    closeButton.setText(messages.getString(BKUGUIFacade.BUTTON_CLOSE));
+    closeButton.addActionListener(this);
+
+    JButton saveButton = new JButton();
+    saveButton.setText(messages.getString(BKUGUIFacade.BUTTON_SAVE));
+    saveButton.setActionCommand(saveCommand);
+    saveButton.addActionListener(saveListener);
+
+    int buttonSize = closeButton.getPreferredSize().width;
+    if (saveButton.getPreferredSize().width > buttonSize) {
+      buttonSize = saveButton.getPreferredSize().width;
+    }
+
+    JPanel buttonPanel = new JPanel();
+    GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+    buttonPanel.setLayout(buttonPanelLayout);
+
+    buttonPanelLayout.setHorizontalGroup(
+            buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(saveButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(closeButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+    buttonPanelLayout.setVerticalGroup(
+            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(closeButton));
+
+    return buttonPanel;
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    HashDataViewer.dialog.setVisible(false);
+  }
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpMouseListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpMouseListener.java
index 531884d1..b7bbe971 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpMouseListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpMouseListener.java
@@ -28,23 +28,27 @@ public class HelpMouseListener extends MouseAdapter {
 
   protected static final Log log = LogFactory.getLog(HelpMouseListener.class);
   
-  protected ActionListener externalHelpListener;
+  protected ActionListener helpListener;
   protected String locale;
   protected String topic;
 
   public HelpMouseListener(ActionListener externalHelpListener) {
     super();
-    this.externalHelpListener = externalHelpListener;
+    this.helpListener = externalHelpListener;
   }
 
   public void setHelpTopic(String topic) {
     log.trace("setting help topic: " + topic);
     this.topic = topic;
   }
+  
+  public ActionListener getActionListener() {
+    return helpListener;
+  }
 
   @Override
   public void mouseClicked(MouseEvent arg0) {
     ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, topic);
-    externalHelpListener.actionPerformed(e);
+    helpListener.actionPerformed(e);
   }
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
new file mode 100644
index 00000000..42ca2090
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
@@ -0,0 +1,211 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.bku.gui.*;
+import java.applet.AppletContext;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.ResourceBundle;
+import javax.swing.GroupLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle;
+import javax.swing.SwingUtilities;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class HelpViewer extends JDialog
+        implements ActionListener {
+
+  protected static final Log log = LogFactory.getLog(HelpViewer.class);
+  private static HelpViewer dialog;
+  protected ResourceBundle messages;
+  protected AppletContext ctx;
+
+  /**
+   * 
+   * @param ctx external links are opened via ctx.showDocument()
+   * @param helpURL
+   * @param helpTopic
+   * @param messages
+   */
+  public static void showHelpDialog(AppletContext ctx,
+          URL helpURL,
+          String helpTopic,
+          ResourceBundle messages) {
+    showHelpDialog(null, ctx, helpURL, helpTopic, messages);
+  }
+
+  public static void showHelpDialog(URL helpURL,
+          String helpTopic,
+          ResourceBundle messages) {
+    showHelpDialog(null, null, helpURL, helpTopic, messages);
+  }
+
+  public static void showHelpDialog(Component owner,
+          AppletContext ctx,
+          URL helpURL,
+          String helpTopic,
+          ResourceBundle messages) {
+
+    Frame frame = null;
+    if (owner != null) {
+      JOptionPane.getFrameForComponent(owner);
+    }
+    dialog = new HelpViewer(frame, messages, ctx, helpURL, helpTopic);
+    dialog.setVisible(true);
+  }
+
+  private HelpViewer(Frame frame,
+          ResourceBundle messages,
+          AppletContext ctx,
+          URL helpURL,
+          String helpTopic) {
+    super(frame, messages.getString(BKUGUIFacade.WINDOWTITLE_HELP), true);
+    this.messages = messages;
+    this.ctx = ctx;
+
+    String p = messages.getString(BKUGUIFacade.MESSAGE_HELP);
+    String helpItem = messages.getString(helpTopic);
+    String viewerLabel = MessageFormat.format(p, new Object[]{helpItem});
+
+    JPanel helpPanel = createViewerPanel(viewerLabel, helpURL);
+    JPanel buttonPanel = createButtonPanel();
+
+    initContentPane(new Dimension(600, 400), helpPanel, buttonPanel);
+    pack();
+    if (frame != null) {
+      setLocationRelativeTo(frame);
+    } else {
+      setLocationByPlatform(true);
+    }
+  }
+
+  private void initContentPane(Dimension preferredSize, JPanel viewerPanel, JPanel buttonPanel) {
+    Container contentPane = getContentPane();
+    contentPane.setPreferredSize(preferredSize);
+
+    GroupLayout mainLayout = new GroupLayout(contentPane);
+    contentPane.setLayout(mainLayout);
+
+    mainLayout.setHorizontalGroup(
+            mainLayout.createSequentialGroup().addContainerGap().addGroup(
+            mainLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)).addContainerGap());
+    mainLayout.setVerticalGroup(
+            mainLayout.createSequentialGroup().addContainerGap().addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED).addComponent(buttonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE).addContainerGap());
+  }
+
+  private JPanel createViewerPanel(String viewerLabelText, URL helpURL) {
+    log.debug("viewer dialog: " + helpURL.toString());
+
+    final JEditorPane viewer = new JEditorPane();
+    viewer.setEditable(false);
+    try {
+      viewer.setPage(helpURL);
+      viewer.addHyperlinkListener(new HyperlinkListener() {
+
+        @Override
+        public void hyperlinkUpdate(HyperlinkEvent e) {
+          final URL url = e.getURL();
+          if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
+            if (ctx != null) {
+              log.debug("open external link in help viewer: " + url);
+              ctx.showDocument(url, "_blank");
+            } else {
+              SwingUtilities.invokeLater(new Runnable() {
+
+                @Override
+                public void run() {
+                  String msgP = messages.getString(BKUGUIFacade.ERR_EXTERNAL_LINK);
+                  String msg = MessageFormat.format(msgP, url);
+                  String title = messages.getString(BKUGUIFacade.TITLE_ERROR);
+                  JOptionPane.showMessageDialog(rootPane, msg, title, JOptionPane.ERROR_MESSAGE);
+                }
+              });
+            }
+          }
+        }
+      });
+    } catch (IOException ex) {
+      String p = messages.getString(BKUGUIFacade.ERR_VIEWER);
+      viewer.setText(MessageFormat.format(p, new Object[]{ex.getMessage()}));
+    }
+
+    JScrollPane scrollPane = new JScrollPane(viewer);
+    scrollPane.setPreferredSize(viewer.getPreferredSize());
+    scrollPane.setAlignmentX(LEFT_ALIGNMENT);
+    viewer.setCaretPosition(0);
+
+    JLabel viewerLabel = new JLabel();
+    viewerLabel.setText(viewerLabelText);
+    viewerLabel.setFont(viewerLabel.getFont().deriveFont(viewerLabel.getFont().getStyle() | java.awt.Font.BOLD));
+    viewerLabel.setLabelFor(viewer);
+
+    JPanel viewerPanel = new JPanel();
+    GroupLayout viewerPanelLayout = new GroupLayout(viewerPanel);
+    viewerPanel.setLayout(viewerPanelLayout);
+    
+    viewerPanelLayout.setHorizontalGroup(
+            viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(viewerLabel).addComponent(scrollPane));
+    viewerPanelLayout.setVerticalGroup(
+            viewerPanelLayout.createSequentialGroup().addComponent(viewerLabel).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(scrollPane));
+
+    return viewerPanel;
+  }
+
+  private JPanel createButtonPanel() {
+    JButton closeButton = new JButton();
+    closeButton.setText(messages.getString(BKUGUIFacade.BUTTON_CLOSE));
+    closeButton.addActionListener(this);
+
+    JPanel buttonPanel = new JPanel();
+    GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+    buttonPanel.setLayout(buttonPanelLayout);
+
+    buttonPanelLayout.setHorizontalGroup(
+            buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(closeButton));
+    buttonPanelLayout.setVerticalGroup(
+            buttonPanelLayout.createSequentialGroup().addComponent(closeButton));
+    return buttonPanel;
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    HelpViewer.dialog.setVisible(false);
+  }
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index 6250dd0e..a810d34c 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -954,7 +954,8 @@ public class SimpleGUI implements BKUGUIFacade {
           
           log.debug("show plaintext hashdatainput dialog");
       
-          ViewerDialog.showHashDataInput(contentPane, signedReferences, messages, saveListener, saveCommand, helpListener);
+          ActionListener l = helpListener.getActionListener();
+          HashDataViewer.showHashDataInput(contentPane, signedReferences, messages, saveListener, saveCommand, l);
         }
       });
     }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerDialog.java
deleted file mode 100644
index e643c876..00000000
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerDialog.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.gui;
-
-import at.gv.egiz.stal.HashDataInput;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.Charset;
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.ResourceBundle;
-import javax.swing.GroupLayout;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JEditorPane;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.LayoutStyle;
-import javax.swing.text.Document;
-import javax.swing.text.EditorKit;
-import javax.swing.text.html.HTMLDocument;
-import javax.swing.text.html.HTMLEditorKit;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class ViewerDialog extends JDialog
-        implements ActionListener {
-
-  public static final String PLAINTEXT_FONT = "Monospaced";
-  protected static final Log log = LogFactory.getLog(ViewerDialog.class);
-//  private ViewerDialog dialog;
-  
-  protected ResourceBundle messages;
-  
-  /**
-   * 
-   * @param frameComp
-   * @param signedReferences currently, only one hashdata input (the first in the list) is displayed
-   * @param messages
-   * @param saveListener
-   * @param saveCommand
-   * @param helpListener
-   */
-  public static void showHashDataInput(Component frameComp,
-          List<HashDataInput> hashDataInputs,
-          ResourceBundle messages,
-          ActionListener saveListener,
-          String saveCommand,
-          HelpMouseListener helpListener) {
-    
-    Frame frame = null;
-    if (frameComp != null) {
-      JOptionPane.getFrameForComponent(frameComp);
-    }
-    ViewerDialog viewer = new ViewerDialog(frame, 
-            messages,
-            hashDataInputs, 
-            saveListener, 
-            saveCommand, 
-            helpListener);
-    viewer.setVisible(true);
-  }
-
-  public static void showHelp(Component frameComp,
-          String helpTopic,
-//          Reader helpDocument,
-          InputStream helpDocument,
-          String mimeType,
-          ResourceBundle messages) {
-    
-    Frame frame = null;
-    if (frameComp != null) {
-      JOptionPane.getFrameForComponent(frameComp);
-    }
-    ViewerDialog viewer = new ViewerDialog(frame, messages, helpTopic, helpDocument, mimeType);
-    viewer.setVisible(true);
-  }
-
-  /**
-   * TODO make encoding aware!
-   * @param frame
-   * @param title
-   * @param messages
-   * @param hashDataInputs
-   * @param saveListener
-   * @param saveCommand
-   * @param helpListener
-   */
-  private ViewerDialog(Frame frame,
-          ResourceBundle messages,
-          List<HashDataInput> hashDataInputs,
-          ActionListener saveListener,
-          String saveCommand,
-          HelpMouseListener helpListener) {
-    super(frame, messages.getString(BKUGUIFacade.WINDOWTITLE_VIEWER), true);
-    this.messages = messages;
-
-    HashDataInput hashData = hashDataInputs.get(0);
-    
-//    Charset cs;
-//    if (hashData.getEncoding() == null) {
-//      cs = Charset.forName("UTF-8");
-//    } else {
-//      try {
-//        cs = Charset.forName(hashData.getEncoding());
-//      } catch (Exception ex) {
-//        log.debug("charset " + hashData.getEncoding() + " not supported, assuming UTF-8: " + ex.getMessage());
-//        cs = Charset.forName("UTF-8");
-//      }  
-//    }
-    
-//    InputStreamReader isr = new InputStreamReader(hashData.getHashDataInput(), cs);
-//    Reader content = new BufferedReader(isr);
-    InputStream content = hashData.getHashDataInput();
-    String mimeType = hashData.getMimeType();
-    String encoding = hashData.getEncoding();
-    if (encoding == null) {
-      encoding = "UTF-8";
-    }
-      
-    JPanel hashDataPanel = createViewerPanel(messages.getString(BKUGUIFacade.MESSAGE_HASHDATA), content, mimeType, encoding, helpListener);
-    JPanel buttonPanel = createButtonPanel(saveListener, saveCommand);
-    initContentPane(new Dimension(600, 400), hashDataPanel, buttonPanel);
-
-    pack();
-    if (frame != null) {
-      setLocationRelativeTo(frame);
-    } else {
-      setLocationByPlatform(true);
-    }
-  }
-
-  private ViewerDialog(Frame frame,
-          ResourceBundle messages,
-          String helpTopic,
-//          Reader helpDocument,
-          InputStream helpDocument,
-          String mimeType) {
-    super(frame, messages.getString(BKUGUIFacade.WINDOWTITLE_HELP), true);
-    this.messages = messages;
-    
-    String p = messages.getString(BKUGUIFacade.MESSAGE_HELP);
-    String helpItem = messages.getString(helpTopic);
-    String viewerLabel = MessageFormat.format(p, new Object[] {helpItem});
-    
-    JPanel helpPanel = createViewerPanel(viewerLabel, helpDocument, mimeType, null, null);
-    JPanel buttonPanel = createButtonPanel();
-    
-    initContentPane(new Dimension(600, 400), helpPanel, buttonPanel);
-    pack();
-    if (frame != null) {
-      setLocationRelativeTo(frame);
-    } else {
-      setLocationByPlatform(true);
-    }
-  }
-  
-  private void initContentPane(Dimension preferredSize, JPanel viewerPanel, JPanel buttonPanel) {
-    Container contentPane = getContentPane();
-    contentPane.setPreferredSize(preferredSize);
-
-    GroupLayout mainLayout = new GroupLayout(contentPane);
-    contentPane.setLayout(mainLayout);
-
-    mainLayout.setHorizontalGroup(
-            mainLayout.createSequentialGroup().addContainerGap().addGroup(
-            mainLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)).addContainerGap());
-    mainLayout.setVerticalGroup(
-            mainLayout.createSequentialGroup()
-              .addContainerGap()
-              .addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-              .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
-              .addComponent(buttonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-              .addContainerGap());
-  }
-
-  /**
-   * 
-   * @param messages
-   * @param content
-   * @param mimeType defaults to text/plain if null 
-   * @param encoding must be null if document contains charset declaration (e.g. HTML page), otherwise the parser crashes
-   * @param helpListener may be null
-   * @return
-   */
-  private JPanel createViewerPanel(String viewerLabelText, InputStream content, String mimeType, String encoding, HelpMouseListener helpListener) {
-    log.debug("viewer dialog: " + mimeType);
-
-    if (mimeType == null) {
-      mimeType = "text/plain";
-    } else if ("application/xhtml+xml".equals(mimeType)) {
-      mimeType = "text/html";
-    }
-
-    JEditorPane viewer = new JEditorPane();
-    viewer.setEditable(false);
-    viewer.setContentType(mimeType);
-    if ("text/plain".equals(mimeType)) {
-      viewer.setFont(new Font(PLAINTEXT_FONT, viewer.getFont().getStyle(), viewer.getFont().getSize()));
-    }
-
-    EditorKit editorKit = viewer.getEditorKit();
-    Document document = editorKit.createDefaultDocument();
-//    document.putProperty("IgnoreCharsetDirective", new Boolean(true));
-    
-    try {
-      if (encoding != null) {
-        BufferedReader contentReader = new BufferedReader(new InputStreamReader(content, encoding));
-        viewer.read(contentReader, document);
-        contentReader.close();
-      } else {
-        // charset declaration in content
-        viewer.read(content, document);
-        content.close();
-      }
-    } catch (Exception ex) {
-      log.error(ex.getMessage(), ex);
-      String p = messages.getString(BKUGUIFacade.ERR_VIEWER);
-      viewer.setText(MessageFormat.format(p, ex.getMessage()));
-    }
-
-    JScrollPane scrollPane = new JScrollPane(viewer);
-    scrollPane.setPreferredSize(viewer.getPreferredSize());
-    scrollPane.setAlignmentX(LEFT_ALIGNMENT);
-    viewer.setCaretPosition(0);
-
-    JLabel viewerLabel = new JLabel();
-    viewerLabel.setText(viewerLabelText);
-    viewerLabel.setFont(viewerLabel.getFont().deriveFont(viewerLabel.getFont().getStyle() | java.awt.Font.BOLD));
-    viewerLabel.setLabelFor(viewer);
-
-    JPanel viewerPanel = new JPanel();
-    GroupLayout viewerPanelLayout = new GroupLayout(viewerPanel);
-    viewerPanel.setLayout(viewerPanelLayout);
-
-    if (helpListener != null) {
-      JLabel helpLabel = new JLabel();
-      helpListener.setHelpTopic(BKUGUIFacade.HELP_HASHDATAVIEWER);
-      helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG)));
-      helpLabel.addMouseListener(helpListener);
-      helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-      viewerPanelLayout.setHorizontalGroup(
-            viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(viewerPanelLayout.createSequentialGroup().addComponent(viewerLabel).addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE).addComponent(helpLabel)).addComponent(scrollPane)); //, 0, 0, Short.MAX_VALUE));
-      viewerPanelLayout.setVerticalGroup(
-            viewerPanelLayout.createSequentialGroup()
-              .addGroup(viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                .addComponent(viewerLabel)
-                .addComponent(helpLabel))
-              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-              .addComponent(scrollPane)); 
-    } else {
-      viewerPanelLayout.setHorizontalGroup(
-            viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-              .addComponent(viewerLabel)
-              .addComponent(scrollPane)); 
-      viewerPanelLayout.setVerticalGroup(
-            viewerPanelLayout.createSequentialGroup()
-              .addComponent(viewerLabel)
-              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-              .addComponent(scrollPane)); 
-
-    }
-    
-    return viewerPanel;
-  }
-
-  private JPanel createButtonPanel() {
-    JButton closeButton = new JButton();
-    closeButton.setText(messages.getString(BKUGUIFacade.BUTTON_CLOSE));
-    closeButton.addActionListener(this);
-
-    JPanel buttonPanel = new JPanel();
-    GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-    buttonPanel.setLayout(buttonPanelLayout);
-
-    buttonPanelLayout.setHorizontalGroup(
-            buttonPanelLayout.createSequentialGroup()
-              .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-              .addComponent(closeButton));
-    buttonPanelLayout.setVerticalGroup(
-            buttonPanelLayout.createSequentialGroup()
-              .addComponent(closeButton));
-    return buttonPanel;
-  }
-  
-  private JPanel createButtonPanel(ActionListener saveListener, String saveCommand) {
-    JButton closeButton = new JButton();
-    closeButton.setText(messages.getString(BKUGUIFacade.BUTTON_CLOSE));
-    closeButton.addActionListener(this);
-
-    JButton saveButton = new JButton();
-    saveButton.setText(messages.getString(BKUGUIFacade.BUTTON_SAVE));
-    saveButton.setActionCommand(saveCommand);
-    saveButton.addActionListener(saveListener);
-
-    int buttonSize = closeButton.getPreferredSize().width;
-    if (saveButton.getPreferredSize().width > buttonSize) {
-      buttonSize = saveButton.getPreferredSize().width;
-    }
-
-    JPanel buttonPanel = new JPanel();
-    GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-    buttonPanel.setLayout(buttonPanelLayout);
-
-    buttonPanelLayout.setHorizontalGroup(
-            buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(saveButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(closeButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-    buttonPanelLayout.setVerticalGroup(
-            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(closeButton));
-
-    return buttonPanel;
-  }
-
-  @Override
-  public void actionPerformed(ActionEvent e) {
-//    if ("close".equals(e.getActionCommand())) {
-//    ViewerDialog.dialog.setVisible(false);
-//    HashDataViewer.dialog.dispose();
-    this.setVisible(false);
-  }
-}
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index ba20471d..6c049c85 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -67,6 +67,7 @@ error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
 error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
 error.card.notactivated=<html>B\u00FCrgerkartenfunktion ist nicht aktiviert</html>
 error.viewer=Der Inhalt kann nicht dargestellt werden: {0}
+error.external.link=<html>Externer Link {0} wird nicht ge\u00F6ffnet</html>
 
 # Help Topics
 help.welcome=Startseite
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index edc5371d..80dc4234 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -65,6 +65,7 @@ error.test=<html>Error1 {0} - Error2 {1}</html>
 error.card.locked=<html>Citizen-card is locked</html>
 error.card.notactivated=<html>Citizen-card not activated</html>
 error.viewer=Failed to display contents: {0}
+error.external.link=<html>Externer Link {0} wird nicht ge\u00F6ffnet</html>
 
 # Help Topics
 help.welcome=Welcome page
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java
index e32c9c3d..d551ae0d 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java
@@ -39,7 +39,7 @@ public class LocalHelpListener extends AbstractHelpListener {
   }
 
   @Override
-  public void showDocument(URL helpDocument) throws IOException, URISyntaxException {
+  public void showDocument(URL helpDocument, String helpTopic) throws IOException, URISyntaxException {
     if (desktop == null) {
       log.error("Failed to open default browser: Desktop API not available (libgnome installed?)");
     } else {
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
index 39e997b7..fb8f2432 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
@@ -84,14 +84,6 @@ public class BKUGuiProxy implements BKUGUIFacade {
     delegate.showErrorDialog(errorMsgKey, errorMsgParams);
   }
 
-  @Override
-  public void showHashDataInputDialog(List<HashDataInput> signedReferences,
-      ActionListener okListener, String actionCommand) {
-    showDialog();
-    delegate.showHashDataInputDialog(signedReferences, okListener,
-        actionCommand);
-  }
-
   @Override
   public void showInsertCardDialog(ActionListener cancelListener,
       String actionCommand) {
@@ -131,4 +123,14 @@ public class BKUGuiProxy implements BKUGUIFacade {
     showDialog();
     delegate.showWelcomeDialog();
   }
+
+  @Override
+  public void showHashDataInputDialog(List<HashDataInput> signedReferences, 
+          boolean externalDisplay, 
+          ActionListener okListener, 
+          String okCommand) {
+    showDialog();
+    delegate.showHashDataInputDialog(signedReferences, externalDisplay, okListener,
+        okCommand);
+  }
 }
-- 
cgit v1.2.3


From f09efb78459c7cd49ca4e28d92f170833e7ee32d Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 14 Nov 2008 16:30:28 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@172
 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

---
 .../gv/egiz/bku/online/applet/AppletBKUWorker.java |   1 -
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |   5 +-
 .../bku/online/applet/DefaultHelpListener.java     |  55 --------------
 BKUApplet/src/test/resources/appletTest.html       |   4 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   1 +
 .../at/gv/egiz/bku/gui/DefaultHelpListener.java    |  62 ++++++++++++++++
 .../java/at/gv/egiz/bku/gui/HashDataViewer.java    |  15 +++-
 .../main/java/at/gv/egiz/bku/gui/HelpViewer.java   |   5 +-
 .../main/java/at/gv/egiz/bku/gui/ImagePanel.java   |   4 +-
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    |   6 ++
 .../egiz/bku/gui/html/RestrictedHTMLEditorKit.java |  49 +++++++++++++
 .../gv/egiz/bku/gui/html/RestrictedImageView.java  |  67 +++++++++++++++++
 .../at/gv/egiz/bku/gui/Messages.properties         |   4 +-
 .../at/gv/egiz/bku/gui/Messages_en.properties      |   3 +-
 BKUCommonGUI/src/main/resources/images/help.png    | Bin 303 -> 441 bytes
 .../src/main/resources/images/help_orig.png        | Bin 0 -> 303 bytes
 .../at/gv/egiz/bku/local/stal/SMCCSTALFactory.java |   7 +-
 BKULocal/src/main/webapp/WEB-INF/web.xml           |  40 ++++++----
 BKULocal/src/main/webapp/help.jsp                  |  29 ++++++++
 .../webapp/helpfiles/de/error.card.locked.html     |  46 ++++++++++++
 .../main/webapp/helpfiles/de/error.card.locked.png | Bin 0 -> 1325 bytes
 .../helpfiles/de/error.card.notactivated.html      |  43 +++++++++++
 .../helpfiles/de/error.card.notactivated.png       | Bin 0 -> 1419 bytes
 .../webapp/helpfiles/de/error.cardterminal.html    |  42 +++++++++++
 .../webapp/helpfiles/de/error.cardterminal.png     | Bin 0 -> 1490 bytes
 .../src/main/webapp/helpfiles/de/error.pcsc.html   |  40 ++++++++++
 .../src/main/webapp/helpfiles/de/error.pcsc.png    | Bin 0 -> 3684 bytes
 .../webapp/helpfiles/de/error.ws.unreachable.html  |  39 ++++++++++
 .../webapp/helpfiles/de/error.ws.unreachable.png   | Bin 0 -> 2561 bytes
 .../webapp/helpfiles/de/help.cardnotsupported.html |  47 ++++++++++++
 .../webapp/helpfiles/de/help.cardnotsupported.png  | Bin 0 -> 1113 bytes
 .../src/main/webapp/helpfiles/de/help.cardpin.html |  41 +++++++++++
 .../src/main/webapp/helpfiles/de/help.cardpin1.png | Bin 0 -> 1334 bytes
 .../src/main/webapp/helpfiles/de/help.cardpin2.png | Bin 0 -> 1324 bytes
 .../webapp/helpfiles/de/help.hashdataviewer.html   |  39 ++++++++++
 .../webapp/helpfiles/de/help.hashdataviewer.png    | Bin 0 -> 11310 bytes
 .../main/webapp/helpfiles/de/help.insertcard.html  |  42 +++++++++++
 .../main/webapp/helpfiles/de/help.insertcard.png   | Bin 0 -> 1207 bytes
 .../src/main/webapp/helpfiles/de/help.retry.html   |  40 ++++++++++
 .../src/main/webapp/helpfiles/de/help.retry.png    | Bin 0 -> 1711 bytes
 .../main/webapp/helpfiles/de/help.signpin-1.png    | Bin 0 -> 12818 bytes
 .../src/main/webapp/helpfiles/de/help.signpin.html |  45 ++++++++++++
 .../src/main/webapp/helpfiles/de/help.signpin.png  | Bin 0 -> 1511 bytes
 .../src/main/webapp/helpfiles/de/help.wait.html    |  39 ++++++++++
 .../src/main/webapp/helpfiles/de/help.wait.png     | Bin 0 -> 981 bytes
 .../src/main/webapp/helpfiles/de/help.welcome.html |  40 ++++++++++
 .../src/main/webapp/helpfiles/de/help.welcome.png  | Bin 0 -> 2152 bytes
 BKULocal/src/main/webapp/helpfiles/help.css        |  81 +++++++++++++++++++++
 BKULocal/src/main/webapp/helpfiles/index.html      |  17 +++++
 .../src/main/webapp/img/BackgroundChipperling.png  | Bin 0 -> 2041 bytes
 BKUOnline/src/main/webapp/img/BackgroundMocca.png  | Bin 0 -> 1287 bytes
 51 files changed, 910 insertions(+), 88 deletions(-)
 delete mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/DefaultHelpListener.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedHTMLEditorKit.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedImageView.java
 create mode 100644 BKUCommonGUI/src/main/resources/images/help_orig.png
 create mode 100644 BKULocal/src/main/webapp/help.jsp
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/error.card.locked.html
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/error.card.locked.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/error.card.notactivated.html
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/error.card.notactivated.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/error.cardterminal.html
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/error.cardterminal.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/error.pcsc.html
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/error.pcsc.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/error.ws.unreachable.html
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/error.ws.unreachable.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.cardnotsupported.html
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.cardnotsupported.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.cardpin.html
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.cardpin1.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.cardpin2.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.hashdataviewer.html
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.hashdataviewer.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.insertcard.html
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.insertcard.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.retry.html
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.retry.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.signpin-1.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.signpin.html
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.signpin.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.wait.html
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.wait.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.welcome.html
 create mode 100644 BKULocal/src/main/webapp/helpfiles/de/help.welcome.png
 create mode 100644 BKULocal/src/main/webapp/helpfiles/help.css
 create mode 100644 BKULocal/src/main/webapp/helpfiles/index.html
 create mode 100644 BKUOnline/src/main/webapp/img/BackgroundChipperling.png
 create mode 100644 BKUOnline/src/main/webapp/img/BackgroundMocca.png

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
index db88c037..f862360b 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
@@ -31,7 +31,6 @@ import at.gv.egiz.stal.service.types.RequestType;
 import at.gv.egiz.stal.service.types.ResponseType;
 import at.gv.egiz.stal.util.STALTranslator;
 import java.applet.AppletContext;
-import java.awt.Dimension;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 4b49c5d5..7963768e 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -16,6 +16,7 @@
  */
 package at.gv.egiz.bku.online.applet;
 
+import at.gv.egiz.bku.gui.DefaultHelpListener;
 import at.gv.egiz.bku.gui.AbstractHelpListener;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -92,12 +93,12 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
 //      helpListener = new BrowserHelpListener(getAppletContext(), helpURL, getLocale());
       helpListener = new DefaultHelpListener(getAppletContext(), helpURL, getLocale());
     } catch (MalformedURLException ex) {
-      log.warn("failed to load help URL, disabling help: " + ex.getMessage());
+      log.warn("failed to load help URL: " + ex.getMessage() + ", disabling help");
     }
     try {
       backgroundImgURL = getURLParameter(BACKGROUND_PARAM);
     } catch (MalformedURLException ex) {
-      log.info("failed to load applet background image, using default: " + ex.getMessage());
+      log.warn("failed to load applet background image: " + ex.getMessage() + ", using default");
     }
     
     if (locale != null) {
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/DefaultHelpListener.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/DefaultHelpListener.java
deleted file mode 100644
index 6eec5665..00000000
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/DefaultHelpListener.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.online.applet;
-
-import at.gv.egiz.bku.gui.HelpViewer;
-import at.gv.egiz.bku.gui.AbstractHelpListener;
-import java.applet.AppletContext;
-import java.net.URL;
-import java.util.Locale;
-import javax.swing.SwingUtilities;
-
-/**
- * 
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class DefaultHelpListener extends AbstractHelpListener {
-
-  protected AppletContext ctx;
-  
-  public DefaultHelpListener(AppletContext ctx, URL helpURL, Locale locale) {
-    super(helpURL, locale);
-    this.ctx = ctx;
-  }
-
-  @Override
-  public void showDocument(final URL helpURL, final String helpTopic) throws Exception {
-    log.debug("schedule help dialog");
-    
-    SwingUtilities.invokeLater(new Runnable() {
-
-        @Override
-        public void run() {
-          
-          log.debug("show help dialog");
-          
-          HelpViewer.showHelpDialog(ctx, helpURL, helpTopic, messages);
-      
-        }
-      });
-  }
-}
diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
index 1ba88e47..eaf6376d 100644
--- a/BKUApplet/src/test/resources/appletTest.html
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -21,9 +21,9 @@
               archive="../BKUApplet-1.0-SNAPSHOT.jar, ../test-libs/commons-logging-1.1.1.jar , ../test-libs/iaik_jce_me4se-3.04.jar"
               width=300 height=200>
               <param name="GuiStyle" value="simple"/>
-              <param name="Background" value="http://localhost:3495/DemoIntegration/mocca_background.png"/>
+              <param name="Background" value="http://localhost:3495/img/BackgroundMocca.png"/>
               <param name="WSDL_URL" value="http://localhost:3495/stal?wsdl"/>
-              <param name="HelpURL" value="http://localhost:3495/help/"/>
+              <param name="HelpURL" value="http://apps.egiz.gv.at/bkuonline/help/"/>
               <param name="HashDataDisplay" value="frame"/>
               <!--param name="HashDataURL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/hashDataInput"/-->
               <param name="SessionId" value="TestSession"/>
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index c7032f90..87982c79 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -89,6 +89,7 @@ public interface BKUGUIFacade {
   public static final String BUTTON_SAVE = "button.save";
   public static final String BUTTON_CLOSE = "button.close";
   public static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
+  public static final String ALT_HELP = "alt.help";
 
   public void init(Container contentPane, Locale locale, URL background, ActionListener helpListener);
 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
new file mode 100644
index 00000000..ba968a48
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.gui;
+
+import java.applet.AppletContext;
+import java.net.URL;
+import java.util.Locale;
+import javax.swing.SwingUtilities;
+
+/**
+ * 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class DefaultHelpListener extends AbstractHelpListener {
+
+  protected AppletContext ctx;
+
+  public DefaultHelpListener(AppletContext ctx, URL helpURL, Locale locale) {
+    super(helpURL, locale);
+    this.ctx = ctx;
+  }
+
+  public DefaultHelpListener(URL helpURL, Locale locale) {
+    super(helpURL, locale);
+    this.ctx = null;
+  }
+
+  @Override
+  public void showDocument(final URL helpURL, final String helpTopic) throws Exception {
+    log.debug("schedule help dialog");
+    
+    SwingUtilities.invokeLater(new Runnable() {
+
+        @Override
+        public void run() {
+          
+          log.debug("show help dialog");
+          
+          if (ctx == null) {
+            HelpViewer.showHelpDialog(helpURL, helpTopic, messages);
+      
+          } else {
+            HelpViewer.showHelpDialog(ctx, helpURL, helpTopic, messages);
+          }
+        }
+      });
+  }
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
index 8883098a..31887bde 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
@@ -16,6 +16,7 @@
  */
 package at.gv.egiz.bku.gui;
 
+import at.gv.egiz.bku.gui.html.RestrictedHTMLEditorKit;
 import at.gv.egiz.stal.HashDataInput;
 import java.awt.Component;
 import java.awt.Container;
@@ -23,6 +24,7 @@ import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Frame;
+import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -47,6 +49,11 @@ import javax.swing.JScrollPane;
 import javax.swing.LayoutStyle;
 import javax.swing.text.Document;
 import javax.swing.text.EditorKit;
+import javax.swing.text.Element;
+import javax.swing.text.ViewFactory;
+import javax.swing.text.html.HTML;
+import javax.swing.text.html.HTMLEditorKit;
+import javax.swing.text.html.ImageView;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -184,11 +191,14 @@ public class HashDataViewer extends JDialog
     }
 
     JEditorPane viewer = new JEditorPane();
-    viewer.setEditable(false);
-    viewer.setContentType(mimeType);
+    
     if ("text/plain".equals(mimeType)) {
       viewer.setFont(new Font(PLAINTEXT_FONT, viewer.getFont().getStyle(), viewer.getFont().getSize()));
+//    } else if ("text/html".equals(mimeType)) {
+//      viewer.setEditorKitForContentType("text/html", new RestrictedHTMLEditorKit());
     }
+    viewer.setEditable(false);
+    viewer.setContentType(mimeType);
 
     EditorKit editorKit = viewer.getEditorKit();
     Document document = editorKit.createDefaultDocument();
@@ -220,6 +230,7 @@ public class HashDataViewer extends JDialog
     if (helpListener != null) {
       JLabel helpLabel = new JLabel();
       helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG)));
+      helpLabel.getAccessibleContext().setAccessibleName(messages.getString(BKUGUIFacade.ALT_HELP));
       helpLabel.addMouseListener(new MouseAdapter() {
 
         @Override
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
index 42ca2090..173254e7 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
@@ -16,7 +16,6 @@
  */
 package at.gv.egiz.bku.gui;
 
-import at.gv.egiz.bku.gui.*;
 import java.applet.AppletContext;
 import java.awt.Component;
 import java.awt.Container;
@@ -30,7 +29,6 @@ import java.net.URL;
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 import javax.swing.GroupLayout;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JEditorPane;
@@ -136,6 +134,7 @@ public class HelpViewer extends JDialog
     final JEditorPane viewer = new JEditorPane();
     viewer.setEditable(false);
     try {
+      viewer.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
       viewer.setPage(helpURL);
       viewer.addHyperlinkListener(new HyperlinkListener() {
 
@@ -165,7 +164,7 @@ public class HelpViewer extends JDialog
       String p = messages.getString(BKUGUIFacade.ERR_VIEWER);
       viewer.setText(MessageFormat.format(p, new Object[]{ex.getMessage()}));
     }
-
+    viewer.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
     JScrollPane scrollPane = new JScrollPane(viewer);
     scrollPane.setPreferredSize(viewer.getPreferredSize());
     scrollPane.setAlignmentX(LEFT_ALIGNMENT);
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java
index 1185cf53..271c0b65 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java
@@ -24,8 +24,8 @@ import javax.swing.ImageIcon;
 import javax.swing.JPanel;
 
 /**
- *
- * @author clemens
+ * 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class ImagePanel extends JPanel {
 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index a810d34c..bb568b75 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -158,6 +158,11 @@ public class SimpleGUI implements BKUGUIFacade {
       if (background == null) {
         background = this.getClass().getResource(DEFAULT_BACKGROUND);
       }
+      if ("file".equals(background.getProtocol())) {
+        log.warn("local background image not allowed: " + background);
+        background = this.getClass().getResource(DEFAULT_BACKGROUND);
+      }
+      log.debug("loading background " + background);
       contentPanel = new ImagePanel(background);
 
 //        contentPanel.setBorder(new TitledBorder("content"));
@@ -179,6 +184,7 @@ public class SimpleGUI implements BKUGUIFacade {
         
         helpLabel = new JLabel();
         helpLabel.setIcon(new ImageIcon(getClass().getResource(HELP_IMG))); 
+        helpLabel.getAccessibleContext().setAccessibleName(messages.getString(ALT_HELP));
         helpLabel.addMouseListener(helpListener);
         helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
         
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedHTMLEditorKit.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedHTMLEditorKit.java
new file mode 100644
index 00000000..680bf1a4
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedHTMLEditorKit.java
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui.html;
+
+import javax.swing.text.Element;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.View;
+import javax.swing.text.html.HTML;
+import javax.swing.text.html.HTMLEditorKit;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class RestrictedHTMLEditorKit extends HTMLEditorKit {
+  
+ 
+  public static class RestrictedHTMLFactory extends HTMLFactory {
+
+    @Override
+    public View create(Element elem) {
+      Object o =
+        elem.getAttributes().getAttribute(StyleConstants.NameAttribute);
+      if (o instanceof HTML.Tag) {
+        HTML.Tag kind = (HTML.Tag) o;
+        if (kind == HTML.Tag.IMG)
+          return new RestrictedImageView(elem);
+      }
+      return super.create( elem );
+    }
+
+  }
+
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedImageView.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedImageView.java
new file mode 100644
index 00000000..b1aa35db
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedImageView.java
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui.html;
+
+import javax.swing.text.Element;
+import javax.swing.text.html.HTML;
+import javax.swing.text.html.ImageView;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+/**
+   * ImageViewer.refreshImage() (and loadImage()) is private :-(
+   */
+  public class RestrictedImageView extends ImageView {
+
+    public RestrictedImageView(Element elem) {
+      super(elem);
+    }
+
+//    @Override
+//    public Image getImage() {
+//      int s = state;
+//        if ((s & RELOAD_IMAGE_FLAG) != 0) {
+//            refreshImage();
+//        }
+//        s = state;
+//        if ((s & RELOAD_FLAG) != 0) {
+//            synchronized(this) {
+//                state = (state | RELOAD_FLAG) ^ RELOAD_FLAG;
+//            }
+//            setPropertiesFromAttributes();
+//        }
+//      return super.getImage();
+//    }
+    
+    /**
+     * check whether this URL corresponds to the data URI scheme 
+     * (and the referenced content is directly included in the document).
+     * @return
+     */
+    private boolean isDataURI() {
+      String src = (String)getElement().getAttributes().
+                             getAttribute(HTML.Attribute.SRC);
+      if (src == null) {
+        return false;
+      }
+
+      return src.toLowerCase().startsWith("data");
+    }
+  }
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 6c049c85..5f62c05a 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -31,7 +31,8 @@ message.wait=<html>Bitte warten...</html>
 message.insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
 message.enterpin=<html>{0} eingeben</html>
 message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
-message.hashdata=<html>Dies ist eine Voransicht des zu signierenden Inhaltes. F\u00FCr Details siehe Hilfe.</html> 
+message.hashdata=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
+#message.hashdata=<html>Dies ist eine Voransicht des zu signierenden Inhaltes. F\u00FCr Details siehe Hilfe (i).</html> 
 #verwenden sie bitte die von ihrem System zur Verf\u00FCgung gestellte {0} Anwendung. 
 message.hashdatalist=<html>{0} Signaturdaten:</html>
 message.retries=<html>Noch {0} Versuch(e)</html>
@@ -52,6 +53,7 @@ mimetype.desc.txt=Textdateien (.txt)
 mimetype.desc.pdf=Adobe PDF-Dateien (.pdf)
 mimetype.desc.bin=Bin\u00E4rdateien (.bin)
 save.hashdatainput.prefix=Signaturdaten
+alt.help=Hilfe
 
 # Error Messages
 error.no.hashdata=<html>Keine Signaturdaten verf\u00FCgbar: {0}</html>
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index 80dc4234..d963fd5f 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -31,7 +31,7 @@ message.wait=<html>Please wait...</html>
 message.insertcard=<html>Please insert your citizen-card into the reader</html>
 message.enterpin=<html>Enter {0}</html>
 message.hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
-message.hashdata=<html>Signature data:</html> 
+message.hashdata=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html> 
 message.hashdatalist=<html>{0} signature data objects:</html>
 message.retries=<html>{0} tries left</html>
 message.overwrite=<html>Overwrite {0}?</html>
@@ -51,6 +51,7 @@ mimetype.desc.txt=Textfiles (.txt)
 mimetype.desc.pdf=Adobe PDF-files (.pdf)
 mimetype.desc.bin=Binary files (.bin)
 save.hashdatainput.prefix=signaturedata
+alt.help=help
 
 # Error Messages
 error.no.hashdata=<html>No signature data available: {0}</html>
diff --git a/BKUCommonGUI/src/main/resources/images/help.png b/BKUCommonGUI/src/main/resources/images/help.png
index 5d6da3bf..d1c36c33 100644
Binary files a/BKUCommonGUI/src/main/resources/images/help.png and b/BKUCommonGUI/src/main/resources/images/help.png differ
diff --git a/BKUCommonGUI/src/main/resources/images/help_orig.png b/BKUCommonGUI/src/main/resources/images/help_orig.png
new file mode 100644
index 00000000..5d6da3bf
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/images/help_orig.png differ
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
index ad7b9646..cad8cfb6 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
@@ -27,7 +27,7 @@ import javax.swing.WindowConstants;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.BKUGUIFactory;
-import at.gv.egiz.bku.local.gui.LocalHelpListener;
+import at.gv.egiz.bku.gui.DefaultHelpListener;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.STALFactory;
 import java.net.URL;
@@ -49,10 +49,11 @@ public class SMCCSTALFactory implements STALFactory {
       dialog.setLocale(locale);
     }
     BKUGUIFacade gui = BKUGUIFactory.createGUI(BKUGUIFactory.ADVANCED_GUI);
-    LocalHelpListener helpListener = null;
+    DefaultHelpListener helpListener = null;
     try {
       if (helpURL != null) {
-        helpListener = new LocalHelpListener(new URL(helpURL), dialog.getLocale());
+//        helpListener = new LocalHelpListener(new URL(helpURL), dialog.getLocale());
+        helpListener = new DefaultHelpListener(new URL(helpURL), locale);
       } else {
         log.warn("no HELP URL configured, help system disabled");
       }
diff --git a/BKULocal/src/main/webapp/WEB-INF/web.xml b/BKULocal/src/main/webapp/WEB-INF/web.xml
index 64f9a581..36087d17 100644
--- a/BKULocal/src/main/webapp/WEB-INF/web.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/web.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
+<!--
+  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.
+-->
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app id="WebApp_ID">
   <display-name>http-security-layer-request</display-name>
@@ -36,6 +36,10 @@
     <servlet-name>BKUServlet</servlet-name>
     <servlet-class>at.gv.egiz.bku.local.webapp.SpringBKUServlet</servlet-class>
   </servlet>
+  <servlet>
+      <servlet-name>help</servlet-name>
+      <jsp-file>/help.jsp</jsp-file>
+  </servlet>
   <servlet-mapping>
     <servlet-name>BKUServlet</servlet-name>
     <url-pattern>/http-security-layer-request</url-pattern>
@@ -44,6 +48,10 @@
     <servlet-name>BKUServlet</servlet-name>
     <url-pattern>/https-security-layer-request</url-pattern>
   </servlet-mapping>
+  <servlet-mapping>
+      <servlet-name>help</servlet-name>
+      <url-pattern>/help/*</url-pattern>
+  </servlet-mapping>
   <!--  Begin BKU Config -->
   
   <welcome-file-list>
diff --git a/BKULocal/src/main/webapp/help.jsp b/BKULocal/src/main/webapp/help.jsp
new file mode 100644
index 00000000..72781e38
--- /dev/null
+++ b/BKULocal/src/main/webapp/help.jsp
@@ -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.
+-->
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%@ page import="java.util.Locale"%>
+<%
+  String pathInfo[] = (request.getPathInfo() != null) ? request
+      .getPathInfo().split("/") : new String[] {};
+  String language = pathInfo[1].split("_")[0];
+  String filename = pathInfo[2];
+  String path = "/helpfiles/" + language.toLowerCase() + "/" + filename;
+  System.out.println(path);
+%>
+
+<jsp:include page="<%=path%>" flush="true"/>
diff --git a/BKULocal/src/main/webapp/helpfiles/de/error.card.locked.html b/BKULocal/src/main/webapp/helpfiles/de/error.card.locked.html
new file mode 100644
index 00000000..c72ae275
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/de/error.card.locked.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/error.card.locked.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Fehler: Bürgerkarte ist gesperrt</h1>
+    <p>Die Bürgerkartenfunktion auf der gesteckten Chipkarte ist gesperrt. Es stehen keine weiteren Versuche zur Eingabe einer PIN zur Verfügung, da zu oft eine falsche PIN eingegeben wurde.</p>
+    <p>Bitte wenden sie sich an den Aussteller der Karte.</p>
+<ul>
+   	  <li><strong>e-card</strong> <br />
+   	    Chipkarte der <a href="http://www.sozialversicherung.at">Österreichischen Sozialversicherung</a></li>
+            <li><strong>a-sign premium</strong> <br />
+            Chipkarte der <a href="http://www.a-trust.at">A-Trust GmbH</a> bzw. diverse andere Chipkarten mit der Aufschrift 'a-sign premium'.</li>
+    </ul>
+    <p><br class="clearfloat" /></p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKULocal/src/main/webapp/helpfiles/de/error.card.locked.png b/BKULocal/src/main/webapp/helpfiles/de/error.card.locked.png
new file mode 100644
index 00000000..ed0c7eb1
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/error.card.locked.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/de/error.card.notactivated.html b/BKULocal/src/main/webapp/helpfiles/de/error.card.notactivated.html
new file mode 100644
index 00000000..a464cf17
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/de/error.card.notactivated.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/error.card.notactivated.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Fehler: Bürgerkartenfunktion ist nicht aktiviert.</h1>
+    <p>Die im Kartenleser gesteckte Chipkarte wird unterstützt, jedoch ist die Bürgerkartenfunktion auf der Chipkarte noch nicht aktiviert.</p> 
+    <p>Um die gesteckte Chipkarte als Bürgerkarte verwenden zu können, 
+      muss zuerst die 
+    Bürgerkartenfunktion aktiviert werden. Für Informationen dazu siehe <a href="http://www.buergerkarte.at/de/aktivieren/">Aktivierung der Bürgerkartenfunktion</a> auf <a href="http://www.buergerkarte.at">www.buergerkarte.at</a>.</p>
+    <p><br class="clearfloat" />
+    </p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKULocal/src/main/webapp/helpfiles/de/error.card.notactivated.png b/BKULocal/src/main/webapp/helpfiles/de/error.card.notactivated.png
new file mode 100644
index 00000000..dd48f92b
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/error.card.notactivated.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/de/error.cardterminal.html b/BKULocal/src/main/webapp/helpfiles/de/error.cardterminal.html
new file mode 100644
index 00000000..c93bba48
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/de/error.cardterminal.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/error.cardterminal.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Fehler: Es konnte kein Kartenleser gefunden werden.</h1>
+    <p>Für den Zugriff auf die Bürgerkarte ist ein Chipkartenleser erforderlich. Es werden grundsätzlich alle Kartenleser unterstützt, die über die PC/SC-Schnittstelle angesprochen werden können und im Betriebssystem erfolgreich installiert wurden. Es können mehrere unterstützte Kartenleser gleichzeitig angeschlossen werden.</p>
+    <p>Kartenleser die, die nicht über die PC/SC-Schnittstelle angesprochen werden können (z.B. Kartenleser für die nur CT-API-Treiber verfügbar sind) werden nicht unterstützt.</p>
+    
+    <p><br class="clearfloat" />
+    </p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKULocal/src/main/webapp/helpfiles/de/error.cardterminal.png b/BKULocal/src/main/webapp/helpfiles/de/error.cardterminal.png
new file mode 100644
index 00000000..4276347d
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/error.cardterminal.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/de/error.pcsc.html b/BKULocal/src/main/webapp/helpfiles/de/error.pcsc.html
new file mode 100644
index 00000000..44129e40
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/de/error.pcsc.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/error.pcsc.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Fehler: Es konnte keine PC/SC-Schnittstelle gefunden werden</h1>
+    <p>Die Software für den Zugriff auf die Bürgerkarte konnte keine PC/SC-Schnittstelle für den Zugriff auf Kartenleser erkennen. Das Betriebssystem scheint keine PC/SC-Schnittstelle zur Verfügung zu stellen.</p>
+    <p>Unter Betriebssystemen die PCSC-Lite verwenden (Linux u.a.) tritt dieses Problem auch auf, wenn kein Kartenleser angeschlossen ist und daher der entsprechende Dienst nicht gestartet wurde oder wenn die entsprechende Bibliothek nicht zur Verfügung steht (<a href="http://java.sun.com/javase/6/docs/technotes/guides/security/SunProviders.html#SunPCSCProvider">weitere Informationen</a>).<br class="clearfloat" />
+    </p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKULocal/src/main/webapp/helpfiles/de/error.pcsc.png b/BKULocal/src/main/webapp/helpfiles/de/error.pcsc.png
new file mode 100644
index 00000000..94940733
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/error.pcsc.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/de/error.ws.unreachable.html b/BKULocal/src/main/webapp/helpfiles/de/error.ws.unreachable.html
new file mode 100644
index 00000000..c0f2c762
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/de/error.ws.unreachable.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/error.ws.unreachable.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Fehler: Der Server ist nicht erreichbar</h1>
+    <p>Die Software zum Zugriff auf die Bürgerkarte konnte den Server nicht erreichen. Möglicherweise besteht derzeit ein Problem mit dem Dienst. Probieren Sie es daher zu einem späteren Zeitpunkt nochmal. Sollte das Problem dauerhaft bestehen, wenden Sie sich bitte an den Betreiber der Anwendung.</p>
+    <p><br class="clearfloat" /></p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKULocal/src/main/webapp/helpfiles/de/error.ws.unreachable.png b/BKULocal/src/main/webapp/helpfiles/de/error.ws.unreachable.png
new file mode 100644
index 00000000..2570a01f
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/error.ws.unreachable.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.cardnotsupported.html b/BKULocal/src/main/webapp/helpfiles/de/help.cardnotsupported.html
new file mode 100644
index 00000000..c647bf72
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/de/help.cardnotsupported.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/help.cardnotsupported.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Die Karte wird nicht unterstützt</h1>
+    <p>Die im Kartenleser gesteckte Chipkarte wird nicht unterstützt.</p>
+    <p>Bitte stecken Sie eine unterstützte Chipkarte (Bürgerkarte) in den Kartenleser. Derzeit werden die folgenden Chipkarten unterstützt:</p>
+   	<ul>
+       	<li><strong>e-card</strong> <br />
+   	    Chipkarte der <a href="http://www.sozialversicherung.at">Österreichischen Sozialversicherung</a></li>
+            <li><strong>a-sign premium</strong> <br />
+            Chipkarte der <a href="http://www.a-trust.at">A-Trust GmbH</a> bzw. diverse andere Chipkarten mit der Aufschrift 'a-sign premium'.</li>
+    </ul>
+    <p>Sind mehrere unterstützte Kartenleser angeschlossen, stecken sie eine unterstützte Chipkarte (Bürgerkarte) in einen der angeschlossenen Kartenleser. Wird die Chipkarte erkannt wechselt die Bildschirmanzeige. Wird die Chipkarte nicht erkannt, wird der Kartenleser möglicherweise nicht unterstützt. Stecken Sie die Chipkarte daher in einen anderen Kartenleser.</p>
+    <p><br class="clearfloat" /></p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.cardnotsupported.png b/BKULocal/src/main/webapp/helpfiles/de/help.cardnotsupported.png
new file mode 100644
index 00000000..23f6e2af
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/help.cardnotsupported.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.cardpin.html b/BKULocal/src/main/webapp/helpfiles/de/help.cardpin.html
new file mode 100644
index 00000000..dc678fd0
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/de/help.cardpin.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/help.cardpin1.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><img src="../../helpfiles/de/help.cardpin2.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Lesen von Informationen von der Chipkarte</h1>
+    <p>Sie werden aufgefordert ihre Karten-PIN bzw. Infobox-PIN (abhängig von der verwendeten Bürgerkarte) einzugeben um das Auslesen von Informationen zur  Identifikation (Personenbindung) bzw. Vollmachten zu ermöglichen.</p>    
+    <p><a href="http://www.buergerkarte.at/de/datenschutz-sicherheit/">Details</a> zu den auf der Bürgerkarte gespeicherten Informationen finden sie auf <a href="http://www.buergerkarte.at">www.buergerkarte.at</a>.</p>
+    <p><br class="clearfloat" /></p>
+    </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.cardpin1.png b/BKULocal/src/main/webapp/helpfiles/de/help.cardpin1.png
new file mode 100644
index 00000000..4e1c2de8
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/help.cardpin1.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.cardpin2.png b/BKULocal/src/main/webapp/helpfiles/de/help.cardpin2.png
new file mode 100644
index 00000000..cc5e599e
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/help.cardpin2.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.hashdataviewer.html b/BKULocal/src/main/webapp/helpfiles/de/help.hashdataviewer.html
new file mode 100644
index 00000000..f7cf15df
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/de/help.hashdataviewer.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/help.hashdataviewer.png" alt="Bildschirmfoto des Applets" height="130" width="150"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Anzeige der Signaturdaten </h1>
+    <p>Dieses Fenster zeigt die zu signierenden Daten an. Dies k&ouml;nnen entweder reine Textdaten oder XHTML sein. Im Falle von XHML erhalten Sie den Hinweis, dass es sich bei den dargestellten Daten nur um eine Voransicht handelt. Um die Daten standardkonform darzustellen, m&uuml;ssen diese abgespeichert und mit einem geeigneten XHTML Betrachter ge&ouml;ffnen werden.</p>
+    <p>In jedem Fall k&ouml;nnen die zu signierenden abgespeichert werden.</p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.hashdataviewer.png b/BKULocal/src/main/webapp/helpfiles/de/help.hashdataviewer.png
new file mode 100644
index 00000000..83004322
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/help.hashdataviewer.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.insertcard.html b/BKULocal/src/main/webapp/helpfiles/de/help.insertcard.html
new file mode 100644
index 00000000..0bfc6230
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/de/help.insertcard.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/help.insertcard.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Bitte die Bürgerkarte in den Kartenleser stecken</h1>
+    <p>Die Software für den Zugriff auf die Bürgerkarte hat einen oder mehrere unterstützte Kartenleser gefunden.</p>
+    <p>Bitte stecken Sie nun ihre Bürgerkarte in den Kartenleser. Wird die Karte erkannt, welchselt die Bildschirmanzeige.</p>
+    <p>Sollten Sie mehrere Kartenleser angeschlossen haben, wählen Sie einen beliebigen aus. Wird die Karte im ausgewählten Kartenleser nicht erkannt, wird dieser Kartenleser eventuell nicht unterstützt. Probieren Sie es daher in einem anderen Kartenleser nochmal.
+    </p>
+    <p><br class="clearfloat" /></p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.insertcard.png b/BKULocal/src/main/webapp/helpfiles/de/help.insertcard.png
new file mode 100644
index 00000000..9930fcb4
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/help.insertcard.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.retry.html b/BKULocal/src/main/webapp/helpfiles/de/help.retry.html
new file mode 100644
index 00000000..110d761f
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/de/help.retry.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/help.retry.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Falsche PIN</h1>
+    <p>Die eingegebene PIN war falsch. Bitte geben Sie die korrekte PIN ein.</p> 
+    <p>Die Anzahl der noch möglichen  Versuche wird angezeigt.</p>
+    <p><br class="clearfloat" /></p>
+    </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.retry.png b/BKULocal/src/main/webapp/helpfiles/de/help.retry.png
new file mode 100644
index 00000000..4cab2430
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/help.retry.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.signpin-1.png b/BKULocal/src/main/webapp/helpfiles/de/help.signpin-1.png
new file mode 100644
index 00000000..1c5c8570
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/help.signpin-1.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.signpin.html b/BKULocal/src/main/webapp/helpfiles/de/help.signpin.html
new file mode 100644
index 00000000..9ff79f3b
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/de/help.signpin.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/help.signpin.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Erstellen einer elektronischen Signatur</h1>
+    <p>Sie werden aufgefordert die  Signatur-PIN einzugeben, um eine elektronische Signatur zu erstellen.</p>
+    <p style="text-align: center"><img src="../../helpfiles/de/help.signpin-1.png" alt="Bildschirmfoto" width="278" height="146" /></p>
+    <ol>
+      <li>Klicken Sie auf 'Signaturdaten anzeigen' um die zu signierenden Daten anzuzeigen.</li>
+      <li>Geben Sie im Formularfeld die Signatur-PIN ein.</li>
+      <li>Klicken Sie auf die Schaltfläche 'Signieren' um die elektronische Signatur zu erstellen.</li>
+    </ol>
+    <p><br class="clearfloat" /></p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.signpin.png b/BKULocal/src/main/webapp/helpfiles/de/help.signpin.png
new file mode 100644
index 00000000..6ffbf8df
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/help.signpin.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.wait.html b/BKULocal/src/main/webapp/helpfiles/de/help.wait.html
new file mode 100644
index 00000000..ed3db1b8
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/de/help.wait.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/help.wait.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Bitte warten ...</h1>
+    <p>Die Software für den Zugriff auf die Bürgerkarte ist damit beschäftigt, einen Befehl auszuführen bzw. auf einen neuen Befehl vom Server zu warten.    </p>
+    <p><br class="clearfloat" /></p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.wait.png b/BKULocal/src/main/webapp/helpfiles/de/help.wait.png
new file mode 100644
index 00000000..812da0bd
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/help.wait.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.welcome.html b/BKULocal/src/main/webapp/helpfiles/de/help.welcome.html
new file mode 100644
index 00000000..9796a206
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/de/help.welcome.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/help.welcome.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Willkommen </h1>
+    <p>Die Anzeige &quot;Willkommen&quot; erfolgt unmittelbar nachdem die Software für den Zugriff auf die Bürgerkarte erfolgreich im Browser geladen wurde.</p>
+    <p>Die Software versucht nun eine Verbindung mit dem Server aufzunehmen um Befehle für den Zugriff auf die Bürgerkarte zu erhalten.</p>
+    <p><br class="clearfloat" /></p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKULocal/src/main/webapp/helpfiles/de/help.welcome.png b/BKULocal/src/main/webapp/helpfiles/de/help.welcome.png
new file mode 100644
index 00000000..0be05a78
Binary files /dev/null and b/BKULocal/src/main/webapp/helpfiles/de/help.welcome.png differ
diff --git a/BKULocal/src/main/webapp/helpfiles/help.css b/BKULocal/src/main/webapp/helpfiles/help.css
new file mode 100644
index 00000000..28f9767b
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/help.css
@@ -0,0 +1,81 @@
+@charset "UTF-8";
+body  {
+	font: 100% Verdana, Arial, Helvetica, sans-serif;
+	background: #666666;
+	margin: 0; /* it's good practice to zero the margin and padding of the body element to account for differing browser defaults */
+	padding: 0;
+	text-align: center; /* this centers the container in IE 5* browsers. The text is then set to the left aligned default in the #container selector */
+	color: #000000;
+}
+
+/* Tips for Elastic layouts 
+1. Since the elastic layouts overall sizing is based on the user's default fonts size, they are more unpredictable. Used correctly, they are also more accessible for those that need larger fonts size since the line length remains proportionate.
+2. Sizing of divs in this layout are based on the 100% font size in the body element. If you decrease the text size overall by using a font-size: 80% on the body element or the #container, remember that the entire layout will downsize proportionately. You may want to increase the widths of the various divs to compensate for this.
+3. If font sizing is changed in differing amounts on each div instead of on the overall design (ie: #sidebar1 is given a 70% font size and #mainContent is given an 85% font size), this will proportionately change each of the divs overall size. You may want to adjust based on your final font sizing.
+*/
+.twoColElsLtHdr #container { 
+	width: 46em;  /* this width will create a container that will fit in an 800px browser window if text is left at browser default font sizes */
+	background: #FFFFFF;
+	margin: 0 auto; /* the auto margins (in conjunction with a width) center the page */
+	border: 1px solid #000000;
+	text-align: left; /* this overrides the text-align: center on the body element. */
+} 
+.twoColElsLtHdr #header { 
+	background: #DDDDDD; 
+	padding: 0 10px;  /* this padding matches the left alignment of the elements in the divs that appear beneath it. If an image is used in the #header instead of text, you may want to remove the padding. */
+} 
+.twoColElsLtHdr #header h1 {
+	margin: 0; /* zeroing the margin of the last element in the #header div will avoid margin collapse - an unexplainable space between divs. If the div has a border around it, this is not necessary as that also avoids the margin collapse */
+	padding: 10px 0; /* using padding instead of margin will allow you to keep the element away from the edges of the div */
+}
+
+/* Tips for sidebar1:
+1. Be aware that if you set a font-size value on this div, the overall width of the div will be adjusted accordingly.
+2. Since we are working in ems, it's best not to use padding on the sidebar itself. It will be added to the width for standards compliant browsers creating an unknown actual width. 
+3. Space between the side of the div and the elements within it can be created by placing a left and right margin on those elements as seen in the ".twoColElsLtHdr #sidebar1 p" rule.
+*/
+.twoColElsLtHdr #sidebar1 {
+	float: left;
+	width: 210px;
+	padding: 15px 0; /* top and bottom padding create visual space within this div */
+	background-color: #FFFFFF;
+}
+.twoColElsLtHdr #sidebar1 h3, .twoColElsLtHdr #sidebar1 p {
+	margin-left: 10px; /* the left and right margin should be given to every element that will be placed in the side columns */
+	margin-right: 10px;
+}
+
+/* Tips for mainContent:
+1. If you give this #mainContent div a font-size value different than the #sidebar1 div, the margins of the #mainContent div will be based on its font-size and the width of the #sidebar1 div will be based on its font-size. You may wish to adjust the values of these divs.
+2. The space between the mainContent and sidebar1 is created with the left margin on the mainContent div.  No matter how much content the sidebar1 div contains, the column space will remain. You can remove this left margin if you want the #mainContent div's text to fill the #sidebar1 space when the content in #sidebar1 ends.
+3. To avoid float drop, you may need to test to determine the approximate maximum image/element size since this layout is based on the user's font sizing combined with the values you set. However, if the user has their browser font size set lower than normal, less space will be available in the #mainContent div than you may see on testing.
+4. In the Internet Explorer Conditional Comment below, the zoom property is used to give the mainContent "hasLayout." This avoids several IE-specific bugs that may occur.
+*/
+.twoColElsLtHdr #mainContent {
+	margin: 0 1.5em 0 15em; /* the right margin can be given in ems or pixels. It creates the space down the right side of the page. */
+	padding: 0 10px;
+} 
+.twoColElsLtHdr #footer { 
+	padding: 0 10px; /* this padding matches the left alignment of the elements in the divs that appear above it. */
+	background:#DDDDDD;
+} 
+.twoColElsLtHdr #footer p {
+	margin: 0; /* zeroing the margins of the first element in the footer will avoid the possibility of margin collapse - a space between divs */
+	padding: 10px 0; /* padding on this element will create space, just as the the margin would have, without the margin collapse issue */
+}
+
+/* Miscellaneous classes for reuse */
+.fltrt { /* this class can be used to float an element right in your page. The floated element must precede the element it should be next to on the page. */
+	float: right;
+	margin-left: 8px;
+}
+.fltlft { /* this class can be used to float an element left in your page */
+	float: left;
+	margin-right: 8px;
+}
+.clearfloat { /* this class should be placed on a div or break element and should be the final element before the close of a container that should fully contain a float */
+	clear:both;
+    height:0;
+    font-size: 1px;
+    line-height: 0px;
+}
\ No newline at end of file
diff --git a/BKULocal/src/main/webapp/helpfiles/index.html b/BKULocal/src/main/webapp/helpfiles/index.html
new file mode 100644
index 00000000..49aaed66
--- /dev/null
+++ b/BKULocal/src/main/webapp/helpfiles/index.html
@@ -0,0 +1,17 @@
+<!-- 
+    Document   : index
+    Created on : 05.11.2008, 14:09:23
+    Author     : Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  </head>
+  <body>
+  
+  <h2>Default help page if no help item is provided</h2>
+  
+  </body>
+</html>
diff --git a/BKUOnline/src/main/webapp/img/BackgroundChipperling.png b/BKUOnline/src/main/webapp/img/BackgroundChipperling.png
new file mode 100644
index 00000000..5097aa6b
Binary files /dev/null and b/BKUOnline/src/main/webapp/img/BackgroundChipperling.png differ
diff --git a/BKUOnline/src/main/webapp/img/BackgroundMocca.png b/BKUOnline/src/main/webapp/img/BackgroundMocca.png
new file mode 100644
index 00000000..349d9ff0
Binary files /dev/null and b/BKUOnline/src/main/webapp/img/BackgroundMocca.png differ
-- 
cgit v1.2.3


From e77343708ec9b74aed7256d72982e4fce4be80d8 Mon Sep 17 00:00:00 2001
From: wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Sat, 15 Nov 2008 10:34:45 +0000
Subject: Release 1.0

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@175 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml                        | 14 +++++++-------
 BKUCommonGUI/pom.xml                     |  8 ++++----
 BKULocal/pom.xml                         | 14 +++++++-------
 BKUOnline/pom.xml                        | 14 +++++++-------
 BKUOnline/src/main/webapp/appletPage.jsp |  2 +-
 BKUViewer/pom.xml                        |  6 +++---
 STAL/pom.xml                             |  4 ++--
 STALService/pom.xml                      |  6 +++---
 bkucommon/pom.xml                        |  8 ++++----
 pom.xml                                  |  2 +-
 smcc/pom.xml                             |  4 ++--
 smccSTAL/pom.xml                         | 10 +++++-----
 utils/pom.xml                            |  4 ++--
 13 files changed, 48 insertions(+), 48 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index a20a613d..eaaa5820 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -3,13 +3,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
   <build>
     <plugins>
       <plugin>
@@ -116,27 +116,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 8c08ba6e..1aea89f6 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -3,23 +3,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 03a6a10b..36503ca0 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0-SNAPSHOT</version>
+		<version>1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
@@ -57,22 +57,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -97,12 +97,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>1.0</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 5cdf5356..a1d92390 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -4,14 +4,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0-SNAPSHOT</version>
+		<version>1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUOnline</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Online</name>
-	<version>1.0-SNAPSHOT</version>
+	<version>1.0</version>
 
 	<pluginRepositories>
 		<pluginRepository>
@@ -25,12 +25,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>1.0</version>
 		</dependency>
 		<dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -55,14 +55,14 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALService</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>1.0</version>
 			<scope>compile</scope>
 		</dependency>
         <!-- build BKUApplet prior to BKUOnline -->
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>BKUApplet</artifactId> 
-          <version>1.0-SNAPSHOT</version>
+          <version>1.0</version>
           <scope>provided</scope> 
         </dependency>
 		<!--
@@ -105,7 +105,7 @@
 								<artifactItem>
 									<groupId>at.gv.egiz</groupId>
 									<artifactId>BKUApplet</artifactId>
-									<version>1.0-SNAPSHOT</version>
+									<version>1.0</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>commons-logging</groupId>
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp
index 51ab0006..2dbd729c 100644
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ b/BKUOnline/src/main/webapp/appletPage.jsp
@@ -45,7 +45,7 @@
 		var attributes = {
 			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',
+			archive :'BKUApplet-1.0.jar, commons-logging-1.1.1.jar, iaik_jce_me4se-3.04.jar',
 			width : <%=width%>,
 			height :<%=height%>
 		};
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index cf873f33..55c18ac2 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -3,19 +3,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0-SNAPSHOT</version>
+		<version>1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0-SNAPSHOT</version>
+	<version>1.0</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 6b49ed47..3d91dcc7 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index db126b3c..f6f8649d 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -4,19 +4,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index a90aebf5..60c31a02 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -4,24 +4,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0-SNAPSHOT</version>
+		<version>1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0-SNAPSHOT</version>
+	<version>1.0</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 2e42e750..2797e2c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0-SNAPSHOT</version>
+	<version>1.0</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 5b5c2256..110635c7 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
   <url>http://bku.egiz.gv.at</url>
   <dependencies>
     <dependency>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index a053b419..d4a523b1 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -4,28 +4,28 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index d6b58234..b980470d 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -4,14 +4,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0-SNAPSHOT</version>
+		<version>1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0-SNAPSHOT</version>
+	<version>1.0</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 28e81afd92a6568ff78736b72c5257a86c0b9b91 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 18 Nov 2008 08:03:35 +0000
Subject: GUI refactoring 1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@177 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../gv/egiz/bku/online/applet/AppletBKUWorker.java |   13 +-
 .../bku/online/applet/AppletHashDataDisplay.java   |   24 +-
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |    6 +-
 BKUApplet/src/test/resources/appletTest.html       |    3 +-
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   |    6 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |    6 +-
 .../java/at/gv/egiz/bku/gui/BKUGUIFactory.java     |   25 +-
 .../at/gv/egiz/bku/gui/DefaultHelpListener.java    |   37 +-
 .../java/at/gv/egiz/bku/gui/HashDataViewer.java    |    6 -
 .../main/java/at/gv/egiz/bku/gui/HelpViewer.java   |    2 +-
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    | 1165 +++++++++++---------
 .../at/gv/egiz/bku/gui/Messages.properties         |    2 +-
 .../at/gv/egiz/bku/gui/Messages_en.properties      |    2 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUITest.java   |    5 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |  110 +-
 .../at/gv/egiz/bku/local/stal/BKUGuiProxy.java     |   12 +-
 .../bku/local/stal/LocalSignRequestHandler.java    |    2 +-
 .../at/gv/egiz/bku/local/stal/SMCCSTALFactory.java |    7 +-
 BKUOnline/src/main/webapp/HTTP-ohne.html           |    2 +-
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   |   81 --
 20 files changed, 793 insertions(+), 723 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
index f862360b..b2f9f89c 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
@@ -192,18 +192,19 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
 
   private void registerSignRequestHandler() throws MalformedURLException {
     String hashDataDisplayStyle = params.getAppletParameter(BKUApplet.HASHDATA_DISPLAY);
-    if (BKUApplet.HASHDATA_DISPLAY_INTERNAL.equals(hashDataDisplayStyle)) {
-      log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
-      AppletHashDataDisplay handler = new AppletHashDataDisplay(stalPort, sessionId, AppletHashDataDisplay.DISPLAY.applet);
-      addRequestHandler(SignRequest.class, handler);
-    } else if (BKUApplet.HASHDATA_DISPLAY_BROWSER.equals(hashDataDisplayStyle)) {
+//    if (BKUApplet.HASHDATA_DISPLAY_INTERNAL.equals(hashDataDisplayStyle)) {
+//      log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
+//      AppletHashDataDisplay handler = new AppletHashDataDisplay(stalPort, sessionId, AppletHashDataDisplay.DISPLAY.applet);
+//      addRequestHandler(SignRequest.class, handler);
+//    } else 
+    if (BKUApplet.HASHDATA_DISPLAY_BROWSER.equals(hashDataDisplayStyle)) {
       URL hashDataURL = params.getURLParameter(BKUApplet.HASHDATA_URL, sessionId);
       log.debug("register SignRequestHandler for HashDataURL " + hashDataURL);
       addRequestHandler(SignRequest.class, new BrowserHashDataDisplay(ctx, hashDataURL));
     } else {
       //BKUApplet.HASHDATA_DISPLAY_FRAME
       log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
-      AppletHashDataDisplay handler = new AppletHashDataDisplay(stalPort, sessionId, AppletHashDataDisplay.DISPLAY.frame);
+      AppletHashDataDisplay handler = new AppletHashDataDisplay(stalPort, sessionId);
       addRequestHandler(SignRequest.class, handler);
     }
   }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
index 29a60f1d..ba502906 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
@@ -50,33 +50,32 @@ import java.security.NoSuchAlgorithmException;
  */
 public class AppletHashDataDisplay extends SignRequestHandler {
 
-  public static enum DISPLAY {
-    applet, frame
-  }
   private static final Log log = LogFactory.getLog(AppletHashDataDisplay.class);
   protected STALPortType stalPort;
   protected String sessId;
-  protected DISPLAY display;
 
-  public AppletHashDataDisplay(STALPortType stalPort, String sessId, DISPLAY display) {
+  public AppletHashDataDisplay(STALPortType stalPort, String sessId) {
     if (stalPort == null || sessId == null) {
       throw new NullPointerException("STAL port must not be null");
     }
     this.sessId = sessId;
     this.stalPort = stalPort;
-    this.display = display;
   }
 
+  /**
+   * TODO don't throw exceptions
+   * @param signedReferences
+   * @throws java.security.DigestException
+   * @throws java.lang.Exception
+   */
   @Override
   public void displayHashDataInputs(List<ReferenceType> signedReferences) throws DigestException, Exception {
 
     List<GetHashDataInputResponseType.Reference> hdi = getHashDataInput(signedReferences);
     List<HashDataInput> verifiedHashDataInputs = verifyHashDataInput(signedReferences, hdi);
 
-    if (verifiedHashDataInputs.size() > 1) {
-      gui.showHashDataInputDialog(verifiedHashDataInputs, false, this, "ok");
-    } else if (verifiedHashDataInputs.size() == 1) {
-      gui.showHashDataInputDialog(verifiedHashDataInputs, display==DISPLAY.frame, this, "ok");
+    if (verifiedHashDataInputs.size() > 0) {
+      gui.showHashDataInputDialog(verifiedHashDataInputs, this, "ok");
     } else {
       throw new Exception("No signature data (apart from any QualifyingProperties or a Manifest)");
     }
@@ -111,6 +110,11 @@ public class AppletHashDataDisplay extends SignRequestHandler {
         }
       }
     }
+    
+    if (request.getReference().size() < 1) {
+      log.error("No signature data (apart from any QualifyingProperties or a Manifest) for session " + sessId);
+      throw new Exception("No signature data (apart from any QualifyingProperties or a Manifest)");
+    }
 
     if (log.isDebugEnabled()) {
       log.debug("WebService call GetHashDataInput for " + request.getReference().size() + " references in session " + sessId);
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 7963768e..5b45c8e1 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -53,7 +53,7 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
   public static final String BACKGROUND_PARAM = "Background";
   public static final String REDIRECT_URL = "RedirectURL";
   public static final String REDIRECT_TARGET = "RedirectTarget";
-  public static final String HASHDATA_DISPLAY_INTERNAL = "internal";
+//  public static final String HASHDATA_DISPLAY_INTERNAL = "internal";
   public static final String HASHDATA_DISPLAY_BROWSER = "browser";
   public static final String HASHDATA_DISPLAY_FRAME = "frame";
   
@@ -106,8 +106,8 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
     }
     log.debug("setting locale to " + getLocale());
 
-    BKUGUIFacade gui = BKUGUIFactory.createGUI(guiStyle);
-    gui.init(getContentPane(), getLocale(), backgroundImgURL, helpListener);
+    BKUGUIFacade gui = BKUGUIFactory.createGUI(getContentPane(), getLocale(), guiStyle, backgroundImgURL, helpListener);
+//    gui.init(getContentPane(), getLocale(), BKUGUIFacade.Style.advanced, backgroundImgURL, helpListener);
 
     worker = new AppletBKUWorker(gui, getAppletContext(), this);
   }
diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
index eaf6376d..8204d0eb 100644
--- a/BKUApplet/src/test/resources/appletTest.html
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -21,7 +21,8 @@
               archive="../BKUApplet-1.0-SNAPSHOT.jar, ../test-libs/commons-logging-1.1.1.jar , ../test-libs/iaik_jce_me4se-3.04.jar"
               width=300 height=200>
               <param name="GuiStyle" value="simple"/>
-              <param name="Background" value="http://localhost:3495/img/BackgroundMocca.png"/>
+              <!--param name="Background" value="jar:file:/home/clemens/workspace/mocca/BKUApplet/target/BKUApplet-1.0-SNAPSHOT.jar!/images/help.png"/-->
+              <param name="Background" value="http://localhost:3495/img/BackgroundChipperling.png"/>
               <param name="WSDL_URL" value="http://localhost:3495/stal?wsdl"/>
               <param name="HelpURL" value="http://apps.egiz.gv.at/bkuonline/help/"/>
               <param name="HashDataDisplay" value="frame"/>
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 d661c71a..f68f2ece 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
@@ -87,8 +87,8 @@ public class BKUGUI implements BKUGUIFacade {
      * @param contentPane
      * @param localeString may be null
      */
-    @Override
-    public void init(final Container contentPane, Locale locale, final URL background, ActionListener helpListener) {
+//    @Override
+    public void init(final Container contentPane, Locale locale, Style guiStyle, final URL background, ActionListener helpListener) {
 
         if (locale != null) {
             messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, locale);
@@ -814,7 +814,7 @@ public class BKUGUI implements BKUGUIFacade {
     }
     
     @Override
-    public void showHashDataInputDialog(final List<HashDataInput> signedReferences, boolean standalone, final ActionListener okListener, final String okCommand) {
+    public void showHashDataInputDialog(final List<HashDataInput> signedReferences, final ActionListener okListener, final String okCommand) {
       
       if (signedReferences == null) {
         showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {"No SignedReferences provided"}, okListener, okCommand);
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 87982c79..2dbba730 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -91,7 +91,9 @@ public interface BKUGUIFacade {
   public static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
   public static final String ALT_HELP = "alt.help";
 
-  public void init(Container contentPane, Locale locale, URL background, ActionListener helpListener);
+  public enum Style { simple, advanced };
+    
+//  public void init(Container contentPane, Locale locale, Style guiStyle, URL background, ActionListener helpListener);
 
   /**
    * 
@@ -128,7 +130,7 @@ public interface BKUGUIFacade {
    * @param okListener
    * @param okCommand
    */
-  public void showHashDataInputDialog(List<HashDataInput> signedReferences, boolean externalDisplay, ActionListener okListener, String okCommand);
+  public void showHashDataInputDialog(List<HashDataInput> signedReferences, ActionListener okListener, String okCommand);
 
   /**
    * TODO pull out from BKUGUIFacade. (or make this strictly an applet internal version)
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
index 87676026..f4981614 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
@@ -17,24 +17,29 @@
 
 package at.gv.egiz.bku.gui;
 
+import java.awt.Container;
+import java.awt.event.ActionListener;
+import java.net.URL;
+import java.util.Locale;
+
 public class BKUGUIFactory {
   
   public static final String SIMPLE_GUI = "simple";
   public static final String ADVANCED_GUI = "advanced";
   
-  private static BKUGUIFactory instance = new BKUGUIFactory();
+//  private static BKUGUIFactory instance = new BKUGUIFactory();
 
-  private BKUGUIFactory() {
-  }
+//  private BKUGUIFactory() {
+//  }
+//
+//  protected BKUGUIFacade createNewGUI(Container contentPane, Locale locale, String style, URL background, ActionListener helpListener) {
+//    
+//  }
 
-  protected BKUGUIFacade createNewGUI(String style) {
+  public static BKUGUIFacade createGUI(Container contentPane, Locale locale, String style, URL background, ActionListener helpListener) {
     if (ADVANCED_GUI.equals(style)) {
-      return new BKUGUI();
+      return new SimpleGUI(contentPane, locale, BKUGUIFacade.Style.advanced, background, helpListener);
     }
-    return new SimpleGUI();
-  }
-
-  public static BKUGUIFacade createGUI(String style) {
-    return instance.createNewGUI(style);
+    return new SimpleGUI(contentPane, locale, BKUGUIFacade.Style.simple, background, helpListener);
   }
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
index ba968a48..f03bf158 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
@@ -17,6 +17,7 @@
 package at.gv.egiz.bku.gui;
 
 import java.applet.AppletContext;
+import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.Locale;
 import javax.swing.SwingUtilities;
@@ -29,34 +30,56 @@ public class DefaultHelpListener extends AbstractHelpListener {
 
   protected AppletContext ctx;
 
+  /**
+   * 
+   * @param ctx open external links via applet context
+   * @param helpURL
+   * @param locale
+   */
   public DefaultHelpListener(AppletContext ctx, URL helpURL, Locale locale) {
     super(helpURL, locale);
     this.ctx = ctx;
   }
 
+  /**
+   * external links in help document are not opened
+   * @param helpURL
+   * @param locale
+   */
   public DefaultHelpListener(URL helpURL, Locale locale) {
     super(helpURL, locale);
     this.ctx = null;
   }
 
+  /**
+   * blocks until help viewer returns (is closed)
+   * @param helpURL
+   * @param helpTopic
+   */
   @Override
-  public void showDocument(final URL helpURL, final String helpTopic) throws Exception {
-    log.debug("schedule help dialog");
-    
-    SwingUtilities.invokeLater(new Runnable() {
+  public void showDocument(final URL helpURL, final String helpTopic)  { 
+//    try {
+      log.debug("schedule help dialog");
+
+//      SwingUtilities.invokeAndWait(new Runnable() {
+      SwingUtilities.invokeLater(new Runnable() {
 
         @Override
         public void run() {
-          
+
           log.debug("show help dialog");
-          
+
           if (ctx == null) {
             HelpViewer.showHelpDialog(helpURL, helpTopic, messages);
-      
           } else {
             HelpViewer.showHelpDialog(ctx, helpURL, helpTopic, messages);
           }
         }
       });
+//    } catch (InterruptedException ex) {
+//      log.error("Failed to display HelpViewer: " + ex.getMessage(), ex);
+//    } catch (InvocationTargetException ex) {
+//      log.error("Failed to display HelpViewer: " + ex.getMessage(), ex);
+//    }
   }
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
index 31887bde..7b77faeb 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
@@ -16,7 +16,6 @@
  */
 package at.gv.egiz.bku.gui;
 
-import at.gv.egiz.bku.gui.html.RestrictedHTMLEditorKit;
 import at.gv.egiz.stal.HashDataInput;
 import java.awt.Component;
 import java.awt.Container;
@@ -49,11 +48,6 @@ import javax.swing.JScrollPane;
 import javax.swing.LayoutStyle;
 import javax.swing.text.Document;
 import javax.swing.text.EditorKit;
-import javax.swing.text.Element;
-import javax.swing.text.ViewFactory;
-import javax.swing.text.html.HTML;
-import javax.swing.text.html.HTMLEditorKit;
-import javax.swing.text.html.ImageView;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
index 173254e7..0fef3f75 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
@@ -105,7 +105,7 @@ public class HelpViewer extends JDialog
     JPanel helpPanel = createViewerPanel(viewerLabel, helpURL);
     JPanel buttonPanel = createButtonPanel();
 
-    initContentPane(new Dimension(600, 400), helpPanel, buttonPanel);
+    initContentPane(new Dimension(600, 600), helpPanel, buttonPanel);
     pack();
     if (frame != null) {
       setLocationRelativeTo(frame);
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
index bb568b75..d4d6efef 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
@@ -32,6 +32,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.text.MessageFormat;
 import java.util.List;
@@ -40,7 +41,6 @@ import java.util.ResourceBundle;
 import javax.swing.GroupLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
-import javax.swing.JCheckBox;
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -51,7 +51,6 @@ import javax.swing.JTable;
 import javax.swing.JTextArea;
 import javax.swing.LayoutStyle;
 import javax.swing.SwingUtilities;
-import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -69,38 +68,60 @@ public class SimpleGUI 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;
     protected JLabel helpLabel;
     /** remember the pinfield to return to worker */
     protected JPasswordField pinField;
 
     protected int buttonSize;
     
-//    private static final int CHECKBOX_WIDTH = new JCheckBox().getPreferredSize().width;
+    /** gui style config (default 'simple') */
+    protected boolean renderHeaderPanel = false;
+    protected boolean renderIconPanel = false;
+    protected boolean renderCancelButton = false;
 
     /**
+     * set contentPane
+     * init message bundle
+     * configure the style 
+     * register the help listener
+     * create GUI (on event-dispatching thread)
+     * 
      * @param contentPane
-     * @param localeString may be null
+     * @param locale
+     * @param guiStyle
+     * @param background
+     * @param helpListener
      */
-    @Override
-    public void init(final Container contentPane, Locale locale, final URL background, ActionListener helpListener) {
+    public SimpleGUI(Container contentPane, Locale locale, Style guiStyle, URL background, ActionListener helpListener) {
+      this.contentPane = contentPane;
 
-        if (locale != null) {
-            messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, locale);
-        } else {
-            messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
-        }
+      if (locale != null) {
+          messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, locale);
+      } else {
+          messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
+      }
+
+      if (guiStyle == Style.advanced) {
+        renderHeaderPanel = true;
+        renderIconPanel = false;
+        renderCancelButton = true;
+      }
+
+      registerHelpListener(helpListener);
+      
+      createGUI(background);
+    }
+    
+    private void createGUI(final URL background) {
 
-        this.contentPane = contentPane;
-        registerHelpListener(helpListener);
-        
         try {
 
           log.debug("scheduling gui initialization");
@@ -112,21 +133,28 @@ public class SimpleGUI implements BKUGUIFacade {
                   
                   log.debug("initializing gui");
 
-//                    initIconPanel();
+                  if (renderIconPanel) {
+                    initIconPanel(background);
+                    initContentPanel(null);
+                  } else {
                     initContentPanel(background);
-
-                    GroupLayout layout = new GroupLayout(contentPane);
-                    contentPane.setLayout(layout);
+                  }
+                  
+                  GroupLayout layout = new GroupLayout(contentPane);
+                  contentPane.setLayout(layout);
+                  
+                  if (renderIconPanel) {
+                    layout.setHorizontalGroup(layout.createSequentialGroup()
+                        .addComponent(iconPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
+                        .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));
+                  } else {
                     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) {
@@ -134,119 +162,113 @@ public class SimpleGUI 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()
-//                .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 initIconPanel(URL background) {
+      if (background == null) {
+        background = getClass().getResource(DEFAULT_BACKGROUND);
+      }
+      if ("file".equals(background.getProtocol())) {
+        log.warn("file:// background images not permitted: " + background);
+        background = getClass().getResource(DEFAULT_BACKGROUND);
+      }
+      log.debug("loading icon panel background " + background);
+      
+      iconPanel = new JPanel();
+      JLabel iconLabel = new JLabel();
+      iconLabel.setIcon(new ImageIcon(background));
+
+      GroupLayout iconPanelLayout = new GroupLayout(iconPanel);
+      iconPanel.setLayout(iconPanelLayout);
+      iconPanelLayout.setHorizontalGroup(
+        iconPanelLayout.createSequentialGroup()
+          .addContainerGap()
+          .addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
+          // no gap here (contentPanel has containerGap)
+      iconPanelLayout.setVerticalGroup(
+        iconPanelLayout.createSequentialGroup()
+          .addContainerGap()
+          .addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE));
+    }
 
     protected void initContentPanel(URL background) { 
 
       if (background == null) {
-        background = this.getClass().getResource(DEFAULT_BACKGROUND);
+        background = getClass().getResource(DEFAULT_BACKGROUND);
       }
       if ("file".equals(background.getProtocol())) {
-        log.warn("local background image not allowed: " + background);
-        background = this.getClass().getResource(DEFAULT_BACKGROUND);
+        log.warn("file:// background images not permitted: " + background);
+        background = getClass().getResource(DEFAULT_BACKGROUND);
       }
       log.debug("loading background " + background);
       contentPanel = new ImagePanel(background);
 
-//        contentPanel.setBorder(new TitledBorder("content"));
-        
-//        headerPanel = new JPanel();
-//        headerPanel.setOpaque(false);
-        mainPanel = new JPanel();
-        mainPanel.setOpaque(false);
-        buttonPanel = new JPanel(); 
-        buttonPanel.setOpaque(false);
-
-//        headerPanel.setBorder(new TitledBorder("header"));
-//        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));
-        
-        helpLabel = new JLabel();
-        helpLabel.setIcon(new ImageIcon(getClass().getResource(HELP_IMG))); 
-        helpLabel.getAccessibleContext().setAccessibleName(messages.getString(ALT_HELP));
-        helpLabel.addMouseListener(helpListener);
-        helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-        
-        JButton b = new JButton();
-//        b.setText(messages.getString(BUTTON_CANCEL));
-//        if (b.getPreferredSize().width > buttonSize)
-//            buttonSize = b.getPreferredSize().width;
-        b.setText(messages.getString(BUTTON_OK));
-        if (b.getPreferredSize().width > buttonSize)
-            buttonSize = b.getPreferredSize().width;
-        b.setText(messages.getString(BUTTON_SIGN));
-        if (b.getPreferredSize().width > buttonSize)
-            buttonSize = b.getPreferredSize().width;
-        b.setText(messages.getString(BUTTON_BACK));
-        if (b.getPreferredSize().width > buttonSize)
-            buttonSize = b.getPreferredSize().width;
-//        b.setText(messages.getString(BUTTON_SAVE));
-//        if (b.getPreferredSize().width > buttonSize)
-//            buttonSize = b.getPreferredSize().width;
-        
-//        if (cancelButton.getPreferredSize().width > buttonSize)
-//            buttonSize = cancelButton.getPreferredSize().width;
-//        if (signButton.getPreferredSize().width > buttonSize)
-//            buttonSize = signButton.getPreferredSize().width;
-//        if (backButton.getPreferredSize().width > buttonSize)
-//            buttonSize = backButton.getPreferredSize().width;
-//        if (saveButton.getPreferredSize().width > buttonSize)
-//            buttonSize = saveButton.getPreferredSize().width;
+      mainPanel = new JPanel();
+      mainPanel.setOpaque(false);
+      buttonPanel = new JPanel(); 
+      buttonPanel.setOpaque(false);
 
+      helpLabel = new JLabel();
+      helpLabel.setIcon(new ImageIcon(getClass().getResource(HELP_IMG))); 
+      helpLabel.getAccessibleContext().setAccessibleName(messages.getString(ALT_HELP));
+      helpLabel.addMouseListener(helpListener);
+      helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+    
+      buttonSize = initButtonSize(messages, renderCancelButton);
         
-//        GroupLayout headerPanelLayout = new GroupLayout(headerPanel);
-//        headerPanel.setLayout(headerPanelLayout);
-//
-//        headerPanelLayout.setHorizontalGroup(
-//          headerPanelLayout.createSequentialGroup()
-//            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
-//        headerPanelLayout.setVerticalGroup(
-//          headerPanelLayout.createSequentialGroup()
-//            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE));
-
-
-        GroupLayout contentPanelLayout = new GroupLayout(contentPanel);
-        contentPanel.setLayout(contentPanelLayout);
-
-        contentPanelLayout.setHorizontalGroup(
-          contentPanelLayout.createSequentialGroup()
-            .addContainerGap()
-            .addGroup(
-              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))
-            .addContainerGap());
-        contentPanelLayout.setVerticalGroup(
-          contentPanelLayout.createSequentialGroup()
-            .addContainerGap()
-//            .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)
-            .addContainerGap());
+      if (renderHeaderPanel) {
+        headerPanel = new JPanel();
+        headerPanel.setOpaque(false);
+
+        titleLabel = new JLabel();
+        titleLabel.setFont(titleLabel.getFont().deriveFont(titleLabel.getFont().getStyle() |
+          java.awt.Font.BOLD, titleLabel.getFont().getSize() + 2));
+
+        GroupLayout headerPanelLayout = new GroupLayout(headerPanel);
+        headerPanel.setLayout(headerPanelLayout);
+
+        headerPanelLayout.setHorizontalGroup(
+          headerPanelLayout.createSequentialGroup()
+            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
+            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+            .addComponent(helpLabel));
+        headerPanelLayout.setVerticalGroup(
+          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
+            .addComponent(helpLabel));
+      }
+
+      GroupLayout contentPanelLayout = new GroupLayout(contentPanel);
+      contentPanel.setLayout(contentPanelLayout);
+
+      GroupLayout.ParallelGroup horizontalContentInner = contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+      if (renderHeaderPanel) {
+        horizontalContentInner
+                .addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE);
+      }
+      horizontalContentInner
+              .addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+              .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE);
+      GroupLayout.SequentialGroup horizontalContentOuter = contentPanelLayout.createSequentialGroup();
+      if (!renderIconPanel) {
+        horizontalContentOuter
+                .addContainerGap();
+      }
+      horizontalContentOuter
+              .addGroup(horizontalContentInner)
+              .addContainerGap();
+      contentPanelLayout.setHorizontalGroup(horizontalContentOuter);
+      
+      GroupLayout.SequentialGroup verticalContent = contentPanelLayout.createSequentialGroup();
+      verticalContent.addContainerGap();
+      if (renderHeaderPanel) {
+        verticalContent.addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
+      }
+      verticalContent.addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 
+        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
+        .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+        .addContainerGap();
+      contentPanelLayout.setVerticalGroup(verticalContent);
     }
 
     @Override
@@ -269,26 +291,35 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-//                titleLabel.setText(messages.getString(TITLE_WELCOME));
-
                 helpListener.setHelpTopic(HELP_WELCOME);
                 
                 JLabel welcomeMsgLabel = new JLabel();
                 welcomeMsgLabel.setFont(welcomeMsgLabel.getFont().deriveFont(welcomeMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                welcomeMsgLabel.setText(messages.getString(TITLE_WELCOME)); 
-
+                
+                if (renderHeaderPanel) {
+                  titleLabel.setText(messages.getString(TITLE_WELCOME));
+                  welcomeMsgLabel.setText(messages.getString(MESSAGE_WAIT));
+                } else {
+                  welcomeMsgLabel.setText(messages.getString(TITLE_WELCOME));   
+                }
+                
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
-                mainPanelLayout.setHorizontalGroup(
-                    mainPanelLayout.createSequentialGroup()
-                      .addComponent(welcomeMsgLabel)
-                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                      .addComponent(helpLabel));
-                mainPanelLayout.setVerticalGroup(
-                    mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(welcomeMsgLabel)
-                      .addComponent(helpLabel));
+                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
+                        .addComponent(welcomeMsgLabel);
+                GroupLayout.Group messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                        .addComponent(welcomeMsgLabel);
+                if (!renderHeaderPanel) {
+                  messageHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel); 
+                  messageVertical
+                          .addComponent(helpLabel);
+                }
+
+                mainPanelLayout.setHorizontalGroup(messageHorizontal);
+                mainPanelLayout.setVerticalGroup(messageVertical);
                 
                 contentPanel.validate();
 
@@ -311,8 +342,10 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-//                titleLabel.setText(messages.getString(TITLE_INSERTCARD));
-
+                if (renderHeaderPanel) {
+                  titleLabel.setText(messages.getString(TITLE_INSERTCARD));
+                }
+                
                 helpListener.setHelpTopic(HELP_INSERTCARD);
 
                 JLabel insertCardMsgLabel = new JLabel();
@@ -322,31 +355,39 @@ public class SimpleGUI implements BKUGUIFacade {
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
-                mainPanelLayout.setHorizontalGroup(
-                    mainPanelLayout.createSequentialGroup()
-                      .addComponent(insertCardMsgLabel)
-                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                      .addComponent(helpLabel));
-                mainPanelLayout.setVerticalGroup(
-                    mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(insertCardMsgLabel)
-                      .addComponent(helpLabel));
+                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
+                        .addComponent(insertCardMsgLabel);
+                GroupLayout.ParallelGroup messageVertical = mainPanelLayout.createParallelGroup()
+                        .addComponent(insertCardMsgLabel);
                 
-//                JButton cancelButton = new JButton();
-//                cancelButton.setText(messages.getString(BUTTON_CANCEL));
-//                cancelButton.addActionListener(cancelListener);
-//                cancelButton.setActionCommand(cancelCommand);
-//
-//                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-//                buttonPanel.setLayout(buttonPanelLayout);
-//
-//                buttonPanelLayout.setHorizontalGroup(
-//                  buttonPanelLayout.createSequentialGroup()
-//                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-//                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-//                buttonPanelLayout.setVerticalGroup(
-//                  buttonPanelLayout.createSequentialGroup()
-//                    .addComponent(cancelButton));
+                if (!renderHeaderPanel) {
+                  messageHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel);    
+                  messageVertical
+                          .addComponent(helpLabel);
+                }
+                
+                mainPanelLayout.setHorizontalGroup(messageHorizontal);
+                mainPanelLayout.setVerticalGroup(messageVertical);
+                
+                if (renderCancelButton) {
+                  JButton cancelButton = new JButton();
+                  cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                  cancelButton.addActionListener(cancelListener);
+                  cancelButton.setActionCommand(cancelCommand);
+
+                  GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                  buttonPanel.setLayout(buttonPanelLayout);
+
+                  buttonPanelLayout.setHorizontalGroup(
+                    buttonPanelLayout.createSequentialGroup()
+                          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+                  buttonPanelLayout.setVerticalGroup(
+                    buttonPanelLayout.createSequentialGroup()
+                      .addComponent(cancelButton));
+                }
 
                 contentPanel.validate();
             }
@@ -373,48 +414,89 @@ public class SimpleGUI implements BKUGUIFacade {
               mainPanel.removeAll();
               buttonPanel.removeAll();
 
-//                titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
+              JLabel insertCardMsgLabel = new JLabel();
+              insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+
+              if (renderHeaderPanel) {
+                titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
+                insertCardMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD));
+              } else {
+                insertCardMsgLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED)); 
+              }
 
               helpListener.setHelpTopic(HELP_CARDNOTSUPPORTED);
               
-                JLabel insertCardMsgLabel = new JLabel();
-                insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                insertCardMsgLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED)); 
+              GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+              mainPanel.setLayout(mainPanelLayout);
+
+              GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
+                      .addComponent(insertCardMsgLabel);
+              GroupLayout.Group messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(insertCardMsgLabel);
+              if (!renderHeaderPanel) {
+                messageHorizontal
+                        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                        .addComponent(helpLabel);
+                messageVertical
+                        .addComponent(helpLabel);
+              } 
+              
+              mainPanelLayout.setHorizontalGroup(messageHorizontal);
+              mainPanelLayout.setVerticalGroup(messageVertical);
+                
+              if (renderCancelButton) {
+                JButton cancelButton = new JButton();
+                cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                cancelButton.addActionListener(cancelListener);
+                cancelButton.setActionCommand(cancelCommand);
 
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
 
-                mainPanelLayout.setHorizontalGroup(
-                    mainPanelLayout.createSequentialGroup()
-                      .addComponent(insertCardMsgLabel)
-                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                      .addComponent(helpLabel));
-                mainPanelLayout.setVerticalGroup(
-                    mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(insertCardMsgLabel)
-                      .addComponent(helpLabel));
-                
-//                JButton cancelButton = new JButton();
-//                cancelButton.setText(messages.getString(BUTTON_CANCEL));
-//                cancelButton.addActionListener(cancelListener);
-//                cancelButton.setActionCommand(cancelCommand);
-//
-//                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-//                buttonPanel.setLayout(buttonPanelLayout);
-//
-//                buttonPanelLayout.setHorizontalGroup(
-//                  buttonPanelLayout.createSequentialGroup()
-//                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-//                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-//                buttonPanelLayout.setVerticalGroup(
-//                  buttonPanelLayout.createSequentialGroup()
-//                    .addComponent(cancelButton));
-                
-                contentPanel.validate();
+                buttonPanelLayout.setHorizontalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+                buttonPanelLayout.setVerticalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                    .addComponent(cancelButton));
+              }
+              
+              contentPanel.validate();
             }
         });
     }
 
+  private static int initButtonSize(ResourceBundle messages, boolean renderCancelButton) {
+
+    int buttonSize = 0;
+    
+    JButton b = new JButton();
+    b.setText(messages.getString(BUTTON_OK));
+    if (b.getPreferredSize().width > buttonSize) {
+      buttonSize = b.getPreferredSize().width;
+    }
+    b.setText(messages.getString(BUTTON_SIGN));
+    if (b.getPreferredSize().width > buttonSize) {
+      buttonSize = b.getPreferredSize().width;
+    }
+    b.setText(messages.getString(BUTTON_BACK));
+    if (b.getPreferredSize().width > buttonSize) {
+      buttonSize = b.getPreferredSize().width;
+    }
+    b.setText(messages.getString(BUTTON_SAVE));
+    if (b.getPreferredSize().width > buttonSize) {
+      buttonSize = b.getPreferredSize().width;
+    }
+    if (renderCancelButton) {
+      b.setText(messages.getString(BUTTON_CANCEL));
+      if (b.getPreferredSize().width > buttonSize) {
+        buttonSize = b.getPreferredSize().width;
+      }
+    }
+    return buttonSize;
+  }
+
     private void showCardPINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener okListener, final String okCommand, final ActionListener cancelListener, final String cancelCommand) {
         
       log.debug("scheduling card-pin dialog");
@@ -429,17 +511,14 @@ public class SimpleGUI 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));
-//                }
-
-//                JButton cancelButton = new JButton();
-//                cancelButton.setText(messages.getString(BUTTON_CANCEL));
-//                cancelButton.setActionCommand(cancelCommand);
-//                cancelButton.addActionListener(cancelListener);
+                if (renderHeaderPanel) {
+                  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 okButton = new JButton();
                 okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -492,55 +571,73 @@ public class SimpleGUI implements BKUGUIFacade {
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
-                mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addGroup(mainPanelLayout.createSequentialGroup()
-                      .addComponent(infoLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                      .addComponent(helpLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
-                    .addGroup(mainPanelLayout.createSequentialGroup()
+                GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+                GroupLayout.SequentialGroup pinHorizontal = mainPanelLayout.createSequentialGroup()
                       .addComponent(cardPinLabel, 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(pinsizeLabel))));
-
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(infoLabel)
-                      .addComponent(helpLabel))
-                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                        .addComponent(cardPinLabel)
-                        .addComponent(pinField))
-                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addComponent(pinsizeLabel));
+                        .addComponent(pinsizeLabel));
+                
+                GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
+                
+                if (!renderHeaderPanel) {
+                  GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
+                          .addComponent(infoLabel) //, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel); //, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                  mainHorizontal
+                          .addGroup(infoHorizontal)
+                          .addGroup(pinHorizontal);
+                  GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                          .addComponent(infoLabel)
+                          .addComponent(helpLabel);
+                  mainVertical
+                          .addGroup(infoVertical)
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
+                } else {
+                  mainHorizontal
+                          .addGroup(pinHorizontal);
+                }
 
+                mainVertical
+                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                    .addComponent(cardPinLabel)
+                    .addComponent(pinField))
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                  .addComponent(pinsizeLabel);
+                
+                mainPanelLayout.setHorizontalGroup(mainHorizontal);
+                mainPanelLayout.setVerticalGroup(mainVertical);
+                
+                
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
-                buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createSequentialGroup()
+                GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
                         .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-                buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                    .addComponent(okButton));
-
-//                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-//                buttonPanel.setLayout(buttonPanelLayout);
-//
-//                buttonPanelLayout.setHorizontalGroup(
-//                  buttonPanelLayout.createSequentialGroup()
-//                        .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));
-//                buttonPanelLayout.setVerticalGroup(
-//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
-//                        .addComponent(okButton)
-//                        .addComponent(cancelButton)); 
+                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                GroupLayout.Group buttonVertical;
+                
+                if (renderCancelButton) {
+                  JButton cancelButton = new JButton();
+                  cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                  cancelButton.setActionCommand(cancelCommand);
+                  cancelButton.addActionListener(cancelListener);
+
+                  buttonHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                  buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
+                          .addComponent(okButton)
+                          .addComponent(cancelButton); 
+                } else {
+                  buttonVertical = buttonPanelLayout.createSequentialGroup()
+                          .addComponent(okButton);
+                }
+                
+                buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
+                buttonPanelLayout.setVerticalGroup(buttonVertical);
 
                 pinField.requestFocusInWindow();
                 contentPanel.validate();
@@ -583,16 +680,13 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
                 
-//                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));
-//                cancelButton.setActionCommand(cancelCommand);
-//                cancelButton.addActionListener(cancelListener);
+                if (renderHeaderPanel) {
+                  if (numRetries < 0) {
+                      titleLabel.setText(messages.getString(TITLE_SIGN));
+                  } else {
+                      titleLabel.setText(messages.getString(TITLE_RETRY));
+                  }
+                }
 
                 JButton signButton = new JButton();
                 signButton.setFont(signButton.getFont().deriveFont(signButton.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -653,13 +747,23 @@ public class SimpleGUI implements BKUGUIFacade {
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
+                
+                GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
+                        .addComponent(infoLabel);
+                GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                        .addComponent(infoLabel);
+                       
+                if (!renderHeaderPanel) {
+                  infoHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel); //, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
+                  infoVertical
+                          .addComponent(helpLabel);
+                }
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addGroup(mainPanelLayout.createSequentialGroup()
-                      .addComponent(infoLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                      .addComponent(helpLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+                    .addGroup(infoHorizontal)
                     .addGroup(mainPanelLayout.createSequentialGroup()
                         .addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
@@ -669,9 +773,7 @@ public class SimpleGUI implements BKUGUIFacade {
 
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
-                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                        .addComponent(infoLabel)
-                        .addComponent(helpLabel))
+                    .addGroup(infoVertical)
                     .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                     .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
                         .addComponent(signPinLabel)
@@ -682,27 +784,31 @@ public class SimpleGUI implements BKUGUIFacade {
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
-                buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createSequentialGroup()
+                GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
                         .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(signButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-                buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                    .addComponent(signButton));
-
-//                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-//                buttonPanel.setLayout(buttonPanelLayout);
-//
-//                buttonPanelLayout.setHorizontalGroup(
-//                  buttonPanelLayout.createSequentialGroup()
-//                        .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));
-//                buttonPanelLayout.setVerticalGroup(
-//                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
-//                        .addComponent(signButton)
-//                        .addComponent(cancelButton)); 
+                        .addComponent(signButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                GroupLayout.Group buttonVertical;
+                
+                if (renderCancelButton) {
+                  JButton cancelButton = new JButton();
+                  cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                  cancelButton.setActionCommand(cancelCommand);
+                  cancelButton.addActionListener(cancelListener);
+
+                  buttonHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                  
+                  buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                          .addComponent(signButton)
+                          .addComponent(cancelButton); 
+                } else {
+                  buttonVertical = buttonPanelLayout.createSequentialGroup()
+                          .addComponent(signButton);
+                }
+                
+                buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
+                buttonPanelLayout.setVerticalGroup(buttonVertical);
 
                 pinField.requestFocusInWindow();
                 contentPanel.validate();
@@ -726,15 +832,12 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-//                titleLabel.setText(messages.getString(TITLE_ERROR));
+                if (renderHeaderPanel) {
+                  titleLabel.setText(messages.getString(TITLE_ERROR));
+                }
 
                 helpListener.setHelpTopic(errorMsgKey);
                 
-                JLabel errorTitleLabel = new JLabel();
-                errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                errorTitleLabel.setText(messages.getString(TITLE_ERROR));
-                errorTitleLabel.setForeground(ERROR_COLOR);
-                
                 String errorMsgPattern = messages.getString(errorMsgKey);
                 String errorMsg = MessageFormat.format(errorMsgPattern, errorMsgParams);
                 
@@ -745,19 +848,30 @@ public class SimpleGUI implements BKUGUIFacade {
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
-                mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addGroup(mainPanelLayout.createSequentialGroup()
-                      .addComponent(errorTitleLabel)
-                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                      .addComponent(helpLabel))
-                    .addComponent(errorMsgLabel));
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(errorTitleLabel)
-                      .addComponent(helpLabel))
-                    .addComponent(errorMsgLabel));
+                GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+                GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
+                
+                if (!renderHeaderPanel) {
+                  JLabel errorTitleLabel = new JLabel();
+                  errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                  errorTitleLabel.setText(messages.getString(TITLE_ERROR));
+                  errorTitleLabel.setForeground(ERROR_COLOR);
+                
+                  mainHorizontal
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addComponent(errorTitleLabel)
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                            .addComponent(helpLabel));
+                  mainVertical
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                            .addComponent(errorTitleLabel)
+                            .addComponent(helpLabel));
+                }
+                
+                mainPanelLayout.setHorizontalGroup(mainHorizontal
+                        .addComponent(errorMsgLabel));
+                mainPanelLayout.setVerticalGroup(mainVertical
+                        .addComponent(errorMsgLabel));
                 
                 JButton okButton = new JButton();
                 okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -796,15 +910,12 @@ public class SimpleGUI implements BKUGUIFacade {
           mainPanel.removeAll();
           buttonPanel.removeAll();
 
-//          titleLabel.setText(messages.getString(TITLE_ERROR));
+          if (renderHeaderPanel) {
+            titleLabel.setText(messages.getString(TITLE_ERROR));
+          }
 
           helpListener.setHelpTopic(errorMsgKey);
           
-          JLabel errorTitleLabel = new JLabel();
-          errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
-          errorTitleLabel.setText(messages.getString(TITLE_ERROR));
-          errorTitleLabel.setForeground(ERROR_COLOR);
-      
           String errorMsgPattern = messages.getString(errorMsgKey);
           String errorMsg = MessageFormat.format(errorMsgPattern, errorMsgParams);
 
@@ -815,20 +926,32 @@ public class SimpleGUI implements BKUGUIFacade {
           GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
           mainPanel.setLayout(mainPanelLayout);
 
-          mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+          
+          GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+          GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
+
+          if (!renderHeaderPanel) {
+            JLabel errorTitleLabel = new JLabel();
+            errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
+            errorTitleLabel.setText(messages.getString(TITLE_ERROR));
+            errorTitleLabel.setForeground(ERROR_COLOR);
+
+            mainHorizontal
                     .addGroup(mainPanelLayout.createSequentialGroup()
                       .addComponent(errorTitleLabel)
                       .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                      .addComponent(helpLabel))
-                    .addComponent(errorMsgLabel));
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
+                      .addComponent(helpLabel));
+            mainVertical
                     .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                       .addComponent(errorTitleLabel)
-                      .addComponent(helpLabel))
-                    .addComponent(errorMsgLabel));
+                      .addComponent(helpLabel));
+          }
 
+          mainPanelLayout.setHorizontalGroup(mainHorizontal
+                  .addComponent(errorMsgLabel));
+          mainPanelLayout.setVerticalGroup(mainVertical
+                  .addComponent(errorMsgLabel));
+          
           contentPanel.validate();
         }
       });
@@ -849,8 +972,10 @@ public class SimpleGUI implements BKUGUIFacade {
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
-//                titleLabel.setText(messages.getString(TITLE_WAIT));
-
+                if (renderHeaderPanel) {
+                  titleLabel.setText(messages.getString(TITLE_WAIT));
+                }
+                
                 helpListener.setHelpTopic(HELP_WAIT);
                 
                 JLabel waitMsgLabel = new JLabel();
@@ -864,15 +989,20 @@ public class SimpleGUI implements BKUGUIFacade {
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
-                mainPanelLayout.setHorizontalGroup(
-                    mainPanelLayout.createSequentialGroup()
-                      .addComponent(waitMsgLabel)
-                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                      .addComponent(helpLabel));
-                mainPanelLayout.setVerticalGroup(
-                    mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(waitMsgLabel)
-                      .addComponent(helpLabel));
+                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
+                        .addComponent(waitMsgLabel);
+                GroupLayout.ParallelGroup messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                        .addComponent(waitMsgLabel);
+                
+                if (!renderHeaderPanel) {
+                  messageHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel);
+                  messageVertical
+                          .addComponent(helpLabel);
+                }
+                mainPanelLayout.setHorizontalGroup(messageHorizontal);
+                mainPanelLayout.setVerticalGroup(messageVertical);
                 
                 contentPanel.validate();
             }
@@ -887,50 +1017,58 @@ public class SimpleGUI implements BKUGUIFacade {
         return null;
     }
     
+    /**
+     * TODO handle multiple references in HashDataViewer
+     * @param signedReferences
+     * @param okListener
+     * @param okCommand
+     */
     @Override
-    public void showHashDataInputDialog(final List<HashDataInput> signedReferences, boolean standalone, final ActionListener okListener, final String okCommand) {
+    public void showHashDataInputDialog(final List<HashDataInput> signedReferences, final ActionListener okListener, final String okCommand) {
       
       if (signedReferences == null) {
         showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {"No SignedReferences provided"}, okListener, okCommand);
+        return;
       }
       
+      ActionListener saveHashDataListener = new ActionListener() {
+
+          @Override
+          public void actionPerformed(ActionEvent e) {
+              showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
+          }
+      };
+      
       if (signedReferences.size() == 1) {
         
-        if (standalone) {
-          ActionListener saveHashDataListener = new ActionListener() {
-
-              @Override
-              public void actionPerformed(ActionEvent e) {
-                  showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
-              }
-          };
-          showHashDataViewer(signedReferences, saveHashDataListener, "save");
+//        if (standalone) {
           
-        } else {
-          if ("text/plain".equals(signedReferences.get(0).getMimeType())) {
-            
-            ActionListener saveHashDataListener = new ActionListener() {
-
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
-                }
-            };
-            
-            try {
-              String hashDataText = getText(signedReferences.get(0));
-              showPlainTextHashDataInputDialog(hashDataText, saveHashDataListener, "save", okListener, okCommand);
-            } catch (IOException ex) {
-              showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {ex.getMessage()}, okListener, okCommand);
-            }
+          showHashDataViewer(signedReferences, saveHashDataListener, "save");
           
-          } else {
-            showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
-          }
-        }
+//        } else {
+//          if ("text/plain".equals(signedReferences.get(0).getMimeType())) {
+//            
+//            ActionListener saveHashDataListener = new ActionListener() {
+//
+//                @Override
+//                public void actionPerformed(ActionEvent e) {
+//                    showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
+//                }
+//            };
+//            
+//            try {
+//              String hashDataText = getText(signedReferences.get(0));
+//              showPlainTextHashDataInputDialog(hashDataText, saveHashDataListener, "save", okListener, okCommand);
+//            } catch (IOException ex) {
+//              showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {ex.getMessage()}, okListener, okCommand);
+//            }
+//          
+//          } else {
+//            showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
+//          }
+//        }
       } else {
 
-        SimpleHashDataTableModel tableModel = new SimpleHashDataTableModel(signedReferences);
 //        final HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
 //
 //        ActionListener saveHashDataListener = new ActionListener() {
@@ -940,128 +1078,112 @@ public class SimpleGUI implements BKUGUIFacade {
 //              showSaveHashDataInputDialog(tableModel.getSelectedHashData(), okListener, okCommand);
 //            }
 //        };
-        showMultipleHashDataInputDialog(tableModel, okListener, okCommand);
+        
+        SimpleHashDataTableModel tableModel = new SimpleHashDataTableModel(signedReferences);
+        showMultipleHashDataInputDialog(tableModel, okListener, okCommand, saveHashDataListener, "save");
       }
     }
     
     /**
-     * TODO 
+     * blocks until dialog returns (is closed)
      * @param hashDataText
      * @param saveListener
      * @param saveCommand
      */
     private void showHashDataViewer(final List<HashDataInput> signedReferences, final ActionListener saveListener, final String saveCommand) {
-      log.debug("scheduling plaintext hashdatainput dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-        @Override
-        public void run() {
-          
-          log.debug("show plaintext hashdatainput dialog");
-      
-          ActionListener l = helpListener.getActionListener();
-          HashDataViewer.showHashDataInput(contentPane, signedReferences, messages, saveListener, saveCommand, l);
-        }
-      });
-    }
-    
-    private void showPlainTextHashDataInputDialog(final String hashDataText, final ActionListener saveListener, final String saveCommand, final ActionListener cancelListener, final String cancelCommand) {
-      
-      log.debug("scheduling plaintext hashdatainput dialog");
       
-      SwingUtilities.invokeLater(new Runnable() {
-
-        @Override
-        public void run() {
-          
-          log.debug("show plaintext hashdatainput dialog");
-      
-          mainPanel.removeAll();
-          buttonPanel.removeAll();
-
-//          titleLabel.setText(messages.getString(TITLE_HASHDATA));
-          
-          helpListener.setHelpTopic(HELP_HASHDATA);
-
-          JLabel refIdLabel = new JLabel();
-          refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-          refIdLabel.setText(messages.getString(MESSAGE_HASHDATA)); //MessageFormat.format(refIdLabelPattern, new Object[]{refId}));
-
-          JTextArea hashDataTextArea = new JTextArea(hashDataText);
-          hashDataTextArea.setEditable(false);
-//          hashDataTextArea.setColumns(1);
-//          hashDataTextArea.setRows(1);
-          hashDataTextArea.setFont(new Font(HASHDATA_FONT, hashDataTextArea.getFont().getStyle(), hashDataTextArea.getFont().getSize()));
-//          hashDataScrollPane.setViewportView(hashDataTextArea);
-//          hashDataScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); //HORIZONTAL_SCROLLBAR_NEVER);
-          hashDataTextArea.setLineWrap(true);
-          hashDataTextArea.setWrapStyleWord(true);
-
-          JScrollPane hashDataScrollPane = new JScrollPane(hashDataTextArea);
-
-          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-          mainPanel.setLayout(mainPanelLayout);
-
-          mainPanelLayout.setHorizontalGroup(
-             mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-              .addGroup(mainPanelLayout.createSequentialGroup()
-                .addComponent(refIdLabel)
-                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                .addComponent(helpLabel))
-              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
-
-          mainPanelLayout.setVerticalGroup(
-            mainPanelLayout.createSequentialGroup()
-              .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                .addComponent(refIdLabel)
-                .addComponent(helpLabel))
-              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
-
-          JButton backButton = new JButton();
-          backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-          backButton.setText(messages.getString(BUTTON_BACK));
-          backButton.setActionCommand(cancelCommand);
-          backButton.addActionListener(cancelListener);
+      try {
+        log.debug("scheduling plaintext hashdatainput dialog");
 
-//          JButton saveButton = new JButton();
-//          saveButton.setText(messages.getString(BUTTON_SAVE));
-//          saveButton.setActionCommand(saveCommand);
-//          saveButton.addActionListener(saveListener);
+        SwingUtilities.invokeAndWait(new Runnable() {
 
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
+          @Override
+          public void run() {
 
-                buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-                buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                    .addComponent(backButton));
+            log.debug("show plaintext hashdatainput dialog");
 
+            ActionListener l = helpListener.getActionListener();
+            HashDataViewer.showHashDataInput(contentPane, signedReferences, messages, saveListener, saveCommand, l);
+          }
+        });
+        
+      } catch (InterruptedException ex) {
+        log.error("Failed to display HashDataViewer: " + ex.getMessage());
+      } catch (InvocationTargetException ex) {
+        log.error("Failed to display HashDataViewer: " + ex.getMessage());
+      }
+    }
+    
+//    private void showPlainTextHashDataInputDialog(final String hashDataText, final ActionListener saveListener, final String saveCommand, final ActionListener cancelListener, final String cancelCommand) {
+//      
+//      log.debug("scheduling plaintext hashdatainput dialog");
+//      
+//      SwingUtilities.invokeLater(new Runnable() {
+//
+//        @Override
+//        public void run() {
+//          
+//          log.debug("show plaintext hashdatainput dialog");
+//      
+//          mainPanel.removeAll();
+//          buttonPanel.removeAll();
+//
+//          helpListener.setHelpTopic(HELP_HASHDATA);
+//
+//          JLabel refIdLabel = new JLabel();
+//          refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+//          refIdLabel.setText(messages.getString(MESSAGE_HASHDATA)); //MessageFormat.format(refIdLabelPattern, new Object[]{refId}));
+//
+//          JTextArea hashDataTextArea = new JTextArea(hashDataText);
+//          hashDataTextArea.setEditable(false);
+//          hashDataTextArea.setFont(new Font(HASHDATA_FONT, hashDataTextArea.getFont().getStyle(), hashDataTextArea.getFont().getSize()));
+//          hashDataTextArea.setLineWrap(true);
+//          hashDataTextArea.setWrapStyleWord(true);
+//
+//          JScrollPane hashDataScrollPane = new JScrollPane(hashDataTextArea);
+//
+//          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+//          mainPanel.setLayout(mainPanelLayout);
+//
+//          mainPanelLayout.setHorizontalGroup(
+//             mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//              .addGroup(mainPanelLayout.createSequentialGroup()
+//                .addComponent(refIdLabel)
+//                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+//                .addComponent(helpLabel))
+//              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
+//
+//          mainPanelLayout.setVerticalGroup(
+//            mainPanelLayout.createSequentialGroup()
+//              .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//                .addComponent(refIdLabel)
+//                .addComponent(helpLabel))
+//              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+//              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
+//
+//          JButton backButton = new JButton();
+//          backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+//          backButton.setText(messages.getString(BUTTON_BACK));
+//          backButton.setActionCommand(cancelCommand);
+//          backButton.addActionListener(cancelListener);
+//
 //          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
 //          buttonPanel.setLayout(buttonPanelLayout);
 //
 //          buttonPanelLayout.setHorizontalGroup(
 //            buttonPanelLayout.createSequentialGroup()
 //                  .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));
 //          buttonPanelLayout.setVerticalGroup(
-//            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
-//                  .addComponent(saveButton)
-//                  .addComponent(backButton)); 
-
-          contentPanel.validate();
-        }
-      });
-    }
+//            buttonPanelLayout.createSequentialGroup()
+//              .addComponent(backButton));
+//
+//          contentPanel.validate();
+//        }
+//      });
+//    }
 
-    private void showMultipleHashDataInputDialog(final TableModel signedReferences, final ActionListener cancelListener, final String cancelCommand) {
-//      , final ActionListener saveListener, final String saveCommand
+    private void showMultipleHashDataInputDialog(final TableModel signedReferences, final ActionListener cancelListener, final String cancelCommand, final ActionListener saveListener, final String saveCommand) {
       
       log.debug("scheduling multiple hashdatainput dialog");
       
@@ -1075,8 +1197,10 @@ public class SimpleGUI implements BKUGUIFacade {
           mainPanel.removeAll();
           buttonPanel.removeAll();
 
-//          titleLabel.setText(messages.getString(TITLE_HASHDATA));
-
+          if (renderHeaderPanel) {
+            titleLabel.setText(messages.getString(TITLE_HASHDATA));
+          }
+          
           helpListener.setHelpTopic(HELP_HASHDATALIST);
           
           JLabel refIdLabel = new JLabel();
@@ -1124,36 +1248,31 @@ public class SimpleGUI implements BKUGUIFacade {
           backButton.setActionCommand(cancelCommand);
           backButton.addActionListener(cancelListener);
 
-//          JButton saveButton = new JButton();
-//          saveButton.setText(messages.getString(BUTTON_SAVE));
-//          saveButton.setActionCommand(saveCommand);
-//          saveButton.addActionListener(saveListener);
-
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
-                buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createSequentialGroup()
+                GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
                         .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-                buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                    .addComponent(backButton));
-          
-          
-//          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-//          buttonPanel.setLayout(buttonPanelLayout);
-//
-//          buttonPanelLayout.setHorizontalGroup(
-//            buttonPanelLayout.createSequentialGroup()
-//                  .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));
-//          buttonPanelLayout.setVerticalGroup(
-//            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
-//                  .addComponent(saveButton)
-//                  .addComponent(backButton)); 
+                        .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                GroupLayout.ParallelGroup buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                        .addComponent(backButton);
+                
+                if (renderCancelButton) {
+                  //render save button
+                  JButton saveButton = new JButton();
+                  saveButton.setText(messages.getString(BUTTON_SAVE));
+                  saveButton.setActionCommand(saveCommand);
+                  saveButton.addActionListener(saveListener);
+
+                  buttonHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                  buttonVertical
+                          .addComponent(saveButton);
+                }
+                
+                buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
+                buttonPanelLayout.setVerticalGroup(buttonVertical);
 
           contentPanel.validate();
         }
@@ -1243,36 +1362,36 @@ public class SimpleGUI implements BKUGUIFacade {
       });
     }
     
-    private static String getText(HashDataInput hdi) throws IOException {
-      ByteArrayOutputStream baos = null;
-      try {
-        InputStream hashDataIS = hdi.getHashDataInput();
-        if (hashDataIS == null) {
-          log.error("No HashDataInput stream for reference " + hdi.getReferenceId());
-          return null;
-        } else {
-          baos = new ByteArrayOutputStream(hashDataIS.available());
-          int c;
-          while ((c = hashDataIS.read()) != -1) {
-              baos.write(c);
-          }
-          String encoding = hdi.getEncoding();
-          if (encoding == null) {
-            //default for URL-encoded
-            encoding = "UTF-8";
-          }
-          return baos.toString(encoding);
-        }
-      } catch (IOException ex) {
-          log.error("Failed to read HashDataInput for reference " + hdi.getReferenceId() + ": " + ex.getMessage());
-          throw ex; 
-      } finally {
-          try {
-              baos.close();
-          } catch (IOException ex) {
-          }
-      }
-    }
+//    private static String getText(HashDataInput hdi) throws IOException {
+//      ByteArrayOutputStream baos = null;
+//      try {
+//        InputStream hashDataIS = hdi.getHashDataInput();
+//        if (hashDataIS == null) {
+//          log.error("No HashDataInput stream for reference " + hdi.getReferenceId());
+//          return null;
+//        } else {
+//          baos = new ByteArrayOutputStream(hashDataIS.available());
+//          int c;
+//          while ((c = hashDataIS.read()) != -1) {
+//              baos.write(c);
+//          }
+//          String encoding = hdi.getEncoding();
+//          if (encoding == null) {
+//            //default for URL-encoded
+//            encoding = "UTF-8";
+//          }
+//          return baos.toString(encoding);
+//        }
+//      } catch (IOException ex) {
+//          log.error("Failed to read HashDataInput for reference " + hdi.getReferenceId() + ": " + ex.getMessage());
+//          throw ex; 
+//      } finally {
+//          try {
+//              baos.close();
+//          } catch (IOException ex) {
+//          }
+//      }
+//    }
     
     private void registerHelpListener(ActionListener helpListener) {
       if (helpListener != null) {
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 5f62c05a..b5a74ac1 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 title.welcome=<html>Willkommen</html>
-title.insertcard=<html>Bitte B\u00FCrgerkarte in den Kartenleser stecken</html>
+title.insertcard=<html>Keine B\u00FCrgerkarte gefunden</html>
 title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
 title.cardpin=<html>{0} eingeben</html>
 title.sign=<html>Signatur erstellen</html>
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index d963fd5f..94464982 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 title.welcome=<html>Welcome</html>
-title.insertcard=<html>Please insert your citizen-card into the reader</html>
+title.insertcard=<html>No citizen-card found</html>
 title.cardnotsupported=<html>This card is not supported</html>
 title.cardpin=<html>Enter {0}</html>
 title.sign=<html>Create signature</html>
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index c32a237a..b57e1923 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -32,15 +32,16 @@ import org.junit.Test;
  *
  * @author clemens
  */
+@Ignore
 public class BKUGUITest {
 
-    @Ignore
+    @Test
     public void testBKUGUI() {
         JFrame testFrame = new JFrame("BKUGUITest");
         BKUGUI gui = new BKUGUI();
         Container contentPane = testFrame.getContentPane();
         contentPane.setPreferredSize(new Dimension(380, 150));
-        gui.init(contentPane, null, null, null);
+        gui.init(contentPane, null, BKUGUIFacade.Style.advanced, null, null);
         BKUGUIWorker worker = new BKUGUIWorker();
         worker.init(gui);
         testFrame.pack();
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 af1368e5..e4936067 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
@@ -43,7 +43,7 @@ public class BKUGUIWorker implements Runnable {
 
   @Override
   public void run() {
-        try {
+//        try {
 
     final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Signatur-PIN");
 
@@ -176,7 +176,7 @@ public class BKUGUIWorker implements Runnable {
 //                    signedRefs.add(signedRef4);
 //                    signedRefs.add(signedRef4);
 //                    signedRefs = Collections.singletonList(signedRef1);
-        gui.showHashDataInputDialog(signedRefs, true, returnListener, "return");
+        gui.showHashDataInputDialog(signedRefs, returnListener, "return");
       }
     };
 
@@ -184,64 +184,64 @@ public class BKUGUIWorker implements Runnable {
 
         gui.showWelcomeDialog();
 
-        Thread.sleep(2000);
-        
-        gui.showWaitDialog(null);
-        
-        Thread.sleep(1000);
-        
-        gui.showWaitDialog("test");
-        
-        Thread.sleep(1000);
-          
-
-            gui.showInsertCardDialog(cancelListener, "cancel");
-
-            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");
-
-            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.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); 
+//        Thread.sleep(2000);
+//        
+//        gui.showWaitDialog(null);
+//        
+//        Thread.sleep(1000);
+//        
+//        gui.showWaitDialog("test");
+//        
+//        Thread.sleep(1000);
+//          
+//
+//            gui.showInsertCardDialog(cancelListener, "cancel");
+//
+//            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");
+//
+//            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.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);
 
-        } catch (InterruptedException ex) {
-            ex.printStackTrace();
-        }
+//        } catch (InterruptedException ex) {
+//            ex.printStackTrace();
+//        }
   }
 }
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
index fb8f2432..eaa4d6ad 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
@@ -37,10 +37,10 @@ public class BKUGuiProxy implements BKUGUIFacade {
     return delegate.getPin();
   }
 
-  @Override
-  public void init(Container contentPane, Locale locale, URL bgImage, ActionListener helpListener) {
-    delegate.init(contentPane, locale, bgImage, helpListener);
-  }
+//  @Override
+//  public void init(Container contentPane, Locale locale, URL bgImage, ActionListener helpListener) {
+//    delegate.init(contentPane, locale, bgImage, helpListener);
+//  }
 
   @Override
   public Locale getLocale() {
@@ -126,11 +126,9 @@ public class BKUGuiProxy implements BKUGUIFacade {
 
   @Override
   public void showHashDataInputDialog(List<HashDataInput> signedReferences, 
-          boolean externalDisplay, 
           ActionListener okListener, 
           String okCommand) {
     showDialog();
-    delegate.showHashDataInputDialog(signedReferences, externalDisplay, okListener,
-        okCommand);
+    delegate.showHashDataInputDialog(signedReferences, okListener, okCommand);
   }
 }
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
index 19e6a657..bfce0f0d 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
@@ -109,7 +109,7 @@ public class LocalSignRequestHandler extends SignRequestHandler {
       log.error("dsig:SignedInfo does not contain a data reference");
       throw new Exception("dsig:SignedInfo does not contain a data reference");
     }
-    gui.showHashDataInputDialog(selectedHashDataInputs, false, this, "ok");
+    gui.showHashDataInputDialog(selectedHashDataInputs, this, "ok");
   }
 
   private ByteArrayHashDataInput getByteArrayHashDataInput(HashDataInput hashDataInput) throws IOException {
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
index cad8cfb6..7012fec0 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
@@ -48,7 +48,6 @@ public class SMCCSTALFactory implements STALFactory {
     if (locale != null) {
       dialog.setLocale(locale);
     }
-    BKUGUIFacade gui = BKUGUIFactory.createGUI(BKUGUIFactory.ADVANCED_GUI);
     DefaultHelpListener helpListener = null;
     try {
       if (helpURL != null) {
@@ -60,7 +59,11 @@ public class SMCCSTALFactory implements STALFactory {
     } catch (MalformedURLException ex) {
       log.error("failed to configure help listener: " + ex.getMessage(), ex);
     }
-    gui.init(dialog.getContentPane(), dialog.getLocale(), null, helpListener);
+    BKUGUIFacade gui = BKUGUIFactory.createGUI(dialog.getContentPane(), 
+            dialog.getLocale(),
+            BKUGUIFactory.ADVANCED_GUI,
+            null,
+            helpListener);
     stal = new SMCCSTAL(new BKUGuiProxy(dialog, gui), dialog);
     dialog.setPreferredSize(new Dimension(400, 200));
     dialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
diff --git a/BKUOnline/src/main/webapp/HTTP-ohne.html b/BKUOnline/src/main/webapp/HTTP-ohne.html
index 112a1d92..607fa5d4 100644
--- a/BKUOnline/src/main/webapp/HTTP-ohne.html
+++ b/BKUOnline/src/main/webapp/HTTP-ohne.html
@@ -101,7 +101,7 @@ legend {
 	<label for="appletHashDataDisplay">HashData Display</label> 
     <input type="radio" name="appletHashDataDisplay" value="frame" checked="checked">Frame
     <input type="radio" name="appletHashDataDisplay" value="browser">Browser
-	<input type="radio" name="appletHashDataDisplay" value="internal">Applet
+	<!--input type="radio" name="appletHashDataDisplay" value="internal">Applet-->
 </p>
 
 <!-- 
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index 77ee45b6..26905f50 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -130,67 +130,6 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
 
 //    @Override
 //    public String providePIN(PINSpec spec, int retries) {
-//        if (retryCounter++ > 0) {
-//            log.info("PIN wrong retrying ...");
-//            gui.showSignaturePINRetryDialog(spec, retries, this, "sign", this,
-//              "cancel", this, "hashData");
-//        } else {
-//            gui.showSignaturePINDialog(spec, this, "sign", this, "cancel", this,
-//              "hashData");
-//        }
-//        do {
-//            waitForAction();
-//            if (actionCommand.equals("cancel")) {
-//                return null;
-//            } else if (actionCommand.equals("hashData")) {
-//                if (signedInfo != null) {
-//                    try {
-//                        gui.showWaitDialog(null);
-//                        if (hashDataInputs == null || hashDataInputs.size() == 0) {
-//                          HashMap<String, ReferenceType> signedReferences = new HashMap<String, ReferenceType>();
-//                          for (ReferenceType reference : signedInfo.getReference()) {
-//                            //don't get Manifest, QualifyingProperties, ...
-//                            if (reference.getType() == null) {
-//                              signedReferences.put(reference.getId(), reference);
-//                            }
-//                          }
-//                          hashDataInputs = getHashDataInputs(signedReferences.keySet());
-//                          for (HashDataInput hashDataInput : hashDataInputs) {
-//                            ReferenceType reference = signedReferences.get(hashDataInput.getReferenceId());
-//                            String algorithm = reference.getDigestMethod().getAlgorithm();
-//                            MessageDigest md = MessageDigest.getInstance(algorithm);
-//                            DigestInputStream dis = new DigestInputStream(hashDataInput.getHashDataInput(), md);
-//                            while(dis.read() != -1) ;
-//                            byte[] digestValue = md.digest();
-//                            boolean valid = reference.getDigestValue().equals(digestValue);
-//                          }
-//                        }
-//                        gui.showHashDataInputDialog(hashDataInputs, this, "ok");
-//                    } catch (Exception ex) {
-//                        //FIXME localize messages
-//                        log.error("Failed to obtain HashDataInputs: " + ex.getMessage());
-//                        gui.showErrorDialog("Failed to obtain HashDataInputs: " + ex.getMessage(), this, "ok");
-//                    }
-//                } else {
-//                    //FIXME get all hashdatainputs
-//                    gui.showErrorDialog("Failed to obtain HashDataInputs: No dsig:SignedInfo provided.", this, "ok");
-//                }
-//            } else if (actionCommand.equals("sign")) {
-//                return new String(gui.getPin());
-//            } else if (actionCommand.equals("ok")) {
-//                gui.showSignaturePINDialog(spec, this, "sign", this, "cancel", this,
-//                  "hashData");
-//            }
-//        } while (true);
-//    }
-
-//    @Override
-//    public SMCCSTALRequestHandler newInstance() {
-//        return new SignRequestHandler();
-//    }
-
-    
-
     
   class STALPinProvider implements PINProvider {
     
@@ -236,26 +175,6 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
             gui.showErrorDialog(BKUGUIFacade.ERR_DISPLAY_HASHDATA, new Object[] {ex.getMessage()}, SignRequestHandler.this, "error");
           }
         
-        // OLD HASHDATA DISPLAY (in applet), 
-        // register SignRequestHandler.this as hashdataListener to use
-//        if (signedInfo != null) {
-//          try {
-//            if (hashDataInputs == null || hashDataInputs.size() == 0) {
-//              hashDataInputs = getCashedHashDataInputs(signedInfo.getReference());
-//            }
-//            gui.showHashDataInputDialog(hashDataInputs, SignRequestHandler.this, "ok");
-//          } catch (DigestException ex) { 
-//            log.error("Bad digest value: " + ex.getMessage());
-//            gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH, new Object[] {ex.getMessage()});
-//          } catch (Exception ex) {
-//            //FIXME localize messages
-//            log.error("Failed to obtain HashDataInputs: " + ex.getMessage());
-//            gui.showErrorDialog(BKUGUIFacade.ERR_NO_HASHDATA, new Object[] {ex.getMessage()}, SignRequestHandler.this, "ok");
-//          }
-//        } else {
-//          //FIXME get all hashdatainputs
-//          gui.showErrorDialog(BKUGUIFacade.ERR_NO_HASHDATA, new Object[] {"No dsig:SignedInfo provided"}, SignRequestHandler.this, "ok");
-//        }
       } else if (actionCommand.equals("sign")) {
         retryCounter++;
         return new String(gui.getPin());
-- 
cgit v1.2.3


From 6d2cd68c8adff8c27a6a3a18711ea44a2e7bfe30 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 18 Nov 2008 18:00:44 +0000
Subject: GUI refactoring 2

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@178 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../bku/online/applet/AppletHashDataDisplay.java   |    2 +-
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |   46 +-
 .../bku/online/applet/BrowserHelpListener.java     |   45 -
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUI.java   | 1146 ----------------
 .../java/at/gv/egiz/bku/gui/BKUGUIFactory.java     |   23 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 1306 ++++++++++++++++++
 .../at/gv/egiz/bku/gui/DefaultHelpListener.java    |    7 -
 .../at/gv/egiz/bku/gui/HashDataTableModel.java     |   93 +-
 .../java/at/gv/egiz/bku/gui/HashDataViewer.java    |   25 +-
 .../java/at/gv/egiz/bku/gui/HyperLinkRenderer.java |   47 -
 .../main/java/at/gv/egiz/bku/gui/ImagePanel.java   |    1 +
 .../main/java/at/gv/egiz/bku/gui/SimpleGUI.java    | 1410 --------------------
 .../gv/egiz/bku/gui/SimpleHashDataTableModel.java  |   60 -
 .../test/java/at/gv/egiz/bku/gui/BKUGUITest.java   |    5 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |  122 +-
 .../bku/local/stal/LocalSignRequestHandler.java    |    2 +-
 .../at/gv/egiz/bku/local/stal/SMCCSTALFactory.java |    2 +-
 .../java/at/gv/egiz/bku/local/app/BKULauncher.java |    6 +-
 18 files changed, 1459 insertions(+), 2889 deletions(-)
 delete mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHelpListener.java
 delete mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
 delete mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperLinkRenderer.java
 delete mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
 delete mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleHashDataTableModel.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
index ba502906..7be40d65 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
@@ -75,7 +75,7 @@ public class AppletHashDataDisplay extends SignRequestHandler {
     List<HashDataInput> verifiedHashDataInputs = verifyHashDataInput(signedReferences, hdi);
 
     if (verifiedHashDataInputs.size() > 0) {
-      gui.showHashDataInputDialog(verifiedHashDataInputs, this, "ok");
+      gui.showHashDataInputDialog(verifiedHashDataInputs, this, "hashDataDone");
     } else {
       throw new Exception("No signature data (apart from any QualifyingProperties or a Manifest)");
     }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 5b45c8e1..d0eed607 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -43,14 +43,13 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
    * Applet parameter keys
    */
   public static final String GUI_STYLE = "GuiStyle";
-  public final static String LOCALE_PARAM_KEY = "Locale";
-  public final static String LOGO_URL_KEY = "LogoURL";
+  public final static String LOCALE = "Locale";
   public final static String WSDL_URL = "WSDL_URL";
   public static final String HASHDATA_DISPLAY = "HashDataDisplay";
   public final static String HASHDATA_URL = "HashDataURL";
   public final static String HELP_URL = "HelpURL";
   public final static String SESSION_ID = "SessionID";
-  public static final String BACKGROUND_PARAM = "Background";
+  public static final String BACKGROUND_IMG = "Background";
   public static final String REDIRECT_URL = "RedirectURL";
   public static final String REDIRECT_TARGET = "RedirectTarget";
 //  public static final String HASHDATA_DISPLAY_INTERNAL = "internal";
@@ -76,6 +75,7 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
 
   /**
    * Factory method to create and wire HelpListener, GUI and BKUWorker.
+   * (Config via applet parameters as constants BKUApplet.*)
    */
   @Override
   public void init() {
@@ -84,30 +84,40 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
     
     HttpsURLConnection.setDefaultSSLSocketFactory(InternalSSLSocketFactory.getInstance());
     
-    String locale = getAppletParameter(LOCALE_PARAM_KEY);
-    String guiStyle = getAppletParameter(GUI_STYLE);
+    String locale = getAppletParameter(LOCALE);
+    if (locale != null) {
+      this.setLocale(new Locale(locale));
+    }
+    log.debug("setting locale to " + getLocale());
+
+    BKUGUIFacade.Style guiStyle;
+    if ("advanced".equals(getAppletParameter(GUI_STYLE))) { 
+      guiStyle = BKUGUIFacade.Style.advanced;
+    } else {
+      guiStyle = BKUGUIFacade.Style.simple;
+    }
+    
     URL backgroundImgURL = null;
+    try {
+      backgroundImgURL = getURLParameter(BACKGROUND_IMG);
+    } catch (MalformedURLException ex) {
+      log.warn("failed to load applet background image: " + ex.getMessage() + ", using default");
+    }
+    
     AbstractHelpListener helpListener = null;
     try {
-      URL helpURL = getURLParameter(HELP_URL); //, getAppletParameter(SESSION_ID));
+      URL helpURL = getURLParameter(HELP_URL); 
 //      helpListener = new BrowserHelpListener(getAppletContext(), helpURL, getLocale());
       helpListener = new DefaultHelpListener(getAppletContext(), helpURL, getLocale());
     } catch (MalformedURLException ex) {
       log.warn("failed to load help URL: " + ex.getMessage() + ", disabling help");
     }
-    try {
-      backgroundImgURL = getURLParameter(BACKGROUND_PARAM);
-    } catch (MalformedURLException ex) {
-      log.warn("failed to load applet background image: " + ex.getMessage() + ", using default");
-    }
     
-    if (locale != null) {
-      this.setLocale(new Locale(locale));
-    }
-    log.debug("setting locale to " + getLocale());
-
-    BKUGUIFacade gui = BKUGUIFactory.createGUI(getContentPane(), getLocale(), guiStyle, backgroundImgURL, helpListener);
-//    gui.init(getContentPane(), getLocale(), BKUGUIFacade.Style.advanced, backgroundImgURL, helpListener);
+    BKUGUIFacade gui = BKUGUIFactory.createGUI(getContentPane(), 
+            getLocale(), 
+            guiStyle, 
+            backgroundImgURL, 
+            helpListener);
 
     worker = new AppletBKUWorker(gui, getAppletContext(), this);
   }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHelpListener.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHelpListener.java
deleted file mode 100644
index 265acca0..00000000
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHelpListener.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.online.applet;
-
-import at.gv.egiz.bku.gui.AbstractHelpListener;
-import java.applet.AppletContext;
-import java.net.URL;
-import java.util.Locale;
-
-/**
- * 
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class BrowserHelpListener extends AbstractHelpListener {
-
-  protected AppletContext ctx;
-
-  public BrowserHelpListener(AppletContext ctx, URL helpURL, Locale locale) {
-    super(helpURL, locale);
-    if (ctx == null) {
-      throw new RuntimeException("no applet context provided");
-    }
-    this.ctx = ctx;
-  }
-
-  @Override
-  public void showDocument(URL helpDocument, String helpTopic) throws Exception {
-    ctx.showDocument(helpDocument, "_blank");
-  }
-}
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
deleted file mode 100644
index f68f2ece..00000000
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java
+++ /dev/null
@@ -1,1146 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.gui;
-
-import at.gv.egiz.smcc.PINSpec;
-import at.gv.egiz.stal.HashDataInput;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Font;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.Locale;
-import java.util.ResourceBundle;
-import javax.swing.GroupLayout;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JFileChooser;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.LayoutStyle;
-import javax.swing.SwingUtilities;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableModel;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- *
- * @author clemens
- */
-public class BKUGUI implements BKUGUIFacade {
-    
-    private static final Log log = LogFactory.getLog(BKUGUI.class);
-    
-    protected HelpMouseListener helpListener;
-    
-    protected Container contentPane;
-    protected ResourceBundle messages;
-    /** left and right side main panels */
-//    protected JPanel iconPanel;
-    protected JPanel contentPanel;
-    /** right side content panels and layouts */
-    protected JPanel headerPanel;
-    protected JPanel mainPanel;
-    protected JPanel buttonPanel;
-    /** right side fixed labels  */
-    protected JLabel titleLabel;
-    /** remember the pinfield to return to worker */
-    protected JPasswordField pinField;
-
-    protected int buttonSize;
-    
-    private static final int CHECKBOX_WIDTH = new JCheckBox().getPreferredSize().width;
-    
-    /**
-     * @param contentPane
-     * @param localeString may be null
-     */
-//    @Override
-    public void init(final Container contentPane, Locale locale, Style guiStyle, final URL background, ActionListener helpListener) {
-
-        if (locale != null) {
-            messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, locale);
-        } else {
-            messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
-        }
-
-        this.contentPane = contentPane;
-        registerHelpListener(helpListener);
-
-        try {
-
-          log.debug("scheduling gui initialization");
-      
-            SwingUtilities.invokeAndWait(new Runnable() {
-
-                @Override
-                public void run() {
-                  
-                  log.debug("initializing gui");
-
-//                    initIconPanel();
-                    initContentPanel(background);
-
-                    GroupLayout layout = new GroupLayout(contentPane);
-                    contentPane.setLayout(layout);
-                    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) {
-            throw new RuntimeException("Failed to init GUI: " + ex.getMessage());
-        }
-    }
-
-//    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(URL background) {
-
-      if (background == null) {
-        background = this.getClass().getResource(DEFAULT_BACKGROUND);
-      }
-      contentPanel = new ImagePanel(background);
-
-//        contentPanel.setBorder(new TitledBorder("content"));
-        
-        headerPanel = new JPanel();
-        headerPanel.setOpaque(false);
-        mainPanel = new JPanel();
-        mainPanel.setOpaque(false);
-        buttonPanel = new JPanel(); 
-        buttonPanel.setOpaque(false);
-
-//        headerPanel.setBorder(new TitledBorder("header"));
-//        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));
-        
-        JLabel helpLabel = new JLabel();
-        helpLabel.setIcon(new ImageIcon(getClass().getResource(HELP_IMG))); 
-        helpLabel.addMouseListener(helpListener);
-        helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-
-        JButton b = new JButton();
-        b.setText(messages.getString(BUTTON_CANCEL));
-        if (b.getPreferredSize().width > buttonSize)
-            buttonSize = b.getPreferredSize().width;
-        b.setText(messages.getString(BUTTON_OK));
-        if (b.getPreferredSize().width > buttonSize)
-            buttonSize = b.getPreferredSize().width;
-        b.setText(messages.getString(BUTTON_SIGN));
-        if (b.getPreferredSize().width > buttonSize)
-            buttonSize = b.getPreferredSize().width;
-        b.setText(messages.getString(BUTTON_BACK));
-        if (b.getPreferredSize().width > buttonSize)
-            buttonSize = b.getPreferredSize().width;
-        b.setText(messages.getString(BUTTON_SAVE));
-        if (b.getPreferredSize().width > buttonSize)
-            buttonSize = b.getPreferredSize().width;
-        
-//        if (cancelButton.getPreferredSize().width > buttonSize)
-//            buttonSize = cancelButton.getPreferredSize().width;
-//        if (signButton.getPreferredSize().width > buttonSize)
-//            buttonSize = signButton.getPreferredSize().width;
-//        if (backButton.getPreferredSize().width > buttonSize)
-//            buttonSize = backButton.getPreferredSize().width;
-//        if (saveButton.getPreferredSize().width > buttonSize)
-//            buttonSize = saveButton.getPreferredSize().width;
-
-        
-        GroupLayout headerPanelLayout = new GroupLayout(headerPanel);
-        headerPanel.setLayout(headerPanelLayout);
-
-        headerPanelLayout.setHorizontalGroup(
-          headerPanelLayout.createSequentialGroup()
-            .addComponent(titleLabel) 
-            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-            .addComponent(helpLabel));
-        headerPanelLayout.setVerticalGroup(
-          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) //SequentialGroup()
-            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
-            .addComponent(helpLabel));
-            
-
-        GroupLayout contentPanelLayout = new GroupLayout(contentPanel);
-        contentPanel.setLayout(contentPanelLayout);
-
-        contentPanelLayout.setHorizontalGroup(
-          contentPanelLayout.createSequentialGroup()
-            .addContainerGap()
-            .addGroup(
-              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))
-            .addContainerGap());
-        contentPanelLayout.setVerticalGroup(
-          contentPanelLayout.createSequentialGroup()
-            .addContainerGap()
-            .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)
-            .addContainerGap());
-    }
-
-    @Override
-    public Locale getLocale() {
-      return messages.getLocale();
-    }
-
-    @Override
-    public void showWelcomeDialog() {
-      
-      log.debug("scheduling welcome dialog");
-      
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-              
-              log.debug("show welcome dialog");
-              
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                titleLabel.setText(messages.getString(TITLE_WELCOME));
-
-                helpListener.setHelpTopic(HELP_WELCOME);
-                
-                JLabel welcomeMsgLabel = new JLabel();
-                welcomeMsgLabel.setFont(welcomeMsgLabel.getFont().deriveFont(welcomeMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                welcomeMsgLabel.setText(messages.getString(MESSAGE_WAIT));
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addComponent(welcomeMsgLabel));
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addComponent(welcomeMsgLabel));
-
-                contentPanel.validate();
-
-            }
-        });
-    }
-
-    @Override
-    public void showInsertCardDialog(final ActionListener cancelListener, final String cancelCommand) {
-      
-      log.debug("scheduling insert card dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-              
-              log.debug("show insert card dialog");
-      
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                titleLabel.setText(messages.getString(TITLE_INSERTCARD));
-
-                helpListener.setHelpTopic(HELP_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()
-                    .addComponent(insertCardMsgLabel));
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addComponent(insertCardMsgLabel));
-                
-                JButton cancelButton = new JButton();
-                cancelButton.setText(messages.getString(BUTTON_CANCEL));
-                cancelButton.addActionListener(cancelListener);
-                cancelButton.setActionCommand(cancelCommand);
-
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
-
-                buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-                buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                    .addComponent(cancelButton));
-
-                contentPanel.validate();
-            }
-        });
-    }
-
-    /**
-     * only difference to showInsertCard: title text: card not supported
-     * @param cancelListener
-     * @param cancelCommand
-     */
-    @Override
-    public void showCardNotSupportedDialog(final ActionListener cancelListener, final String cancelCommand) {
-        
-      log.debug("scheduling card not supported dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                
-              log.debug("show card not supported dialog");
-                
-              mainPanel.removeAll();
-              buttonPanel.removeAll();
-
-                titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
-
-                helpListener.setHelpTopic(HELP_CARDNOTSUPPORTED);
-              
-                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()
-                    .addComponent(insertCardMsgLabel));
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addComponent(insertCardMsgLabel));
-
-                JButton cancelButton = new JButton();
-                cancelButton.setText(messages.getString(BUTTON_CANCEL));
-                cancelButton.addActionListener(cancelListener);
-                cancelButton.setActionCommand(cancelCommand);
-
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
-
-                buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-                buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                    .addComponent(cancelButton));
-                
-                contentPanel.validate();
-            }
-        });
-    }
-
-    private void showCardPINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener okListener, final String okCommand, final ActionListener cancelListener, final String cancelCommand) {
-        
-      log.debug("scheduling card-pin dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-
-              log.debug("show card-pin dialog");
-      
-                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));
-                }
-
-                JButton cancelButton = new JButton();
-                cancelButton.setText(messages.getString(BUTTON_CANCEL));
-                cancelButton.setActionCommand(cancelCommand);
-                cancelButton.addActionListener(cancelListener);
-
-                JButton okButton = new JButton();
-                okButton.setText(messages.getString(BUTTON_OK));
-                okButton.setEnabled(false);
-                okButton.setActionCommand(okCommand);
-                okButton.addActionListener(okListener);
-
-                JLabel cardPinLabel = new JLabel();
-                cardPinLabel.setFont(cardPinLabel.getFont().deriveFont(cardPinLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                String pinLabel = messages.getString(LABEL_PIN);
-                cardPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
-
-                pinField = new JPasswordField();
-                pinField.setText("");
-                pinField.setDocument(new PINDocument(pinSpec, okButton));
-                pinField.setActionCommand(okCommand);
-                pinField.addActionListener(new ActionListener() {
-
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        if (pinField.getPassword().length >= pinSpec.getMinLength()) {
-                            okListener.actionPerformed(e);
-                        }
-                    }
-                });
-
-                JLabel infoLabel = new JLabel();
-                if (numRetries < 0) {
-                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                  String infoPattern = messages.getString(MESSAGE_ENTERPIN);
-                  infoLabel.setText(MessageFormat.format(infoPattern, new Object[] {pinSpec.getLocalizedName()}));
-                  helpListener.setHelpTopic(HELP_CARDPIN);
-                } else {
-                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                  infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
-                  infoLabel.setForeground(ERROR_COLOR);
-                  helpListener.setHelpTopic(HELP_RETRY);
-                }
-                
-                JLabel pinsizeLabel = new JLabel();
-                pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
-                String pinsizePattern = messages.getString(LABEL_PINSIZE);
-                String pinSize = String.valueOf(pinSpec.getMinLength());
-                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-                    pinSize += "-" + pinSpec.getMaxLength();
-                }
-                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
-                
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(infoLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                    .addGroup(mainPanelLayout.createSequentialGroup()
-                      .addComponent(cardPinLabel, 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(pinsizeLabel))));
-
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                      .addComponent(infoLabel)
-                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                        .addComponent(cardPinLabel)
-                        .addComponent(pinField))
-                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addComponent(pinsizeLabel));
-
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
-
-                buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                        .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));
-                buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
-                        .addComponent(okButton)
-                        .addComponent(cancelButton)); 
-
-                pinField.requestFocusInWindow();
-                contentPanel.validate();
-
-            }
-        });
-    }
-
-    @Override
-    public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
-        showCardPINDialog(pinSpec, -1, okListener, okCommand, cancelListener, cancelCommand);
-    }
-
-    @Override
-    public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
-        showCardPINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand);
-    }
-
-    @Override
-    public void showSignaturePINDialog(PINSpec pinSpec, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
-        showSignaturePINDialog(pinSpec, -1, signListener, signCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
-    }
-
-    @Override
-    public void showSignaturePINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
-        showSignaturePINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
-    }
-
-    private void showSignaturePINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener signListener, final String signCommand, final ActionListener cancelListener, final String cancelCommand, final ActionListener hashdataListener, final String hashdataCommand) {
-
-      log.debug("scheduling signature-pin dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-              
-              log.debug("show signature-pin dialog");
-      
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                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));
-                cancelButton.setActionCommand(cancelCommand);
-                cancelButton.addActionListener(cancelListener);
-
-                JButton signButton = new JButton();
-                signButton.setText(messages.getString(BUTTON_SIGN));
-                signButton.setEnabled(false);
-                signButton.setActionCommand(signCommand);
-                signButton.addActionListener(signListener);
-
-                JLabel signPinLabel = new JLabel();
-                signPinLabel.setFont(signPinLabel.getFont().deriveFont(signPinLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                String pinLabel = messages.getString(LABEL_PIN);
-                signPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
-
-                pinField = new JPasswordField();
-                pinField.setText("");
-                pinField.setDocument(new PINDocument(pinSpec, signButton));
-                pinField.setActionCommand(signCommand);
-                pinField.addActionListener(new ActionListener() {
-
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        if (pinField.getPassword().length >= pinSpec.getMinLength()) {
-                            signListener.actionPerformed(e);
-                        }
-                    }
-                });
-
-                JLabel pinsizeLabel = new JLabel();
-                pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
-                String pinsizePattern = messages.getString(LABEL_PINSIZE);
-                String pinSize = String.valueOf(pinSpec.getMinLength());
-                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-                    pinSize += "-" + pinSpec.getMaxLength();
-                }
-                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
-                
-                JLabel infoLabel = new JLabel();
-                if (numRetries < 0) {
-                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                  infoLabel.setText(messages.getString(MESSAGE_HASHDATALINK));
-                  infoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-                  infoLabel.setForeground(HYPERLINK_COLOR);
-                  infoLabel.addMouseListener(new MouseAdapter() {
-
-                      @Override
-                      public void mouseClicked(MouseEvent me) {
-                          ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
-                          hashdataListener.actionPerformed(e);
-                      }
-                  });
-                  helpListener.setHelpTopic(HELP_SIGNPIN);
-                } else {
-                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                  infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
-                  infoLabel.setForeground(ERROR_COLOR);
-                  helpListener.setHelpTopic(HELP_RETRY);
-                }
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(infoLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                    .addGroup(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(pinsizeLabel))));
-
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                        .addComponent(infoLabel)
-                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                        .addComponent(signPinLabel)
-                        .addComponent(pinField))
-                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addComponent(pinsizeLabel));
-
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
-
-                buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                        .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));
-                buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
-                        .addComponent(signButton)
-                        .addComponent(cancelButton)); 
-
-                pinField.requestFocusInWindow();
-                contentPanel.validate();
-
-            }
-        });
-    }
-
-    @Override
-    public void showErrorDialog(final String errorMsgKey, final Object[] errorMsgParams, final ActionListener okListener, final String okCommand) {
-        
-      log.debug("scheduling error dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-          @Override
-            public void run() {
-
-                log.debug("show error dialog");
-                
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                titleLabel.setText(messages.getString(TITLE_ERROR));
-
-                helpListener.setHelpTopic(errorMsgKey);
-                
-                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);
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addComponent(errorMsgLabel));
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addComponent(errorMsgLabel));
-
-                JButton okButton = new JButton();
-                okButton.setText(messages.getString(BUTTON_OK));
-                okButton.setActionCommand(okCommand);
-                okButton.addActionListener(okListener);
-
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
-
-                buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-                buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                    .addComponent(okButton));
-
-                contentPanel.validate();
-            }
-        });
-    }
-
-    @Override
-    public void showErrorDialog(final String errorMsgKey, final Object[] errorMsgParams) {
-      
-      log.debug("scheduling error  dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-        @Override
-        public void run() {
-          
-          log.debug("show error dialog");
-      
-          mainPanel.removeAll();
-          buttonPanel.removeAll();
-
-          titleLabel.setText(messages.getString(TITLE_ERROR));
-
-          helpListener.setHelpTopic(errorMsgKey);
-          
-          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);
-
-          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-          mainPanel.setLayout(mainPanelLayout);
-
-          mainPanelLayout.setHorizontalGroup(
-            mainPanelLayout.createSequentialGroup()
-              .addComponent(errorMsgLabel));
-          mainPanelLayout.setVerticalGroup(
-            mainPanelLayout.createSequentialGroup()
-              .addComponent(errorMsgLabel));
-
-          contentPanel.validate();
-        }
-      });
-    }
-
-    @Override
-    public void showWaitDialog(final String waitMessage) {
-        
-      log.debug("scheduling wait dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-        
-              log.debug("show wait dialog");
-              
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                titleLabel.setText(messages.getString(TITLE_WAIT));
-
-                helpListener.setHelpTopic(HELP_WAIT);
-                
-                JLabel waitMsgLabel = new JLabel();
-                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                if (waitMessage != null) {
-                    waitMsgLabel.setText("<html>" + waitMessage + "</html>");
-                } else {
-                    waitMsgLabel.setText(messages.getString(MESSAGE_WAIT));
-                }
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addComponent(waitMsgLabel));
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addComponent(waitMsgLabel));
-
-                contentPanel.validate();
-            }
-        });
-    }
-
-    @Override
-    public char[] getPin() {
-        if (pinField != null) {
-            return pinField.getPassword();
-        }
-        return null;
-    }
-    
-    @Override
-    public void showHashDataInputDialog(final List<HashDataInput> signedReferences, final ActionListener okListener, final String okCommand) {
-      
-      if (signedReferences == null) {
-        showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {"No SignedReferences provided"}, okListener, okCommand);
-      }
-      
-      if (signedReferences.size() == 1) {
-
-          if ("text/plain".equals(signedReferences.get(0).getMimeType())) {
-            
-            ActionListener saveHashDataListener = new ActionListener() {
-
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
-                }
-            };
-            
-            try {
-              String hashDataText = getText(signedReferences.get(0));
-              showPlainTextHashDataInputDialog(hashDataText, saveHashDataListener, "save", okListener, okCommand);
-            } catch (IOException ex) {
-              showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {ex.getMessage()}, okListener, okCommand);
-            }
-          
-          } else {
-            showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
-          }
-          
-      } else {
-
-        final HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
-
-        ActionListener saveHashDataListener = new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-              showSaveHashDataInputDialog(tableModel.getSelectedHashData(), okListener, okCommand);
-            }
-        };
-        showMultipleHashDataInputDialog(tableModel, okListener, okCommand, saveHashDataListener, "save");
-      }
-    }
-    
-    private void showPlainTextHashDataInputDialog(final String hashDataText, final ActionListener saveListener, final String saveCommand, final ActionListener cancelListener, final String cancelCommand) {
-      
-      log.debug("scheduling plaintext hashdatainput dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-        @Override
-        public void run() {
-          
-          log.debug("show plaintext hashdatainput dialog");
-      
-          mainPanel.removeAll();
-          buttonPanel.removeAll();
-
-          titleLabel.setText(messages.getString(TITLE_HASHDATA));
-
-          helpListener.setHelpTopic(HELP_HASHDATA);
-
-          JLabel refIdLabel = new JLabel();
-          refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-          refIdLabel.setText(messages.getString(MESSAGE_HASHDATA)); //MessageFormat.format(refIdLabelPattern, new Object[]{refId}));
-
-          JTextArea hashDataTextArea = new JTextArea(hashDataText);
-          hashDataTextArea.setEditable(false);
-//          hashDataTextArea.setColumns(1);
-//          hashDataTextArea.setRows(1);
-          hashDataTextArea.setFont(new Font(HASHDATA_FONT, hashDataTextArea.getFont().getStyle(), hashDataTextArea.getFont().getSize()));
-//          hashDataScrollPane.setViewportView(hashDataTextArea);
-//          hashDataScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); //HORIZONTAL_SCROLLBAR_NEVER);
-          hashDataTextArea.setLineWrap(true);
-          hashDataTextArea.setWrapStyleWord(true);
-
-          JScrollPane hashDataScrollPane = new JScrollPane(hashDataTextArea);
-
-          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-          mainPanel.setLayout(mainPanelLayout);
-
-          mainPanelLayout.setHorizontalGroup(
-             mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                .addComponent(refIdLabel)
-              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
-
-          mainPanelLayout.setVerticalGroup(
-            mainPanelLayout.createSequentialGroup()
-                .addComponent(refIdLabel)
-              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
-
-          JButton backButton = new JButton();
-          backButton.setText(messages.getString(BUTTON_BACK));
-          backButton.setActionCommand(cancelCommand);
-          backButton.addActionListener(cancelListener);
-
-          JButton saveButton = new JButton();
-          saveButton.setText(messages.getString(BUTTON_SAVE));
-          saveButton.setActionCommand(saveCommand);
-          saveButton.addActionListener(saveListener);
-
-          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-          buttonPanel.setLayout(buttonPanelLayout);
-
-          buttonPanelLayout.setHorizontalGroup(
-            buttonPanelLayout.createSequentialGroup()
-                  .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));
-          buttonPanelLayout.setVerticalGroup(
-            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
-                  .addComponent(saveButton)
-                  .addComponent(backButton)); 
-
-          contentPanel.validate();
-        }
-      });
-    }
-
-    private void showMultipleHashDataInputDialog(final TableModel signedReferences, final ActionListener cancelListener, final String cancelCommand, final ActionListener saveListener, final String saveCommand) {
-      
-      log.debug("scheduling multiple hashdatainput dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-        @Override
-        public void run() {
-          
-          log.debug("show multiple hashdatainput dialog");
-          
-          mainPanel.removeAll();
-          buttonPanel.removeAll();
-
-          titleLabel.setText(messages.getString(TITLE_HASHDATA));
-
-          helpListener.setHelpTopic(HELP_HASHDATALIST);
-          
-          JLabel refIdLabel = new JLabel();
-          refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-          String refIdLabelPattern = messages.getString(MESSAGE_HASHDATALIST);
-          refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{signedReferences.getRowCount()}));
-
-          JTable hashDataTable = new JTable();
-          hashDataTable.setModel(signedReferences);
-          hashDataTable.setTableHeader(null);
-  //        hashDataTable.setShowVerticalLines(false);
-  //        hashDataTable.setRowSelectionAllowed(false);
-          TableColumn selectCol = hashDataTable.getColumnModel().getColumn(1);
-          selectCol.setMinWidth(CHECKBOX_WIDTH);
-          selectCol.setMaxWidth(CHECKBOX_WIDTH);
-
-
-//          hashDataTable.setPreferredScrollableViewportSize(mainPanel.getPreferredSize());
-
-          JScrollPane hashDataScrollPane = new JScrollPane(hashDataTable);
-
-          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-          mainPanel.setLayout(mainPanelLayout);
-
-          mainPanelLayout.setHorizontalGroup(
-            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                .addComponent(refIdLabel)
-              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
-
-          mainPanelLayout.setVerticalGroup(
-            mainPanelLayout.createSequentialGroup()
-                .addComponent(refIdLabel)
-              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-              .addComponent(hashDataScrollPane, 0, 0, hashDataTable.getPreferredSize().height+3));
-          
-          JButton backButton = new JButton();
-          backButton.setText(messages.getString(BUTTON_BACK));
-          backButton.setActionCommand(cancelCommand);
-          backButton.addActionListener(cancelListener);
-
-          JButton saveButton = new JButton();
-          saveButton.setText(messages.getString(BUTTON_SAVE));
-          saveButton.setActionCommand(saveCommand);
-          saveButton.addActionListener(saveListener);
-
-          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-          buttonPanel.setLayout(buttonPanelLayout);
-
-          buttonPanelLayout.setHorizontalGroup(
-            buttonPanelLayout.createSequentialGroup()
-                  .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));
-          buttonPanelLayout.setVerticalGroup(
-            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
-                  .addComponent(saveButton)
-                  .addComponent(backButton)); 
-
-          contentPanel.validate();
-        }
-      });
-    }
-
-    private void showSaveHashDataInputDialog(final List<HashDataInput> signedRefs, final ActionListener okListener, final String okCommand) {
-      
-      log.debug("scheduling save hashdatainput dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-        @Override
-        public void run() {
-          
-          log.debug("show save hashdatainput dialog");
-      
-          String userHome = System.getProperty("user.home");
-          
-          JFileChooser fileDialog = new JFileChooser(userHome); 
-          fileDialog.setMultiSelectionEnabled(false);
-          fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
-          fileDialog.setFileHidingEnabled(true);
-          if (signedRefs.size() == 1) {
-            fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVE));
-            fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
-            String mimeType = signedRefs.get(0).getMimeType();
-            MimeFilter mimeFilter = new MimeFilter(mimeType, messages);
-            fileDialog.setFileFilter(mimeFilter);
-            String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + MimeFilter.getExtension(mimeType);
-            fileDialog.setSelectedFile(new File(userHome, filename));
-          } else {
-            fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVEDIR));
-            fileDialog.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-          }
-          
-          //parent contentPane -> placed over applet
-          switch (fileDialog.showSaveDialog(fileDialog)) {
-            case JFileChooser.APPROVE_OPTION:
-              File f = fileDialog.getSelectedFile();
-              for (HashDataInput hashDataInput : signedRefs) {
-                String mimeType = hashDataInput.getMimeType();
-                String id = hashDataInput.getReferenceId();
-                File file;
-                if (f.isDirectory()) {
-                  String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + '_' + id + MimeFilter.getExtension(mimeType);
-                  file = new File(f, filename);
-                } else {
-                  file = f;
-                }
-                if (file.exists()) {
-                  String ovrwrt = messages.getString(MESSAGE_OVERWRITE);
-                  int overwrite = JOptionPane.showConfirmDialog(fileDialog, MessageFormat.format(ovrwrt, file), messages.getString(WINDOWTITLE_OVERWRITE), JOptionPane.OK_CANCEL_OPTION);
-                  if (overwrite != JOptionPane.OK_OPTION) {
-                    continue;
-                  }
-                }
-                if (log.isDebugEnabled()) {
-                    log.debug("Writing HashDataInput " + id + " (" + mimeType + ") to file " + file);
-                }
-                FileOutputStream fos = null;
-                try {
-                    fos = new FileOutputStream(file);
-                    BufferedOutputStream bos = new BufferedOutputStream(fos);
-                    InputStream hdi = hashDataInput.getHashDataInput();
-                    int b;
-                    while ((b = hdi.read()) != -1) {
-                        bos.write(b);
-                    }
-                    bos.flush();
-                    bos.close();
-                } catch (IOException ex) {
-                    log.error("Failed to write HashDataInput to file " + file + ": " + ex.getMessage());
-                    showErrorDialog(ERR_WRITE_HASHDATA, new Object[] {ex.getMessage()}, null, null);
-                    ex.printStackTrace();
-                } finally {
-                    try {
-                        fos.close();
-                    } catch (IOException ex) {
-                    }
-                }    
-              }  
-          }
-          log.debug("done saving hashdatainput");
-          okListener.actionPerformed(new ActionEvent(fileDialog, ActionEvent.ACTION_PERFORMED, okCommand));
-        }
-      });
-    }
-    
-    private static String getText(HashDataInput hdi) throws IOException {
-      ByteArrayOutputStream baos = null;
-      try {
-        InputStream hashDataIS = hdi.getHashDataInput();
-        if (hashDataIS == null) {
-          log.error("No HashDataInput stream for reference " + hdi.getReferenceId());
-          return null;
-        } else {
-          baos = new ByteArrayOutputStream(hashDataIS.available());
-          int c;
-          while ((c = hashDataIS.read()) != -1) {
-              baos.write(c);
-          }
-          String encoding = hdi.getEncoding();
-          if (encoding == null) {
-            //default for URL-encoded
-            encoding = "UTF-8";
-          }
-          return baos.toString(encoding);
-        }
-      } catch (IOException ex) {
-          log.error("Failed to read HashDataInput for reference " + hdi.getReferenceId() + ": " + ex.getMessage());
-          throw ex; 
-      } finally {
-          try {
-              baos.close();
-          } catch (IOException ex) {
-          }
-      }
-    }
-    
-    private void registerHelpListener(ActionListener helpListener) {
-      if (helpListener != null) {
-        this.helpListener = new HelpMouseListener(helpListener);
-      } else {
-        log.error("no help listener provided, will not be able to display help");
-        this.helpListener = new HelpMouseListener(new ActionListener() {
-
-          @Override
-          public void actionPerformed(ActionEvent e) {
-            log.error("no help listener registered (requested help topic: " + e.getActionCommand() + ")");
-          }
-        });
-      }
-    }
-}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
index f4981614..998aaa86 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
@@ -24,22 +24,11 @@ import java.util.Locale;
 
 public class BKUGUIFactory {
   
-  public static final String SIMPLE_GUI = "simple";
-  public static final String ADVANCED_GUI = "advanced";
-  
-//  private static BKUGUIFactory instance = new BKUGUIFactory();
-
-//  private BKUGUIFactory() {
-//  }
-//
-//  protected BKUGUIFacade createNewGUI(Container contentPane, Locale locale, String style, URL background, ActionListener helpListener) {
-//    
-//  }
-
-  public static BKUGUIFacade createGUI(Container contentPane, Locale locale, String style, URL background, ActionListener helpListener) {
-    if (ADVANCED_GUI.equals(style)) {
-      return new SimpleGUI(contentPane, locale, BKUGUIFacade.Style.advanced, background, helpListener);
-    }
-    return new SimpleGUI(contentPane, locale, BKUGUIFacade.Style.simple, background, helpListener);
+  public static BKUGUIFacade createGUI(Container contentPane, 
+          Locale locale, 
+          BKUGUIFacade.Style style, 
+          URL background, 
+          ActionListener helpListener) {
+    return new BKUGUIImpl(contentPane, locale, style, background, helpListener);
   }
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
new file mode 100644
index 00000000..9d23315c
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -0,0 +1,1306 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.stal.HashDataInput;
+import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
+import java.awt.Container;
+import java.awt.Cursor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
+import javax.swing.CellRendererPane;
+import javax.swing.GroupLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPasswordField;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.LayoutStyle;
+import javax.swing.SwingUtilities;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableModel;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author clemens
+ */
+public class BKUGUIImpl implements BKUGUIFacade {
+    
+    private static final Log log = LogFactory.getLog(BKUGUIImpl.class);
+
+    protected HelpMouseListener helpListener;
+    
+    protected Container contentPane;
+    protected ResourceBundle messages;
+    /** left and right side main panels */
+    protected JPanel iconPanel;
+    protected JPanel contentPanel;
+    /** right side content panels and layouts */
+    protected JPanel headerPanel;
+    protected JPanel mainPanel;
+    protected JPanel buttonPanel;
+    /** right side fixed labels  */
+    protected JLabel titleLabel;
+    protected JLabel helpLabel;
+    /** remember the pinfield to return to worker */
+    protected JPasswordField pinField;
+
+    protected int buttonSize;
+    
+    /** gui style config (default 'simple') */
+    protected boolean renderHeaderPanel = false;
+    protected boolean renderIconPanel = false;
+    protected boolean renderCancelButton = false;
+
+    /**
+     * set contentPane
+     * init message bundle
+     * configure the style 
+     * register the help listener
+     * create GUI (on event-dispatching thread)
+     * 
+     * @param contentPane
+     * @param locale
+     * @param guiStyle
+     * @param background
+     * @param helpListener
+     */
+    public BKUGUIImpl(Container contentPane, 
+            Locale locale, 
+            Style guiStyle, 
+            URL background, 
+            ActionListener helpListener) {
+      this.contentPane = contentPane;
+
+      if (locale != null) {
+          messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, locale);
+      } else {
+          messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
+      }
+
+      if (guiStyle == Style.advanced) {
+        renderHeaderPanel = true;
+        renderIconPanel = false;
+        renderCancelButton = true;
+      }
+
+      registerHelpListener(helpListener);
+      
+      createGUI(background);
+    }
+    
+    private void createGUI(final URL background) {
+
+        try {
+
+          log.debug("scheduling gui initialization");
+      
+            SwingUtilities.invokeAndWait(new Runnable() {
+
+                @Override
+                public void run() {
+                  
+                  log.debug("initializing gui");
+
+                  if (renderIconPanel) {
+                    initIconPanel(background);
+                    initContentPanel(null);
+                  } else {
+                    initContentPanel(background);
+                  }
+                  
+                  GroupLayout layout = new GroupLayout(contentPane);
+                  contentPane.setLayout(layout);
+                  
+                  if (renderIconPanel) {
+                    layout.setHorizontalGroup(layout.createSequentialGroup()
+                        .addComponent(iconPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
+                        .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));
+                  } else {
+                    layout.setHorizontalGroup(layout.createSequentialGroup().addComponent(contentPanel));
+                    layout.setVerticalGroup(layout.createSequentialGroup().addComponent(contentPanel));
+                  }
+                }
+            });
+        } catch (Exception ex) {
+            throw new RuntimeException("Failed to init GUI: " + ex.getMessage());
+        }
+    }
+    
+    protected void initIconPanel(URL background) {
+      if (background == null) {
+        background = getClass().getResource(DEFAULT_BACKGROUND);
+      }
+      if ("file".equals(background.getProtocol())) {
+        log.warn("file:// background images not permitted: " + background);
+        background = getClass().getResource(DEFAULT_BACKGROUND);
+      }
+      log.debug("loading icon panel background " + background);
+      
+      iconPanel = new JPanel();
+      JLabel iconLabel = new JLabel();
+      iconLabel.setIcon(new ImageIcon(background));
+
+      GroupLayout iconPanelLayout = new GroupLayout(iconPanel);
+      iconPanel.setLayout(iconPanelLayout);
+      iconPanelLayout.setHorizontalGroup(
+        iconPanelLayout.createSequentialGroup()
+          .addContainerGap()
+          .addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
+          // no gap here (contentPanel has containerGap)
+      iconPanelLayout.setVerticalGroup(
+        iconPanelLayout.createSequentialGroup()
+          .addContainerGap()
+          .addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE));
+    }
+
+    protected void initContentPanel(URL background) { 
+
+      if (background == null) {
+        background = getClass().getResource(DEFAULT_BACKGROUND);
+      }
+      if ("file".equals(background.getProtocol())) {
+        log.warn("file:// background images not permitted: " + background);
+        background = getClass().getResource(DEFAULT_BACKGROUND);
+      }
+      log.debug("loading background " + background);
+      contentPanel = new ImagePanel(background);
+
+      mainPanel = new JPanel();
+      mainPanel.setOpaque(false);
+      buttonPanel = new JPanel(); 
+      buttonPanel.setOpaque(false);
+
+      helpLabel = new JLabel();
+      helpLabel.setIcon(new ImageIcon(getClass().getResource(HELP_IMG))); 
+      helpLabel.getAccessibleContext().setAccessibleName(messages.getString(ALT_HELP));
+      helpLabel.addMouseListener(helpListener);
+      helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+    
+      buttonSize = initButtonSize(messages, renderCancelButton);
+        
+      if (renderHeaderPanel) {
+        headerPanel = new JPanel();
+        headerPanel.setOpaque(false);
+
+        titleLabel = new JLabel();
+        titleLabel.setFont(titleLabel.getFont().deriveFont(titleLabel.getFont().getStyle() |
+          java.awt.Font.BOLD, titleLabel.getFont().getSize() + 2));
+
+        GroupLayout headerPanelLayout = new GroupLayout(headerPanel);
+        headerPanel.setLayout(headerPanelLayout);
+
+        headerPanelLayout.setHorizontalGroup(
+          headerPanelLayout.createSequentialGroup()
+            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
+            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+            .addComponent(helpLabel));
+        headerPanelLayout.setVerticalGroup(
+          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
+            .addComponent(helpLabel));
+      }
+
+      GroupLayout contentPanelLayout = new GroupLayout(contentPanel);
+      contentPanel.setLayout(contentPanelLayout);
+
+      GroupLayout.ParallelGroup horizontalContentInner = contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+      if (renderHeaderPanel) {
+        horizontalContentInner
+                .addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE);
+      }
+      horizontalContentInner
+              .addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+              .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE);
+      GroupLayout.SequentialGroup horizontalContentOuter = contentPanelLayout.createSequentialGroup();
+      if (!renderIconPanel) {
+        horizontalContentOuter
+                .addContainerGap();
+      }
+      horizontalContentOuter
+              .addGroup(horizontalContentInner)
+              .addContainerGap();
+      contentPanelLayout.setHorizontalGroup(horizontalContentOuter);
+      
+      GroupLayout.SequentialGroup verticalContent = contentPanelLayout.createSequentialGroup();
+      verticalContent.addContainerGap();
+      if (renderHeaderPanel) {
+        verticalContent.addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
+      }
+      verticalContent.addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 
+        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
+        .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+        .addContainerGap();
+      contentPanelLayout.setVerticalGroup(verticalContent);
+    }
+
+    @Override
+    public Locale getLocale() {
+      return messages.getLocale();
+    }
+
+    @Override
+    public void showWelcomeDialog() {
+      
+      log.debug("scheduling welcome dialog");
+      
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+              
+              log.debug("show welcome dialog");
+              
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+                helpListener.setHelpTopic(HELP_WELCOME);
+                
+                JLabel welcomeMsgLabel = new JLabel();
+                welcomeMsgLabel.setFont(welcomeMsgLabel.getFont().deriveFont(welcomeMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                
+                if (renderHeaderPanel) {
+                  titleLabel.setText(messages.getString(TITLE_WELCOME));
+                  welcomeMsgLabel.setText(messages.getString(MESSAGE_WAIT));
+                } else {
+                  welcomeMsgLabel.setText(messages.getString(TITLE_WELCOME));   
+                }
+                
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
+                        .addComponent(welcomeMsgLabel);
+                GroupLayout.Group messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                        .addComponent(welcomeMsgLabel);
+                if (!renderHeaderPanel) {
+                  messageHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel); 
+                  messageVertical
+                          .addComponent(helpLabel);
+                }
+
+                mainPanelLayout.setHorizontalGroup(messageHorizontal);
+                mainPanelLayout.setVerticalGroup(messageVertical);
+                
+                contentPanel.validate();
+
+            }
+        });
+    }
+
+    @Override
+    public void showInsertCardDialog(final ActionListener cancelListener, final String cancelCommand) {
+      
+      log.debug("scheduling insert card dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+              
+              log.debug("show insert card dialog");
+      
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+                if (renderHeaderPanel) {
+                  titleLabel.setText(messages.getString(TITLE_INSERTCARD));
+                }
+                
+                helpListener.setHelpTopic(HELP_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);
+
+                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
+                        .addComponent(insertCardMsgLabel);
+                GroupLayout.ParallelGroup messageVertical = mainPanelLayout.createParallelGroup()
+                        .addComponent(insertCardMsgLabel);
+                
+                if (!renderHeaderPanel) {
+                  messageHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel);    
+                  messageVertical
+                          .addComponent(helpLabel);
+                }
+                
+                mainPanelLayout.setHorizontalGroup(messageHorizontal);
+                mainPanelLayout.setVerticalGroup(messageVertical);
+                
+                if (renderCancelButton) {
+                  JButton cancelButton = new JButton();
+                  cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                  cancelButton.addActionListener(cancelListener);
+                  cancelButton.setActionCommand(cancelCommand);
+
+                  GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                  buttonPanel.setLayout(buttonPanelLayout);
+
+                  buttonPanelLayout.setHorizontalGroup(
+                    buttonPanelLayout.createSequentialGroup()
+                          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+                  buttonPanelLayout.setVerticalGroup(
+                    buttonPanelLayout.createSequentialGroup()
+                      .addComponent(cancelButton));
+                }
+
+                contentPanel.validate();
+            }
+        });
+    }
+
+    /**
+     * only difference to showInsertCard: title text: card not supported
+     * @param cancelListener
+     * @param cancelCommand
+     */
+    @Override
+    public void showCardNotSupportedDialog(final ActionListener cancelListener, final String cancelCommand) {
+        
+      log.debug("scheduling card not supported dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                
+              log.debug("show card not supported dialog");
+                
+              mainPanel.removeAll();
+              buttonPanel.removeAll();
+
+              JLabel insertCardMsgLabel = new JLabel();
+              insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+
+              if (renderHeaderPanel) {
+                titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
+                insertCardMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD));
+              } else {
+                insertCardMsgLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED)); 
+              }
+
+              helpListener.setHelpTopic(HELP_CARDNOTSUPPORTED);
+              
+              GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+              mainPanel.setLayout(mainPanelLayout);
+
+              GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
+                      .addComponent(insertCardMsgLabel);
+              GroupLayout.Group messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(insertCardMsgLabel);
+              if (!renderHeaderPanel) {
+                messageHorizontal
+                        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                        .addComponent(helpLabel);
+                messageVertical
+                        .addComponent(helpLabel);
+              } 
+              
+              mainPanelLayout.setHorizontalGroup(messageHorizontal);
+              mainPanelLayout.setVerticalGroup(messageVertical);
+                
+              if (renderCancelButton) {
+                JButton cancelButton = new JButton();
+                cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                cancelButton.addActionListener(cancelListener);
+                cancelButton.setActionCommand(cancelCommand);
+
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                buttonPanelLayout.setHorizontalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+                buttonPanelLayout.setVerticalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                    .addComponent(cancelButton));
+              }
+              
+              contentPanel.validate();
+            }
+        });
+    }
+
+    private void showCardPINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener okListener, final String okCommand, final ActionListener cancelListener, final String cancelCommand) {
+        
+      log.debug("scheduling card-pin dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+
+              log.debug("show card-pin dialog");
+      
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+                if (renderHeaderPanel) {
+                  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 okButton = new JButton();
+                okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                okButton.setText(messages.getString(BUTTON_OK));
+                okButton.setEnabled(false);
+                okButton.setActionCommand(okCommand);
+                okButton.addActionListener(okListener);
+
+                JLabel cardPinLabel = new JLabel();
+                cardPinLabel.setFont(cardPinLabel.getFont().deriveFont(cardPinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                String pinLabel = messages.getString(LABEL_PIN);
+                cardPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
+
+                pinField = new JPasswordField();
+                pinField.setText("");
+                pinField.setDocument(new PINDocument(pinSpec, okButton));
+                pinField.setActionCommand(okCommand);
+                pinField.addActionListener(new ActionListener() {
+
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        if (pinField.getPassword().length >= pinSpec.getMinLength()) {
+                            okListener.actionPerformed(e);
+                        }
+                    }
+                });
+
+                JLabel infoLabel = new JLabel();
+                if (numRetries < 0) {
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  String infoPattern = messages.getString(MESSAGE_ENTERPIN);
+                  infoLabel.setText(MessageFormat.format(infoPattern, new Object[] {pinSpec.getLocalizedName()}));
+                  helpListener.setHelpTopic(HELP_CARDPIN);
+                } else {
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                  infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
+                  infoLabel.setForeground(ERROR_COLOR);
+                  helpListener.setHelpTopic(HELP_RETRY);
+                }
+                
+                JLabel pinsizeLabel = new JLabel();
+                pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
+                String pinsizePattern = messages.getString(LABEL_PINSIZE);
+                String pinSize = String.valueOf(pinSpec.getMinLength());
+                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+                    pinSize += "-" + pinSpec.getMaxLength();
+                }
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+                GroupLayout.SequentialGroup pinHorizontal = mainPanelLayout.createSequentialGroup()
+                      .addComponent(cardPinLabel, 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(pinsizeLabel));
+                
+                GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
+                
+                if (!renderHeaderPanel) {
+                  GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
+                          .addComponent(infoLabel) //, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel); //, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                  mainHorizontal
+                          .addGroup(infoHorizontal)
+                          .addGroup(pinHorizontal);
+                  GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                          .addComponent(infoLabel)
+                          .addComponent(helpLabel);
+                  mainVertical
+                          .addGroup(infoVertical)
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
+                } else {
+                  mainHorizontal
+                          .addGroup(pinHorizontal);
+                }
+
+                mainVertical
+                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                    .addComponent(cardPinLabel)
+                    .addComponent(pinField))
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                  .addComponent(pinsizeLabel);
+                
+                mainPanelLayout.setHorizontalGroup(mainHorizontal);
+                mainPanelLayout.setVerticalGroup(mainVertical);
+                
+                
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
+                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                GroupLayout.Group buttonVertical;
+                
+                if (renderCancelButton) {
+                  JButton cancelButton = new JButton();
+                  cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                  cancelButton.setActionCommand(cancelCommand);
+                  cancelButton.addActionListener(cancelListener);
+
+                  buttonHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                  buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
+                          .addComponent(okButton)
+                          .addComponent(cancelButton); 
+                } else {
+                  buttonVertical = buttonPanelLayout.createSequentialGroup()
+                          .addComponent(okButton);
+                }
+                
+                buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
+                buttonPanelLayout.setVerticalGroup(buttonVertical);
+
+                pinField.requestFocusInWindow();
+                contentPanel.validate();
+
+            }
+        });
+    }
+
+    @Override
+    public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
+        showCardPINDialog(pinSpec, -1, okListener, okCommand, cancelListener, cancelCommand);
+    }
+
+    @Override
+    public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
+        showCardPINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand);
+    }
+
+    @Override
+    public void showSignaturePINDialog(PINSpec pinSpec, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
+        showSignaturePINDialog(pinSpec, -1, signListener, signCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
+    }
+
+    @Override
+    public void showSignaturePINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
+        showSignaturePINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
+    }
+
+    private void showSignaturePINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener signListener, final String signCommand, final ActionListener cancelListener, final String cancelCommand, final ActionListener hashdataListener, final String hashdataCommand) {
+
+      log.debug("scheduling signature-pin dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+              
+              log.debug("show signature-pin dialog");
+      
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+                
+                if (renderHeaderPanel) {
+                  if (numRetries < 0) {
+                      titleLabel.setText(messages.getString(TITLE_SIGN));
+                  } else {
+                      titleLabel.setText(messages.getString(TITLE_RETRY));
+                  }
+                }
+
+                JButton signButton = new JButton();
+                signButton.setFont(signButton.getFont().deriveFont(signButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                signButton.setText(messages.getString(BUTTON_SIGN));
+                signButton.setEnabled(false);
+                signButton.setActionCommand(signCommand);
+                signButton.addActionListener(signListener);
+
+                JLabel signPinLabel = new JLabel();
+                signPinLabel.setFont(signPinLabel.getFont().deriveFont(signPinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                String pinLabel = messages.getString(LABEL_PIN);
+                signPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
+
+                pinField = new JPasswordField();
+                pinField.setText("");
+                pinField.setDocument(new PINDocument(pinSpec, signButton));
+                pinField.setActionCommand(signCommand);
+                pinField.addActionListener(new ActionListener() {
+
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        if (pinField.getPassword().length >= pinSpec.getMinLength()) {
+                            signListener.actionPerformed(e);
+                        }
+                    }
+                });
+
+                JLabel pinsizeLabel = new JLabel();
+                pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
+                String pinsizePattern = messages.getString(LABEL_PINSIZE);
+                String pinSize = String.valueOf(pinSpec.getMinLength());
+                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+                    pinSize += "-" + pinSpec.getMaxLength();
+                }
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+
+                JLabel infoLabel = new JLabel();
+                if (numRetries < 0) {
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  infoLabel.setText(messages.getString(MESSAGE_HASHDATALINK));
+                  infoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                  infoLabel.setForeground(HYPERLINK_COLOR);
+                  infoLabel.addMouseListener(new MouseAdapter() {
+
+                      @Override
+                      public void mouseClicked(MouseEvent me) {
+                          ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
+                          hashdataListener.actionPerformed(e);
+                      }
+                  });
+                  helpListener.setHelpTopic(HELP_SIGNPIN);
+                } else {
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                  infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
+                  infoLabel.setForeground(ERROR_COLOR);
+                  helpListener.setHelpTopic(HELP_RETRY);
+                }
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+                
+                GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
+                        .addComponent(infoLabel);
+                GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                        .addComponent(infoLabel);
+                       
+                if (!renderHeaderPanel) {
+                  infoHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel); //, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
+                  infoVertical
+                          .addComponent(helpLabel);
+                }
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addGroup(infoHorizontal)
+                    .addGroup(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(pinsizeLabel))));
+
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createSequentialGroup()
+                    .addGroup(infoVertical)
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                        .addComponent(signPinLabel)
+                        .addComponent(pinField))
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addComponent(pinsizeLabel));
+
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
+                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(signButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                GroupLayout.Group buttonVertical;
+                
+                if (renderCancelButton) {
+                  JButton cancelButton = new JButton();
+                  cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                  cancelButton.setActionCommand(cancelCommand);
+                  cancelButton.addActionListener(cancelListener);
+
+                  buttonHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                  
+                  buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                          .addComponent(signButton)
+                          .addComponent(cancelButton); 
+                } else {
+                  buttonVertical = buttonPanelLayout.createSequentialGroup()
+                          .addComponent(signButton);
+                }
+                
+                buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
+                buttonPanelLayout.setVerticalGroup(buttonVertical);
+
+                pinField.requestFocusInWindow();
+                contentPanel.validate();
+
+            }
+        });
+    }
+
+    @Override
+    public void showErrorDialog(final String errorMsgKey, final Object[] errorMsgParams, final ActionListener okListener, final String okCommand) {
+        
+      log.debug("scheduling error dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+          @Override
+            public void run() {
+
+                log.debug("show error dialog");
+                
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+                if (renderHeaderPanel) {
+                  titleLabel.setText(messages.getString(TITLE_ERROR));
+                }
+
+                helpListener.setHelpTopic(errorMsgKey);
+                
+                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);
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+                GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
+                
+                if (!renderHeaderPanel) {
+                  JLabel errorTitleLabel = new JLabel();
+                  errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                  errorTitleLabel.setText(messages.getString(TITLE_ERROR));
+                  errorTitleLabel.setForeground(ERROR_COLOR);
+                
+                  mainHorizontal
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addComponent(errorTitleLabel)
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                            .addComponent(helpLabel));
+                  mainVertical
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                            .addComponent(errorTitleLabel)
+                            .addComponent(helpLabel));
+                }
+                
+                mainPanelLayout.setHorizontalGroup(mainHorizontal
+                        .addComponent(errorMsgLabel));
+                mainPanelLayout.setVerticalGroup(mainVertical
+                        .addComponent(errorMsgLabel));
+                
+                JButton okButton = new JButton();
+                okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                okButton.setText(messages.getString(BUTTON_OK));
+                okButton.setActionCommand(okCommand);
+                okButton.addActionListener(okListener);
+
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                buttonPanelLayout.setHorizontalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+                buttonPanelLayout.setVerticalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                    .addComponent(okButton));
+
+                contentPanel.validate();
+            }
+        });
+    }
+
+    @Override
+    public void showErrorDialog(final String errorMsgKey, final Object[] errorMsgParams) {
+      
+      log.debug("scheduling error  dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+        @Override
+        public void run() {
+          
+          log.debug("show error dialog");
+      
+          mainPanel.removeAll();
+          buttonPanel.removeAll();
+
+          if (renderHeaderPanel) {
+            titleLabel.setText(messages.getString(TITLE_ERROR));
+          }
+
+          helpListener.setHelpTopic(errorMsgKey);
+          
+          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);
+          
+          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+          mainPanel.setLayout(mainPanelLayout);
+
+          
+          GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+          GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
+
+          if (!renderHeaderPanel) {
+            JLabel errorTitleLabel = new JLabel();
+            errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
+            errorTitleLabel.setText(messages.getString(TITLE_ERROR));
+            errorTitleLabel.setForeground(ERROR_COLOR);
+
+            mainHorizontal
+                    .addGroup(mainPanelLayout.createSequentialGroup()
+                      .addComponent(errorTitleLabel)
+                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                      .addComponent(helpLabel));
+            mainVertical
+                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                      .addComponent(errorTitleLabel)
+                      .addComponent(helpLabel));
+          }
+
+          mainPanelLayout.setHorizontalGroup(mainHorizontal
+                  .addComponent(errorMsgLabel));
+          mainPanelLayout.setVerticalGroup(mainVertical
+                  .addComponent(errorMsgLabel));
+          
+          contentPanel.validate();
+        }
+      });
+    }
+
+    @Override
+    public void showWaitDialog(final String waitMessage) {
+        
+      log.debug("scheduling wait dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+        
+              log.debug("show wait dialog");
+              
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+                if (renderHeaderPanel) {
+                  titleLabel.setText(messages.getString(TITLE_WAIT));
+                }
+                
+                helpListener.setHelpTopic(HELP_WAIT);
+                
+                JLabel waitMsgLabel = new JLabel();
+                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                if (waitMessage != null) {
+                    waitMsgLabel.setText("<html>" + waitMessage + "</html>");
+                } else {
+                    waitMsgLabel.setText(messages.getString(MESSAGE_WAIT));
+                }
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
+                        .addComponent(waitMsgLabel);
+                GroupLayout.ParallelGroup messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                        .addComponent(waitMsgLabel);
+                
+                if (!renderHeaderPanel) {
+                  messageHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel);
+                  messageVertical
+                          .addComponent(helpLabel);
+                }
+                mainPanelLayout.setHorizontalGroup(messageHorizontal);
+                mainPanelLayout.setVerticalGroup(messageVertical);
+                
+                contentPanel.validate();
+            }
+        });
+    }
+
+    @Override
+    public char[] getPin() {
+        if (pinField != null) {
+            return pinField.getPassword();
+        }
+        return null;
+    }
+    
+    /**
+     * TODO handle multiple references in HashDataViewer
+     * @param signedReferences
+     * @param okListener
+     * @param okCommand
+     */
+    @Override
+    public void showHashDataInputDialog(final List<HashDataInput> signedReferences, 
+            final ActionListener okListener, 
+            final String okCommand) {
+      
+      if (signedReferences == null) {
+        showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {"No SignedReferences provided"}, okListener, okCommand);
+        return;
+      }
+      
+      if (signedReferences.size() == 1) {
+        ActionListener saveHashDataListener = new ActionListener() {
+          @Override
+          public void actionPerformed(ActionEvent e) {
+            HashDataInput hdi = signedReferences.get(0);
+            showSaveHashDataInputDialog(Collections.singletonList(hdi), okListener, okCommand);
+          }
+        };
+        showHashDataViewer(signedReferences.get(0), saveHashDataListener, "save");
+      } else {
+        HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
+        showSignedReferencesListDialog(tableModel, okListener, okCommand);
+      }
+    }
+    
+    /**
+     * Opens HashDataViewer on mouse clicked event
+     */
+    public class HashDataMouseListener extends MouseAdapter {
+      
+      private HashDataInput hashData;
+
+      public void setHashData(HashDataInput hashData) {
+        this.hashData = hashData;
+      }
+
+      @Override
+      public void mouseClicked(MouseEvent e) {
+        ActionListener saveListener = new ActionListener() {
+
+          @Override
+          public void actionPerformed(ActionEvent e) {
+            showSaveHashDataInputDialog(Collections.singletonList(hashData), null, null);
+          }
+        };
+        showHashDataViewer(hashData, saveListener, "save");
+        super.mouseClicked(e);
+      }
+
+      
+      
+    }
+    
+    /**
+     * blocks until dialog returns (is closed)
+     * @param hashDataText
+     * @param saveListener
+     * @param saveCommand
+     */
+    private void showHashDataViewer(final HashDataInput hashDataInput, final ActionListener saveListener, final String saveCommand) {
+      
+      try {
+        log.debug("scheduling plaintext hashdatainput dialog");
+
+        // avoid double-clicks on hashdata link
+        SwingUtilities.invokeAndWait(new Runnable() {
+
+          @Override
+          public void run() {
+
+            log.debug("show plaintext hashdatainput dialog");
+
+            ActionListener l = helpListener.getActionListener();
+            HashDataViewer.showHashDataInput(contentPane, hashDataInput, messages, saveListener, saveCommand, l);
+          }
+        });
+        
+      } catch (InterruptedException ex) {
+        log.error("Failed to display HashDataViewer: " + ex.getMessage());
+      } catch (InvocationTargetException ex) {
+        log.error("Failed to display HashDataViewer: " + ex.getMessage());
+      }
+    }
+    
+    private void showSignedReferencesListDialog(final HashDataTableModel signedReferences, final ActionListener backListener, final String backCommand) {
+      
+      log.debug("scheduling signed references list dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+        @Override
+        public void run() {
+          
+          log.debug("show signed references list dialog");
+          
+          mainPanel.removeAll();
+          buttonPanel.removeAll();
+
+          if (renderHeaderPanel) {
+            titleLabel.setText(messages.getString(TITLE_HASHDATA));
+          }
+          
+          helpListener.setHelpTopic(HELP_HASHDATALIST);
+          
+          JLabel refIdLabel = new JLabel();
+          refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+          String refIdLabelPattern = messages.getString(MESSAGE_HASHDATALIST);
+          refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{signedReferences.getRowCount()}));
+
+          JTable hashDataTable = new JTable(signedReferences);
+          hashDataTable.setDefaultRenderer(HashDataInput.class, signedReferences.getRenderer());
+          
+          hashDataTable.setTableHeader(null);
+  //        hashDataTable.setShowVerticalLines(false);
+          hashDataTable.setRowSelectionAllowed(true);
+//          TableColumn selectCol = hashDataTable.getColumnModel().getColumn(1);
+//          selectCol.setMinWidth(CHECKBOX_WIDTH);
+//          selectCol.setMaxWidth(CHECKBOX_WIDTH);
+
+
+//          hashDataTable.setPreferredScrollableViewportSize(mainPanel.getPreferredSize());
+
+          JScrollPane hashDataScrollPane = new JScrollPane(hashDataTable);
+
+          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+          mainPanel.setLayout(mainPanelLayout);
+          
+          GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
+                  .addComponent(refIdLabel);
+          
+          GroupLayout.ParallelGroup messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(refIdLabel);
+          
+          if (!renderHeaderPanel) {
+            messageHorizontal
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                    .addComponent(helpLabel);
+            messageVertical
+                    .addComponent(helpLabel);
+          }
+
+          mainPanelLayout.setHorizontalGroup(
+            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+              .addGroup(messageHorizontal)
+              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
+
+          mainPanelLayout.setVerticalGroup(
+            mainPanelLayout.createSequentialGroup()
+              .addGroup(messageVertical)
+              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+              .addComponent(hashDataScrollPane, 0, 0, hashDataTable.getPreferredSize().height+3));
+
+          JButton backButton = new JButton();
+          backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+          backButton.setText(messages.getString(BUTTON_BACK));
+          backButton.setActionCommand(backCommand);
+          backButton.addActionListener(backListener);
+
+          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+          buttonPanel.setLayout(buttonPanelLayout);
+
+          buttonPanelLayout.setHorizontalGroup(buttonPanelLayout.createSequentialGroup()
+                  .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                  .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+          buttonPanelLayout.setVerticalGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                  .addComponent(backButton));
+
+          contentPanel.validate();
+        }
+      });
+    }
+    
+    private void showSaveHashDataInputDialog(final List<HashDataInput> signedRefs, final ActionListener okListener, final String okCommand) {
+      
+      log.debug("scheduling save hashdatainput dialog");
+      
+      SwingUtilities.invokeLater(new Runnable() {
+
+        @Override
+        public void run() {
+          
+          log.debug("show save hashdatainput dialog");
+      
+          String userHome = System.getProperty("user.home");
+          
+          JFileChooser fileDialog = new JFileChooser(userHome); 
+          fileDialog.setMultiSelectionEnabled(false);
+          fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
+          fileDialog.setFileHidingEnabled(true);
+          if (signedRefs.size() == 1) {
+            fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVE));
+            fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
+            String mimeType = signedRefs.get(0).getMimeType();
+            MimeFilter mimeFilter = new MimeFilter(mimeType, messages);
+            fileDialog.setFileFilter(mimeFilter);
+            String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + MimeFilter.getExtension(mimeType);
+            fileDialog.setSelectedFile(new File(userHome, filename));
+          } else {
+            fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVEDIR));
+            fileDialog.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+          }
+          
+          //parent contentPane -> placed over applet
+          switch (fileDialog.showSaveDialog(fileDialog)) {
+            case JFileChooser.APPROVE_OPTION:
+              File f = fileDialog.getSelectedFile();
+              for (HashDataInput hashDataInput : signedRefs) {
+                String mimeType = hashDataInput.getMimeType();
+                String id = hashDataInput.getReferenceId();
+                File file;
+                if (f.isDirectory()) {
+                  String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + '_' + id + MimeFilter.getExtension(mimeType);
+                  file = new File(f, filename);
+                } else {
+                  file = f;
+                }
+                if (file.exists()) {
+                  String ovrwrt = messages.getString(MESSAGE_OVERWRITE);
+                  int overwrite = JOptionPane.showConfirmDialog(fileDialog, MessageFormat.format(ovrwrt, file), messages.getString(WINDOWTITLE_OVERWRITE), JOptionPane.OK_CANCEL_OPTION);
+                  if (overwrite != JOptionPane.OK_OPTION) {
+                    continue;
+                  }
+                }
+                if (log.isDebugEnabled()) {
+                    log.debug("Writing HashDataInput " + id + " (" + mimeType + ") to file " + file);
+                }
+                FileOutputStream fos = null;
+                try {
+                    fos = new FileOutputStream(file);
+                    BufferedOutputStream bos = new BufferedOutputStream(fos);
+                    InputStream hdi = hashDataInput.getHashDataInput();
+                    int b;
+                    while ((b = hdi.read()) != -1) {
+                        bos.write(b);
+                    }
+                    bos.flush();
+                    bos.close();
+                } catch (IOException ex) {
+                    log.error("Failed to write HashDataInput to file " + file + ": " + ex.getMessage());
+                    showErrorDialog(ERR_WRITE_HASHDATA, new Object[] {ex.getMessage()}, null, null);
+                    ex.printStackTrace();
+                } finally {
+                    try {
+                        fos.close();
+                    } catch (IOException ex) {
+                    }
+                }    
+              }  
+          }
+          log.debug("done saving hashdatainput");
+          if (okListener != null) {
+            okListener.actionPerformed(new ActionEvent(fileDialog, ActionEvent.ACTION_PERFORMED, okCommand));
+          }
+        }
+      });
+    }
+    
+    private void registerHelpListener(ActionListener helpListener) {
+      if (helpListener != null) {
+        this.helpListener = new HelpMouseListener(helpListener);
+      } else {
+        log.error("no help listener provided, will not be able to display help");
+        this.helpListener = new HelpMouseListener(new ActionListener() {
+
+          @Override
+          public void actionPerformed(ActionEvent e) {
+            log.error("no help listener registered (requested help topic: " + e.getActionCommand() + ")");
+          }
+        });
+      }
+    }
+    
+  private static int initButtonSize(ResourceBundle messages, boolean renderCancelButton) {
+
+    int buttonSize = 0;
+    
+    JButton b = new JButton();
+    b.setText(messages.getString(BUTTON_OK));
+    if (b.getPreferredSize().width > buttonSize) {
+      buttonSize = b.getPreferredSize().width;
+    }
+    b.setText(messages.getString(BUTTON_SIGN));
+    if (b.getPreferredSize().width > buttonSize) {
+      buttonSize = b.getPreferredSize().width;
+    }
+    b.setText(messages.getString(BUTTON_BACK));
+    if (b.getPreferredSize().width > buttonSize) {
+      buttonSize = b.getPreferredSize().width;
+    }
+    b.setText(messages.getString(BUTTON_SAVE));
+    if (b.getPreferredSize().width > buttonSize) {
+      buttonSize = b.getPreferredSize().width;
+    }
+    if (renderCancelButton) {
+      b.setText(messages.getString(BUTTON_CANCEL));
+      if (b.getPreferredSize().width > buttonSize) {
+        buttonSize = b.getPreferredSize().width;
+      }
+    }
+    return buttonSize;
+  }
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
index f03bf158..502f93ec 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
@@ -17,7 +17,6 @@
 package at.gv.egiz.bku.gui;
 
 import java.applet.AppletContext;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.Locale;
 import javax.swing.SwingUtilities;
@@ -61,7 +60,6 @@ public class DefaultHelpListener extends AbstractHelpListener {
 //    try {
       log.debug("schedule help dialog");
 
-//      SwingUtilities.invokeAndWait(new Runnable() {
       SwingUtilities.invokeLater(new Runnable() {
 
         @Override
@@ -76,10 +74,5 @@ public class DefaultHelpListener extends AbstractHelpListener {
           }
         }
       });
-//    } catch (InterruptedException ex) {
-//      log.error("Failed to display HelpViewer: " + ex.getMessage(), ex);
-//    } catch (InvocationTargetException ex) {
-//      log.error("Failed to display HelpViewer: " + ex.getMessage(), ex);
-//    }
   }
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
index e8566fa6..a6709860 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
@@ -14,34 +14,46 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.stal.HashDataInput;
-import java.util.ArrayList;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.util.List;
-import java.util.Vector;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JTable;
 import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableCellRenderer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
- *
- * @author clemens
+ * 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 class HashDataTableModel extends DefaultTableModel {
 
-  protected List<HashDataInput> signedReferences;
+  protected static final Log log = LogFactory.getLog(HashDataTableModel.class);
   
-  protected Class[] types = new Class[]{
-    java.lang.String.class, java.lang.Boolean.class
-  };
-
-  public HashDataTableModel(List<HashDataInput> signedReferences) {
-    super(0, 2);
-    this.signedReferences = signedReferences;
-    for (HashDataInput hashDataInput : signedReferences) {
-      String desc = hashDataInput.getReferenceId() + " (" + hashDataInput.getMimeType() + ")";
-      addRow(new Object[]{desc, new Boolean(true)});
+  protected Class[] types = new Class[]{HashDataInput.class};
+  protected List<HashDataInput> hashDataInputs;
+  private HashDataLinkRenderer renderer;
+  
+  public HashDataTableModel(List<HashDataInput> hashDataInputs) {
+    super(0, 1);
+    this.hashDataInputs = hashDataInputs;
+    for (HashDataInput hdi : hashDataInputs) {
+      addRow(new Object[]{hdi});
     }
+    this.renderer = new HashDataLinkRenderer();
   }
 
   @Override
@@ -51,18 +63,49 @@ class HashDataTableModel extends DefaultTableModel {
 
   @Override
   public boolean isCellEditable(int rowIndex, int columnIndex) {
-    if (columnIndex == 1)
-      return true;
     return false;
   }
 
-  public List<HashDataInput> getSelectedHashData() {
-    ArrayList<HashDataInput> selection = new ArrayList<HashDataInput>();
-    for (int i = 0; i < dataVector.size(); i++) {
-      if ((Boolean) ((Vector) dataVector.get(i)).elementAt(1)) {
-        selection.add(signedReferences.get(i));
-      }
+  
+  
+  public HashDataLinkRenderer getRenderer() {
+    return renderer;
+  }
+
+  public class HashDataLinkRenderer extends JLabel
+          implements TableCellRenderer {
+//        extends DefaultTableCellRenderer {
+    
+//    protected ActionListener saveHashDataListener;
+//
+//    public HashDataLinkRenderer(ActionListener saveHashDataListener) {
+//      this.saveHashDataListener = saveHashDataListener;
+//    }
+    
+    @Override
+    public Component getTableCellRendererComponent(JTable table,
+            Object value,
+            boolean isSelected,
+            boolean hasFocus,
+            final int row,
+            int column) {
+      final HashDataInput hdi = (HashDataInput) value;
+      log.debug("render hashdatainput " + hdi.getReferenceId() + " - (" + row + "," + column + ") " + isSelected + hasFocus);
+      setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+      setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD));
+      setText(hdi.getReferenceId() + " (" + hdi.getMimeType() + ")");
+      addMouseListener(new MouseAdapter() {
+
+        @Override
+        public void mouseClicked(MouseEvent e) {
+          log.debug("received mouseclick on " + hdi.getReferenceId());
+//          saveHashDataListener.actionPerformed();
+          JOptionPane.showInputDialog(hashDataInputs.get(row).getReferenceId());
+        }
+        
+      });
+
+      return this;
     }
-    return selection;
   }
 }
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
index 7b77faeb..db66bd52 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
@@ -23,18 +23,15 @@ import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Frame;
-import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.BufferedReader;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.Charset;
 import java.text.MessageFormat;
-import java.util.List;
 import java.util.ResourceBundle;
 import javax.swing.GroupLayout;
 import javax.swing.ImageIcon;
@@ -69,12 +66,12 @@ public class HashDataViewer extends JDialog
    * 
    * @param signedReferences currently, only one hashdata input (the first in the list) is displayed
    */
-  public static void showHashDataInput(List<HashDataInput> hashDataInputs,
+  public static void showHashDataInput(HashDataInput hashDataInput,
           ResourceBundle messages,
           ActionListener saveListener,
           String saveCommand,
           ActionListener helpListener) {
-    showHashDataInput(null, hashDataInputs, messages, saveListener, saveCommand, helpListener);
+    showHashDataInput(null, hashDataInput, messages, saveListener, saveCommand, helpListener);
   }
   
   /**
@@ -82,7 +79,7 @@ public class HashDataViewer extends JDialog
    * @param frameComp owner
    */
   public static void showHashDataInput(Component frameComp,
-          List<HashDataInput> hashDataInputs,
+          HashDataInput hashDataInput,
           ResourceBundle messages,
           ActionListener saveListener,
           String saveCommand,
@@ -94,7 +91,7 @@ public class HashDataViewer extends JDialog
     }
     dialog = new HashDataViewer(frame, 
             messages,
-            hashDataInputs, 
+            hashDataInput, 
             saveListener, 
             saveCommand, 
             helpListener);
@@ -103,35 +100,33 @@ public class HashDataViewer extends JDialog
 
   private HashDataViewer(Frame frame,
           ResourceBundle messages,
-          List<HashDataInput> hashDataInputs,
+          HashDataInput hashDataInput,
           ActionListener saveListener,
           String saveCommand,
           ActionListener helpListener) {
     super(frame, messages.getString(BKUGUIFacade.WINDOWTITLE_VIEWER), true);
     this.messages = messages;
 
-    HashDataInput hashData = hashDataInputs.get(0);
-    
     Charset cs;
-    if (hashData.getEncoding() == null) {
+    if (hashDataInput.getEncoding() == null) {
       cs = Charset.forName("UTF-8");
     } else {
       try {
-        cs = Charset.forName(hashData.getEncoding());
+        cs = Charset.forName(hashDataInput.getEncoding());
       } catch (Exception ex) {
-        log.debug("charset " + hashData.getEncoding() + " not supported, assuming UTF-8: " + ex.getMessage());
+        log.debug("charset " + hashDataInput.getEncoding() + " not supported, assuming UTF-8: " + ex.getMessage());
         cs = Charset.forName("UTF-8");
       }  
     }
     
     
-    InputStreamReader isr = new InputStreamReader(hashData.getHashDataInput(), cs);
+    InputStreamReader isr = new InputStreamReader(hashDataInput.getHashDataInput(), cs);
     Reader content = new BufferedReader(isr);
   
     JPanel hashDataPanel = createViewerPanel(
             messages.getString(BKUGUIFacade.MESSAGE_HASHDATA), 
             content, 
-            hashData.getMimeType(), 
+            hashDataInput.getMimeType(), 
             helpListener);
     JPanel buttonPanel = createButtonPanel(saveListener, saveCommand);
     initContentPane(new Dimension(600, 400), hashDataPanel, buttonPanel);
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperLinkRenderer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperLinkRenderer.java
deleted file mode 100644
index d9606177..00000000
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperLinkRenderer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.gui;
-
-import at.gv.egiz.stal.HashDataInput;
-import java.awt.Color;
-import java.awt.Component;
-import javax.swing.JLabel;
-import javax.swing.JTable;
-import javax.swing.table.TableCellRenderer;
-
-/**
- * 
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class HyperLinkRenderer extends JLabel implements TableCellRenderer {
-
-  @Override
-  public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-    HashDataInput hdi = (HashDataInput) value;
-    setText(hdi.getReferenceId() + " (" + hdi.getMimeType() + ")");
-    setBackground(Color.CYAN);
-    return this;
-  }
-        
-//        extends DefaultTableCellRenderer {
-//
-//  @Override
-//  public void setValue(Object value) {
-//    HashDataInput hdi = (HashDataInput) value;
-//    setText(hdi.getReferenceId() + " (" + hdi.getMimeType() + ")");
-//  }
-}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java
index 271c0b65..6a738acb 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java
@@ -24,6 +24,7 @@ import javax.swing.ImageIcon;
 import javax.swing.JPanel;
 
 /**
+ * paints the background image in the lower left corner of the component
  * 
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
deleted file mode 100644
index d4d6efef..00000000
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleGUI.java
+++ /dev/null
@@ -1,1410 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.gui;
-
-import at.gv.egiz.smcc.PINSpec;
-import at.gv.egiz.stal.HashDataInput;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Font;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.Locale;
-import java.util.ResourceBundle;
-import javax.swing.GroupLayout;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.LayoutStyle;
-import javax.swing.SwingUtilities;
-import javax.swing.table.TableModel;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- *
- * @author clemens
- */
-public class SimpleGUI implements BKUGUIFacade {
-    
-    private static final Log log = LogFactory.getLog(SimpleGUI.class);
-
-    protected HelpMouseListener helpListener;
-    
-    protected Container contentPane;
-    protected ResourceBundle messages;
-    /** left and right side main panels */
-    protected JPanel iconPanel;
-    protected JPanel contentPanel;
-    /** right side content panels and layouts */
-    protected JPanel headerPanel;
-    protected JPanel mainPanel;
-    protected JPanel buttonPanel;
-    /** right side fixed labels  */
-    protected JLabel titleLabel;
-    protected JLabel helpLabel;
-    /** remember the pinfield to return to worker */
-    protected JPasswordField pinField;
-
-    protected int buttonSize;
-    
-    /** gui style config (default 'simple') */
-    protected boolean renderHeaderPanel = false;
-    protected boolean renderIconPanel = false;
-    protected boolean renderCancelButton = false;
-
-    /**
-     * set contentPane
-     * init message bundle
-     * configure the style 
-     * register the help listener
-     * create GUI (on event-dispatching thread)
-     * 
-     * @param contentPane
-     * @param locale
-     * @param guiStyle
-     * @param background
-     * @param helpListener
-     */
-    public SimpleGUI(Container contentPane, Locale locale, Style guiStyle, URL background, ActionListener helpListener) {
-      this.contentPane = contentPane;
-
-      if (locale != null) {
-          messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, locale);
-      } else {
-          messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
-      }
-
-      if (guiStyle == Style.advanced) {
-        renderHeaderPanel = true;
-        renderIconPanel = false;
-        renderCancelButton = true;
-      }
-
-      registerHelpListener(helpListener);
-      
-      createGUI(background);
-    }
-    
-    private void createGUI(final URL background) {
-
-        try {
-
-          log.debug("scheduling gui initialization");
-      
-            SwingUtilities.invokeAndWait(new Runnable() {
-
-                @Override
-                public void run() {
-                  
-                  log.debug("initializing gui");
-
-                  if (renderIconPanel) {
-                    initIconPanel(background);
-                    initContentPanel(null);
-                  } else {
-                    initContentPanel(background);
-                  }
-                  
-                  GroupLayout layout = new GroupLayout(contentPane);
-                  contentPane.setLayout(layout);
-                  
-                  if (renderIconPanel) {
-                    layout.setHorizontalGroup(layout.createSequentialGroup()
-                        .addComponent(iconPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
-                        .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));
-                  } else {
-                    layout.setHorizontalGroup(layout.createSequentialGroup().addComponent(contentPanel));
-                    layout.setVerticalGroup(layout.createSequentialGroup().addComponent(contentPanel));
-                  }
-                }
-            });
-        } catch (Exception ex) {
-            throw new RuntimeException("Failed to init GUI: " + ex.getMessage());
-        }
-    }
-    
-    protected void initIconPanel(URL background) {
-      if (background == null) {
-        background = getClass().getResource(DEFAULT_BACKGROUND);
-      }
-      if ("file".equals(background.getProtocol())) {
-        log.warn("file:// background images not permitted: " + background);
-        background = getClass().getResource(DEFAULT_BACKGROUND);
-      }
-      log.debug("loading icon panel background " + background);
-      
-      iconPanel = new JPanel();
-      JLabel iconLabel = new JLabel();
-      iconLabel.setIcon(new ImageIcon(background));
-
-      GroupLayout iconPanelLayout = new GroupLayout(iconPanel);
-      iconPanel.setLayout(iconPanelLayout);
-      iconPanelLayout.setHorizontalGroup(
-        iconPanelLayout.createSequentialGroup()
-          .addContainerGap()
-          .addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
-          // no gap here (contentPanel has containerGap)
-      iconPanelLayout.setVerticalGroup(
-        iconPanelLayout.createSequentialGroup()
-          .addContainerGap()
-          .addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE));
-    }
-
-    protected void initContentPanel(URL background) { 
-
-      if (background == null) {
-        background = getClass().getResource(DEFAULT_BACKGROUND);
-      }
-      if ("file".equals(background.getProtocol())) {
-        log.warn("file:// background images not permitted: " + background);
-        background = getClass().getResource(DEFAULT_BACKGROUND);
-      }
-      log.debug("loading background " + background);
-      contentPanel = new ImagePanel(background);
-
-      mainPanel = new JPanel();
-      mainPanel.setOpaque(false);
-      buttonPanel = new JPanel(); 
-      buttonPanel.setOpaque(false);
-
-      helpLabel = new JLabel();
-      helpLabel.setIcon(new ImageIcon(getClass().getResource(HELP_IMG))); 
-      helpLabel.getAccessibleContext().setAccessibleName(messages.getString(ALT_HELP));
-      helpLabel.addMouseListener(helpListener);
-      helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-    
-      buttonSize = initButtonSize(messages, renderCancelButton);
-        
-      if (renderHeaderPanel) {
-        headerPanel = new JPanel();
-        headerPanel.setOpaque(false);
-
-        titleLabel = new JLabel();
-        titleLabel.setFont(titleLabel.getFont().deriveFont(titleLabel.getFont().getStyle() |
-          java.awt.Font.BOLD, titleLabel.getFont().getSize() + 2));
-
-        GroupLayout headerPanelLayout = new GroupLayout(headerPanel);
-        headerPanel.setLayout(headerPanelLayout);
-
-        headerPanelLayout.setHorizontalGroup(
-          headerPanelLayout.createSequentialGroup()
-            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
-            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-            .addComponent(helpLabel));
-        headerPanelLayout.setVerticalGroup(
-          headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-            .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
-            .addComponent(helpLabel));
-      }
-
-      GroupLayout contentPanelLayout = new GroupLayout(contentPanel);
-      contentPanel.setLayout(contentPanelLayout);
-
-      GroupLayout.ParallelGroup horizontalContentInner = contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
-      if (renderHeaderPanel) {
-        horizontalContentInner
-                .addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE);
-      }
-      horizontalContentInner
-              .addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-              .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE);
-      GroupLayout.SequentialGroup horizontalContentOuter = contentPanelLayout.createSequentialGroup();
-      if (!renderIconPanel) {
-        horizontalContentOuter
-                .addContainerGap();
-      }
-      horizontalContentOuter
-              .addGroup(horizontalContentInner)
-              .addContainerGap();
-      contentPanelLayout.setHorizontalGroup(horizontalContentOuter);
-      
-      GroupLayout.SequentialGroup verticalContent = contentPanelLayout.createSequentialGroup();
-      verticalContent.addContainerGap();
-      if (renderHeaderPanel) {
-        verticalContent.addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
-      }
-      verticalContent.addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 
-        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
-        .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-        .addContainerGap();
-      contentPanelLayout.setVerticalGroup(verticalContent);
-    }
-
-    @Override
-    public Locale getLocale() {
-      return messages.getLocale();
-    }
-
-    @Override
-    public void showWelcomeDialog() {
-      
-      log.debug("scheduling welcome dialog");
-      
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-              
-              log.debug("show welcome dialog");
-              
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                helpListener.setHelpTopic(HELP_WELCOME);
-                
-                JLabel welcomeMsgLabel = new JLabel();
-                welcomeMsgLabel.setFont(welcomeMsgLabel.getFont().deriveFont(welcomeMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                
-                if (renderHeaderPanel) {
-                  titleLabel.setText(messages.getString(TITLE_WELCOME));
-                  welcomeMsgLabel.setText(messages.getString(MESSAGE_WAIT));
-                } else {
-                  welcomeMsgLabel.setText(messages.getString(TITLE_WELCOME));   
-                }
-                
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
-                        .addComponent(welcomeMsgLabel);
-                GroupLayout.Group messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                        .addComponent(welcomeMsgLabel);
-                if (!renderHeaderPanel) {
-                  messageHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel); 
-                  messageVertical
-                          .addComponent(helpLabel);
-                }
-
-                mainPanelLayout.setHorizontalGroup(messageHorizontal);
-                mainPanelLayout.setVerticalGroup(messageVertical);
-                
-                contentPanel.validate();
-
-            }
-        });
-    }
-
-    @Override
-    public void showInsertCardDialog(final ActionListener cancelListener, final String cancelCommand) {
-      
-      log.debug("scheduling insert card dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-              
-              log.debug("show insert card dialog");
-      
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                if (renderHeaderPanel) {
-                  titleLabel.setText(messages.getString(TITLE_INSERTCARD));
-                }
-                
-                helpListener.setHelpTopic(HELP_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);
-
-                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
-                        .addComponent(insertCardMsgLabel);
-                GroupLayout.ParallelGroup messageVertical = mainPanelLayout.createParallelGroup()
-                        .addComponent(insertCardMsgLabel);
-                
-                if (!renderHeaderPanel) {
-                  messageHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel);    
-                  messageVertical
-                          .addComponent(helpLabel);
-                }
-                
-                mainPanelLayout.setHorizontalGroup(messageHorizontal);
-                mainPanelLayout.setVerticalGroup(messageVertical);
-                
-                if (renderCancelButton) {
-                  JButton cancelButton = new JButton();
-                  cancelButton.setText(messages.getString(BUTTON_CANCEL));
-                  cancelButton.addActionListener(cancelListener);
-                  cancelButton.setActionCommand(cancelCommand);
-
-                  GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                  buttonPanel.setLayout(buttonPanelLayout);
-
-                  buttonPanelLayout.setHorizontalGroup(
-                    buttonPanelLayout.createSequentialGroup()
-                          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-                  buttonPanelLayout.setVerticalGroup(
-                    buttonPanelLayout.createSequentialGroup()
-                      .addComponent(cancelButton));
-                }
-
-                contentPanel.validate();
-            }
-        });
-    }
-
-    /**
-     * only difference to showInsertCard: title text: card not supported
-     * @param cancelListener
-     * @param cancelCommand
-     */
-    @Override
-    public void showCardNotSupportedDialog(final ActionListener cancelListener, final String cancelCommand) {
-        
-      log.debug("scheduling card not supported dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                
-              log.debug("show card not supported dialog");
-                
-              mainPanel.removeAll();
-              buttonPanel.removeAll();
-
-              JLabel insertCardMsgLabel = new JLabel();
-              insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-
-              if (renderHeaderPanel) {
-                titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
-                insertCardMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD));
-              } else {
-                insertCardMsgLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED)); 
-              }
-
-              helpListener.setHelpTopic(HELP_CARDNOTSUPPORTED);
-              
-              GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-              mainPanel.setLayout(mainPanelLayout);
-
-              GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
-                      .addComponent(insertCardMsgLabel);
-              GroupLayout.Group messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(insertCardMsgLabel);
-              if (!renderHeaderPanel) {
-                messageHorizontal
-                        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                        .addComponent(helpLabel);
-                messageVertical
-                        .addComponent(helpLabel);
-              } 
-              
-              mainPanelLayout.setHorizontalGroup(messageHorizontal);
-              mainPanelLayout.setVerticalGroup(messageVertical);
-                
-              if (renderCancelButton) {
-                JButton cancelButton = new JButton();
-                cancelButton.setText(messages.getString(BUTTON_CANCEL));
-                cancelButton.addActionListener(cancelListener);
-                cancelButton.setActionCommand(cancelCommand);
-
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
-
-                buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-                buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                    .addComponent(cancelButton));
-              }
-              
-              contentPanel.validate();
-            }
-        });
-    }
-
-  private static int initButtonSize(ResourceBundle messages, boolean renderCancelButton) {
-
-    int buttonSize = 0;
-    
-    JButton b = new JButton();
-    b.setText(messages.getString(BUTTON_OK));
-    if (b.getPreferredSize().width > buttonSize) {
-      buttonSize = b.getPreferredSize().width;
-    }
-    b.setText(messages.getString(BUTTON_SIGN));
-    if (b.getPreferredSize().width > buttonSize) {
-      buttonSize = b.getPreferredSize().width;
-    }
-    b.setText(messages.getString(BUTTON_BACK));
-    if (b.getPreferredSize().width > buttonSize) {
-      buttonSize = b.getPreferredSize().width;
-    }
-    b.setText(messages.getString(BUTTON_SAVE));
-    if (b.getPreferredSize().width > buttonSize) {
-      buttonSize = b.getPreferredSize().width;
-    }
-    if (renderCancelButton) {
-      b.setText(messages.getString(BUTTON_CANCEL));
-      if (b.getPreferredSize().width > buttonSize) {
-        buttonSize = b.getPreferredSize().width;
-      }
-    }
-    return buttonSize;
-  }
-
-    private void showCardPINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener okListener, final String okCommand, final ActionListener cancelListener, final String cancelCommand) {
-        
-      log.debug("scheduling card-pin dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-
-              log.debug("show card-pin dialog");
-      
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                if (renderHeaderPanel) {
-                  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 okButton = new JButton();
-                okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                okButton.setText(messages.getString(BUTTON_OK));
-                okButton.setEnabled(false);
-                okButton.setActionCommand(okCommand);
-                okButton.addActionListener(okListener);
-
-                JLabel cardPinLabel = new JLabel();
-                cardPinLabel.setFont(cardPinLabel.getFont().deriveFont(cardPinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                String pinLabel = messages.getString(LABEL_PIN);
-                cardPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
-
-                pinField = new JPasswordField();
-                pinField.setText("");
-                pinField.setDocument(new PINDocument(pinSpec, okButton));
-                pinField.setActionCommand(okCommand);
-                pinField.addActionListener(new ActionListener() {
-
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        if (pinField.getPassword().length >= pinSpec.getMinLength()) {
-                            okListener.actionPerformed(e);
-                        }
-                    }
-                });
-
-                JLabel infoLabel = new JLabel();
-                if (numRetries < 0) {
-                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                  String infoPattern = messages.getString(MESSAGE_ENTERPIN);
-                  infoLabel.setText(MessageFormat.format(infoPattern, new Object[] {pinSpec.getLocalizedName()}));
-                  helpListener.setHelpTopic(HELP_CARDPIN);
-                } else {
-                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                  infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
-                  infoLabel.setForeground(ERROR_COLOR);
-                  helpListener.setHelpTopic(HELP_RETRY);
-                }
-                
-                JLabel pinsizeLabel = new JLabel();
-                pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
-                String pinsizePattern = messages.getString(LABEL_PINSIZE);
-                String pinSize = String.valueOf(pinSpec.getMinLength());
-                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-                    pinSize += "-" + pinSpec.getMaxLength();
-                }
-                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
-                
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
-                GroupLayout.SequentialGroup pinHorizontal = mainPanelLayout.createSequentialGroup()
-                      .addComponent(cardPinLabel, 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(pinsizeLabel));
-                
-                GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
-                
-                if (!renderHeaderPanel) {
-                  GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
-                          .addComponent(infoLabel) //, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel); //, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                  mainHorizontal
-                          .addGroup(infoHorizontal)
-                          .addGroup(pinHorizontal);
-                  GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                          .addComponent(infoLabel)
-                          .addComponent(helpLabel);
-                  mainVertical
-                          .addGroup(infoVertical)
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
-                } else {
-                  mainHorizontal
-                          .addGroup(pinHorizontal);
-                }
-
-                mainVertical
-                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                    .addComponent(cardPinLabel)
-                    .addComponent(pinField))
-                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                  .addComponent(pinsizeLabel);
-                
-                mainPanelLayout.setHorizontalGroup(mainHorizontal);
-                mainPanelLayout.setVerticalGroup(mainVertical);
-                
-                
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
-
-                GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
-                GroupLayout.Group buttonVertical;
-                
-                if (renderCancelButton) {
-                  JButton cancelButton = new JButton();
-                  cancelButton.setText(messages.getString(BUTTON_CANCEL));
-                  cancelButton.setActionCommand(cancelCommand);
-                  cancelButton.addActionListener(cancelListener);
-
-                  buttonHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
-                  buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE) 
-                          .addComponent(okButton)
-                          .addComponent(cancelButton); 
-                } else {
-                  buttonVertical = buttonPanelLayout.createSequentialGroup()
-                          .addComponent(okButton);
-                }
-                
-                buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
-                buttonPanelLayout.setVerticalGroup(buttonVertical);
-
-                pinField.requestFocusInWindow();
-                contentPanel.validate();
-
-            }
-        });
-    }
-
-    @Override
-    public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
-        showCardPINDialog(pinSpec, -1, okListener, okCommand, cancelListener, cancelCommand);
-    }
-
-    @Override
-    public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
-        showCardPINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand);
-    }
-
-    @Override
-    public void showSignaturePINDialog(PINSpec pinSpec, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
-        showSignaturePINDialog(pinSpec, -1, signListener, signCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
-    }
-
-    @Override
-    public void showSignaturePINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
-        showSignaturePINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
-    }
-
-    private void showSignaturePINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener signListener, final String signCommand, final ActionListener cancelListener, final String cancelCommand, final ActionListener hashdataListener, final String hashdataCommand) {
-
-      log.debug("scheduling signature-pin dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-              
-              log.debug("show signature-pin dialog");
-      
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-                
-                if (renderHeaderPanel) {
-                  if (numRetries < 0) {
-                      titleLabel.setText(messages.getString(TITLE_SIGN));
-                  } else {
-                      titleLabel.setText(messages.getString(TITLE_RETRY));
-                  }
-                }
-
-                JButton signButton = new JButton();
-                signButton.setFont(signButton.getFont().deriveFont(signButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                signButton.setText(messages.getString(BUTTON_SIGN));
-                signButton.setEnabled(false);
-                signButton.setActionCommand(signCommand);
-                signButton.addActionListener(signListener);
-
-                JLabel signPinLabel = new JLabel();
-                signPinLabel.setFont(signPinLabel.getFont().deriveFont(signPinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                String pinLabel = messages.getString(LABEL_PIN);
-                signPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
-
-                pinField = new JPasswordField();
-                pinField.setText("");
-                pinField.setDocument(new PINDocument(pinSpec, signButton));
-                pinField.setActionCommand(signCommand);
-                pinField.addActionListener(new ActionListener() {
-
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        if (pinField.getPassword().length >= pinSpec.getMinLength()) {
-                            signListener.actionPerformed(e);
-                        }
-                    }
-                });
-
-                JLabel pinsizeLabel = new JLabel();
-                pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
-                String pinsizePattern = messages.getString(LABEL_PINSIZE);
-                String pinSize = String.valueOf(pinSpec.getMinLength());
-                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-                    pinSize += "-" + pinSpec.getMaxLength();
-                }
-                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
-
-                JLabel infoLabel = new JLabel();
-                if (numRetries < 0) {
-                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                  infoLabel.setText(messages.getString(MESSAGE_HASHDATALINK));
-                  infoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-                  infoLabel.setForeground(HYPERLINK_COLOR);
-                  infoLabel.addMouseListener(new MouseAdapter() {
-
-                      @Override
-                      public void mouseClicked(MouseEvent me) {
-                          ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
-                          hashdataListener.actionPerformed(e);
-                      }
-                  });
-                  helpListener.setHelpTopic(HELP_SIGNPIN);
-                } else {
-                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                  infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
-                  infoLabel.setForeground(ERROR_COLOR);
-                  helpListener.setHelpTopic(HELP_RETRY);
-                }
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-                
-                GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
-                        .addComponent(infoLabel);
-                GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                        .addComponent(infoLabel);
-                       
-                if (!renderHeaderPanel) {
-                  infoHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel); //, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
-                  infoVertical
-                          .addComponent(helpLabel);
-                }
-
-                mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addGroup(infoHorizontal)
-                    .addGroup(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(pinsizeLabel))));
-
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addGroup(infoVertical)
-                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                        .addComponent(signPinLabel)
-                        .addComponent(pinField))
-                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addComponent(pinsizeLabel));
-
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
-
-                GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(signButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
-                GroupLayout.Group buttonVertical;
-                
-                if (renderCancelButton) {
-                  JButton cancelButton = new JButton();
-                  cancelButton.setText(messages.getString(BUTTON_CANCEL));
-                  cancelButton.setActionCommand(cancelCommand);
-                  cancelButton.addActionListener(cancelListener);
-
-                  buttonHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
-                  
-                  buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                          .addComponent(signButton)
-                          .addComponent(cancelButton); 
-                } else {
-                  buttonVertical = buttonPanelLayout.createSequentialGroup()
-                          .addComponent(signButton);
-                }
-                
-                buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
-                buttonPanelLayout.setVerticalGroup(buttonVertical);
-
-                pinField.requestFocusInWindow();
-                contentPanel.validate();
-
-            }
-        });
-    }
-
-    @Override
-    public void showErrorDialog(final String errorMsgKey, final Object[] errorMsgParams, final ActionListener okListener, final String okCommand) {
-        
-      log.debug("scheduling error dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-          @Override
-            public void run() {
-
-                log.debug("show error dialog");
-                
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                if (renderHeaderPanel) {
-                  titleLabel.setText(messages.getString(TITLE_ERROR));
-                }
-
-                helpListener.setHelpTopic(errorMsgKey);
-                
-                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);
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
-                GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
-                
-                if (!renderHeaderPanel) {
-                  JLabel errorTitleLabel = new JLabel();
-                  errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                  errorTitleLabel.setText(messages.getString(TITLE_ERROR));
-                  errorTitleLabel.setForeground(ERROR_COLOR);
-                
-                  mainHorizontal
-                          .addGroup(mainPanelLayout.createSequentialGroup()
-                            .addComponent(errorTitleLabel)
-                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                            .addComponent(helpLabel));
-                  mainVertical
-                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                            .addComponent(errorTitleLabel)
-                            .addComponent(helpLabel));
-                }
-                
-                mainPanelLayout.setHorizontalGroup(mainHorizontal
-                        .addComponent(errorMsgLabel));
-                mainPanelLayout.setVerticalGroup(mainVertical
-                        .addComponent(errorMsgLabel));
-                
-                JButton okButton = new JButton();
-                okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                okButton.setText(messages.getString(BUTTON_OK));
-                okButton.setActionCommand(okCommand);
-                okButton.addActionListener(okListener);
-
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
-
-                buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-                buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                    .addComponent(okButton));
-
-                contentPanel.validate();
-            }
-        });
-    }
-
-    @Override
-    public void showErrorDialog(final String errorMsgKey, final Object[] errorMsgParams) {
-      
-      log.debug("scheduling error  dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-        @Override
-        public void run() {
-          
-          log.debug("show error dialog");
-      
-          mainPanel.removeAll();
-          buttonPanel.removeAll();
-
-          if (renderHeaderPanel) {
-            titleLabel.setText(messages.getString(TITLE_ERROR));
-          }
-
-          helpListener.setHelpTopic(errorMsgKey);
-          
-          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);
-          
-          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-          mainPanel.setLayout(mainPanelLayout);
-
-          
-          GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
-          GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
-
-          if (!renderHeaderPanel) {
-            JLabel errorTitleLabel = new JLabel();
-            errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
-            errorTitleLabel.setText(messages.getString(TITLE_ERROR));
-            errorTitleLabel.setForeground(ERROR_COLOR);
-
-            mainHorizontal
-                    .addGroup(mainPanelLayout.createSequentialGroup()
-                      .addComponent(errorTitleLabel)
-                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                      .addComponent(helpLabel));
-            mainVertical
-                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(errorTitleLabel)
-                      .addComponent(helpLabel));
-          }
-
-          mainPanelLayout.setHorizontalGroup(mainHorizontal
-                  .addComponent(errorMsgLabel));
-          mainPanelLayout.setVerticalGroup(mainVertical
-                  .addComponent(errorMsgLabel));
-          
-          contentPanel.validate();
-        }
-      });
-    }
-
-    @Override
-    public void showWaitDialog(final String waitMessage) {
-        
-      log.debug("scheduling wait dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-        
-              log.debug("show wait dialog");
-              
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                if (renderHeaderPanel) {
-                  titleLabel.setText(messages.getString(TITLE_WAIT));
-                }
-                
-                helpListener.setHelpTopic(HELP_WAIT);
-                
-                JLabel waitMsgLabel = new JLabel();
-                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                if (waitMessage != null) {
-                    waitMsgLabel.setText("<html>" + waitMessage + "</html>");
-                } else {
-                    waitMsgLabel.setText(messages.getString(MESSAGE_WAIT));
-                }
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
-                        .addComponent(waitMsgLabel);
-                GroupLayout.ParallelGroup messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                        .addComponent(waitMsgLabel);
-                
-                if (!renderHeaderPanel) {
-                  messageHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel);
-                  messageVertical
-                          .addComponent(helpLabel);
-                }
-                mainPanelLayout.setHorizontalGroup(messageHorizontal);
-                mainPanelLayout.setVerticalGroup(messageVertical);
-                
-                contentPanel.validate();
-            }
-        });
-    }
-
-    @Override
-    public char[] getPin() {
-        if (pinField != null) {
-            return pinField.getPassword();
-        }
-        return null;
-    }
-    
-    /**
-     * TODO handle multiple references in HashDataViewer
-     * @param signedReferences
-     * @param okListener
-     * @param okCommand
-     */
-    @Override
-    public void showHashDataInputDialog(final List<HashDataInput> signedReferences, final ActionListener okListener, final String okCommand) {
-      
-      if (signedReferences == null) {
-        showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {"No SignedReferences provided"}, okListener, okCommand);
-        return;
-      }
-      
-      ActionListener saveHashDataListener = new ActionListener() {
-
-          @Override
-          public void actionPerformed(ActionEvent e) {
-              showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
-          }
-      };
-      
-      if (signedReferences.size() == 1) {
-        
-//        if (standalone) {
-          
-          showHashDataViewer(signedReferences, saveHashDataListener, "save");
-          
-//        } else {
-//          if ("text/plain".equals(signedReferences.get(0).getMimeType())) {
-//            
-//            ActionListener saveHashDataListener = new ActionListener() {
-//
-//                @Override
-//                public void actionPerformed(ActionEvent e) {
-//                    showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
-//                }
-//            };
-//            
-//            try {
-//              String hashDataText = getText(signedReferences.get(0));
-//              showPlainTextHashDataInputDialog(hashDataText, saveHashDataListener, "save", okListener, okCommand);
-//            } catch (IOException ex) {
-//              showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {ex.getMessage()}, okListener, okCommand);
-//            }
-//          
-//          } else {
-//            showSaveHashDataInputDialog(signedReferences, okListener, okCommand);
-//          }
-//        }
-      } else {
-
-//        final HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
-//
-//        ActionListener saveHashDataListener = new ActionListener() {
-//
-//            @Override
-//            public void actionPerformed(ActionEvent e) {
-//              showSaveHashDataInputDialog(tableModel.getSelectedHashData(), okListener, okCommand);
-//            }
-//        };
-        
-        SimpleHashDataTableModel tableModel = new SimpleHashDataTableModel(signedReferences);
-        showMultipleHashDataInputDialog(tableModel, okListener, okCommand, saveHashDataListener, "save");
-      }
-    }
-    
-    /**
-     * blocks until dialog returns (is closed)
-     * @param hashDataText
-     * @param saveListener
-     * @param saveCommand
-     */
-    private void showHashDataViewer(final List<HashDataInput> signedReferences, final ActionListener saveListener, final String saveCommand) {
-      
-      try {
-        log.debug("scheduling plaintext hashdatainput dialog");
-
-        SwingUtilities.invokeAndWait(new Runnable() {
-
-          @Override
-          public void run() {
-
-            log.debug("show plaintext hashdatainput dialog");
-
-            ActionListener l = helpListener.getActionListener();
-            HashDataViewer.showHashDataInput(contentPane, signedReferences, messages, saveListener, saveCommand, l);
-          }
-        });
-        
-      } catch (InterruptedException ex) {
-        log.error("Failed to display HashDataViewer: " + ex.getMessage());
-      } catch (InvocationTargetException ex) {
-        log.error("Failed to display HashDataViewer: " + ex.getMessage());
-      }
-    }
-    
-//    private void showPlainTextHashDataInputDialog(final String hashDataText, final ActionListener saveListener, final String saveCommand, final ActionListener cancelListener, final String cancelCommand) {
-//      
-//      log.debug("scheduling plaintext hashdatainput dialog");
-//      
-//      SwingUtilities.invokeLater(new Runnable() {
-//
-//        @Override
-//        public void run() {
-//          
-//          log.debug("show plaintext hashdatainput dialog");
-//      
-//          mainPanel.removeAll();
-//          buttonPanel.removeAll();
-//
-//          helpListener.setHelpTopic(HELP_HASHDATA);
-//
-//          JLabel refIdLabel = new JLabel();
-//          refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-//          refIdLabel.setText(messages.getString(MESSAGE_HASHDATA)); //MessageFormat.format(refIdLabelPattern, new Object[]{refId}));
-//
-//          JTextArea hashDataTextArea = new JTextArea(hashDataText);
-//          hashDataTextArea.setEditable(false);
-//          hashDataTextArea.setFont(new Font(HASHDATA_FONT, hashDataTextArea.getFont().getStyle(), hashDataTextArea.getFont().getSize()));
-//          hashDataTextArea.setLineWrap(true);
-//          hashDataTextArea.setWrapStyleWord(true);
-//
-//          JScrollPane hashDataScrollPane = new JScrollPane(hashDataTextArea);
-//
-//          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-//          mainPanel.setLayout(mainPanelLayout);
-//
-//          mainPanelLayout.setHorizontalGroup(
-//             mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//              .addGroup(mainPanelLayout.createSequentialGroup()
-//                .addComponent(refIdLabel)
-//                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-//                .addComponent(helpLabel))
-//              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
-//
-//          mainPanelLayout.setVerticalGroup(
-//            mainPanelLayout.createSequentialGroup()
-//              .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//                .addComponent(refIdLabel)
-//                .addComponent(helpLabel))
-//              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-//              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
-//
-//          JButton backButton = new JButton();
-//          backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-//          backButton.setText(messages.getString(BUTTON_BACK));
-//          backButton.setActionCommand(cancelCommand);
-//          backButton.addActionListener(cancelListener);
-//
-//          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-//          buttonPanel.setLayout(buttonPanelLayout);
-//
-//          buttonPanelLayout.setHorizontalGroup(
-//            buttonPanelLayout.createSequentialGroup()
-//                  .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-//                  .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-//          buttonPanelLayout.setVerticalGroup(
-//            buttonPanelLayout.createSequentialGroup()
-//              .addComponent(backButton));
-//
-//          contentPanel.validate();
-//        }
-//      });
-//    }
-
-    private void showMultipleHashDataInputDialog(final TableModel signedReferences, final ActionListener cancelListener, final String cancelCommand, final ActionListener saveListener, final String saveCommand) {
-      
-      log.debug("scheduling multiple hashdatainput dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-        @Override
-        public void run() {
-          
-          log.debug("show multiple hashdatainput dialog");
-          
-          mainPanel.removeAll();
-          buttonPanel.removeAll();
-
-          if (renderHeaderPanel) {
-            titleLabel.setText(messages.getString(TITLE_HASHDATA));
-          }
-          
-          helpListener.setHelpTopic(HELP_HASHDATALIST);
-          
-          JLabel refIdLabel = new JLabel();
-          refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-          String refIdLabelPattern = messages.getString(MESSAGE_HASHDATALIST);
-          refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{signedReferences.getRowCount()}));
-
-          JTable hashDataTable = new JTable();
-          hashDataTable.setDefaultRenderer(HashDataInput.class, new HyperLinkRenderer());
-          hashDataTable.setModel(signedReferences);
-          hashDataTable.setTableHeader(null);
-  //        hashDataTable.setShowVerticalLines(false);
-  //        hashDataTable.setRowSelectionAllowed(false);
-//          TableColumn selectCol = hashDataTable.getColumnModel().getColumn(1);
-//          selectCol.setMinWidth(CHECKBOX_WIDTH);
-//          selectCol.setMaxWidth(CHECKBOX_WIDTH);
-
-
-//          hashDataTable.setPreferredScrollableViewportSize(mainPanel.getPreferredSize());
-
-          JScrollPane hashDataScrollPane = new JScrollPane(hashDataTable);
-
-          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-          mainPanel.setLayout(mainPanelLayout);
-
-          mainPanelLayout.setHorizontalGroup(
-            mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-              .addGroup(mainPanelLayout.createSequentialGroup()
-                .addComponent(refIdLabel)
-                .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                .addComponent(helpLabel))
-              .addComponent(hashDataScrollPane, 0, 0, Short.MAX_VALUE));
-
-          mainPanelLayout.setVerticalGroup(
-            mainPanelLayout.createSequentialGroup()
-              .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                .addComponent(refIdLabel)
-                .addComponent(helpLabel))
-              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-              .addComponent(hashDataScrollPane, 0, 0, hashDataTable.getPreferredSize().height+3));
-
-          JButton backButton = new JButton();
-          backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-          backButton.setText(messages.getString(BUTTON_BACK));
-          backButton.setActionCommand(cancelCommand);
-          backButton.addActionListener(cancelListener);
-
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
-
-                GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
-                GroupLayout.ParallelGroup buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                        .addComponent(backButton);
-                
-                if (renderCancelButton) {
-                  //render save button
-                  JButton saveButton = new JButton();
-                  saveButton.setText(messages.getString(BUTTON_SAVE));
-                  saveButton.setActionCommand(saveCommand);
-                  saveButton.addActionListener(saveListener);
-
-                  buttonHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                          .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
-                  buttonVertical
-                          .addComponent(saveButton);
-                }
-                
-                buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
-                buttonPanelLayout.setVerticalGroup(buttonVertical);
-
-          contentPanel.validate();
-        }
-      });
-    }
-    
-    private void showSaveHashDataInputDialog(final List<HashDataInput> signedRefs, final ActionListener okListener, final String okCommand) {
-      
-      log.debug("scheduling save hashdatainput dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-        @Override
-        public void run() {
-          
-          log.debug("show save hashdatainput dialog");
-      
-          String userHome = System.getProperty("user.home");
-          
-          JFileChooser fileDialog = new JFileChooser(userHome); 
-          fileDialog.setMultiSelectionEnabled(false);
-          fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
-          fileDialog.setFileHidingEnabled(true);
-          if (signedRefs.size() == 1) {
-            fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVE));
-            fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
-            String mimeType = signedRefs.get(0).getMimeType();
-            MimeFilter mimeFilter = new MimeFilter(mimeType, messages);
-            fileDialog.setFileFilter(mimeFilter);
-            String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + MimeFilter.getExtension(mimeType);
-            fileDialog.setSelectedFile(new File(userHome, filename));
-          } else {
-            fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVEDIR));
-            fileDialog.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-          }
-          
-          //parent contentPane -> placed over applet
-          switch (fileDialog.showSaveDialog(fileDialog)) {
-            case JFileChooser.APPROVE_OPTION:
-              File f = fileDialog.getSelectedFile();
-              for (HashDataInput hashDataInput : signedRefs) {
-                String mimeType = hashDataInput.getMimeType();
-                String id = hashDataInput.getReferenceId();
-                File file;
-                if (f.isDirectory()) {
-                  String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + '_' + id + MimeFilter.getExtension(mimeType);
-                  file = new File(f, filename);
-                } else {
-                  file = f;
-                }
-                if (file.exists()) {
-                  String ovrwrt = messages.getString(MESSAGE_OVERWRITE);
-                  int overwrite = JOptionPane.showConfirmDialog(fileDialog, MessageFormat.format(ovrwrt, file), messages.getString(WINDOWTITLE_OVERWRITE), JOptionPane.OK_CANCEL_OPTION);
-                  if (overwrite != JOptionPane.OK_OPTION) {
-                    continue;
-                  }
-                }
-                if (log.isDebugEnabled()) {
-                    log.debug("Writing HashDataInput " + id + " (" + mimeType + ") to file " + file);
-                }
-                FileOutputStream fos = null;
-                try {
-                    fos = new FileOutputStream(file);
-                    BufferedOutputStream bos = new BufferedOutputStream(fos);
-                    InputStream hdi = hashDataInput.getHashDataInput();
-                    int b;
-                    while ((b = hdi.read()) != -1) {
-                        bos.write(b);
-                    }
-                    bos.flush();
-                    bos.close();
-                } catch (IOException ex) {
-                    log.error("Failed to write HashDataInput to file " + file + ": " + ex.getMessage());
-                    showErrorDialog(ERR_WRITE_HASHDATA, new Object[] {ex.getMessage()}, null, null);
-                    ex.printStackTrace();
-                } finally {
-                    try {
-                        fos.close();
-                    } catch (IOException ex) {
-                    }
-                }    
-              }  
-          }
-          log.debug("done saving hashdatainput");
-          okListener.actionPerformed(new ActionEvent(fileDialog, ActionEvent.ACTION_PERFORMED, okCommand));
-        }
-      });
-    }
-    
-//    private static String getText(HashDataInput hdi) throws IOException {
-//      ByteArrayOutputStream baos = null;
-//      try {
-//        InputStream hashDataIS = hdi.getHashDataInput();
-//        if (hashDataIS == null) {
-//          log.error("No HashDataInput stream for reference " + hdi.getReferenceId());
-//          return null;
-//        } else {
-//          baos = new ByteArrayOutputStream(hashDataIS.available());
-//          int c;
-//          while ((c = hashDataIS.read()) != -1) {
-//              baos.write(c);
-//          }
-//          String encoding = hdi.getEncoding();
-//          if (encoding == null) {
-//            //default for URL-encoded
-//            encoding = "UTF-8";
-//          }
-//          return baos.toString(encoding);
-//        }
-//      } catch (IOException ex) {
-//          log.error("Failed to read HashDataInput for reference " + hdi.getReferenceId() + ": " + ex.getMessage());
-//          throw ex; 
-//      } finally {
-//          try {
-//              baos.close();
-//          } catch (IOException ex) {
-//          }
-//      }
-//    }
-    
-    private void registerHelpListener(ActionListener helpListener) {
-      if (helpListener != null) {
-        this.helpListener = new HelpMouseListener(helpListener);
-      } else {
-        log.error("no help listener provided, will not be able to display help");
-        this.helpListener = new HelpMouseListener(new ActionListener() {
-
-          @Override
-          public void actionPerformed(ActionEvent e) {
-            log.error("no help listener registered (requested help topic: " + e.getActionCommand() + ")");
-          }
-        });
-      }
-    }
-}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleHashDataTableModel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleHashDataTableModel.java
deleted file mode 100644
index 463dbe81..00000000
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SimpleHashDataTableModel.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.gui;
-
-import at.gv.egiz.stal.HashDataInput;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-import javax.swing.table.DefaultTableModel;
-
-/**
- *
- * @author clemens
- */
-class SimpleHashDataTableModel extends DefaultTableModel {
-
-  protected List<HashDataInput> signedReferences;
-  
-  protected Class[] types = new Class[]{
-    java.lang.String.class
-  };
-
-  public SimpleHashDataTableModel(List<HashDataInput> signedReferences) {
-    super(0, 1);
-    this.signedReferences = signedReferences;
-    for (HashDataInput hashDataInput : signedReferences) {
-      
-//      String desc = hashDataInput.getReferenceId() + " (" + hashDataInput.getMimeType() + ")";
-      addRow(new Object[]{hashDataInput});
-    }
-  }
-
-  @Override
-  public Class getColumnClass(int columnIndex) {
-    return types[columnIndex];
-  }
-
-  @Override
-  public boolean isCellEditable(int rowIndex, int columnIndex) {
-    if (columnIndex == 1)
-      return true;
-    return false;
-  }
-}
\ No newline at end of file
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index b57e1923..0d2712dd 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -32,16 +32,15 @@ import org.junit.Test;
  *
  * @author clemens
  */
-@Ignore
+//@Ignore
 public class BKUGUITest {
 
     @Test
     public void testBKUGUI() {
         JFrame testFrame = new JFrame("BKUGUITest");
-        BKUGUI gui = new BKUGUI();
         Container contentPane = testFrame.getContentPane();
         contentPane.setPreferredSize(new Dimension(380, 150));
-        gui.init(contentPane, null, BKUGUIFacade.Style.advanced, null, null);
+        BKUGUIFacade gui = BKUGUIFactory.createGUI(contentPane, null, BKUGUIFacade.Style.advanced, null, null);
         BKUGUIWorker worker = new BKUGUIWorker();
         worker.init(gui);
         testFrame.pack();
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 e4936067..82b42d0f 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
@@ -22,6 +22,7 @@ package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.stal.HashDataInput;
+import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.ByteArrayInputStream;
@@ -78,99 +79,36 @@ public class BKUGUIWorker implements Runnable {
             gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", null, "hashdata");
           }
         };
-        HashDataInput signedRef1 = new HashDataInput() {
-
-          @Override
-          public InputStream getHashDataInput() {
-            return new ByteArrayInputStream("Ich bin ein einfacher Text mit Umlauten: öäüßéç@€\n123\n456\n\tHello, world!\n\nlkjsd\nnksdjf".getBytes());
-          }
-
-          @Override
-          public String getMimeType() {
-            return "text/plain";
-          }
-
-          @Override
-          public String getReferenceId() {
-            return "Reference-ref1-00000000000000000000001";
-          }
-          @Override
-          public String getEncoding() {
-            return "UTF-8";
-          }
-        };
-        HashDataInput signedRef2 = new HashDataInput() {
-
-          @Override
-          public InputStream getHashDataInput() {
-            return new ByteArrayInputStream("<xml>HashDataInput_002</xml>".getBytes());
-          }
-
-          @Override
-          public String getMimeType() {
-            return "text/xml";
-          }
-
-          @Override
-          public String getReferenceId() {
-            return "Reference-ref2-00000000000000000000002";
-          }
-          @Override
-          public String getEncoding() {
-            return "UTF-8";
-          }
-        };
-        HashDataInput signedRef3 = new HashDataInput() {
-
-          @Override
-          public InputStream getHashDataInput() {
-            return new ByteArrayInputStream("<xml>HashDataInput_003</xml>".getBytes());
-          }
-
-          @Override
-          public String getMimeType() {
-            return "text/xml";
-          }
-
-          @Override
-          public String getReferenceId() {
-            return "Reference-ref3-00000000000000000000003";
-          }
-          
-          @Override
-          public String getEncoding() {
-            return "UTF-8";
-          }
-        };
-        HashDataInput signedRef4 = new HashDataInput() {
-
-          @Override
-          public InputStream getHashDataInput() {
-            return new ByteArrayInputStream("<xml>HashDataInput_004</xml>".getBytes());
-          }
-
-          @Override
-          public String getMimeType() {
-            return "text/xml";
-          }
-
-          @Override
-          public String getReferenceId() {
-            return "ref4";
-          }
-
-          @Override
-          public String getEncoding() {
-            return "UTF-8";
-          }
-        };
+        HashDataInput signedRef1 = new ByteArrayHashDataInput(
+                "Ich bin ein einfacher Text mit Umlauten: öäüßéç@€\n123\n456\n\tHello, world!\n\nlkjsd\nnksdjf".getBytes(), 
+                "ref-id-000000001", 
+                "text/plain", 
+                "UTF-8");
+        
+        HashDataInput signedRef2 = new ByteArrayHashDataInput(
+                "<xml>HashDataInput_002</xml>".getBytes(), 
+                "ref-id-000000002", 
+                "application/xhtml+xml", 
+                "UTF-8");
+        
+        HashDataInput signedRef3 = new ByteArrayHashDataInput(
+                "<xml>HashDataInput_003</xml>".getBytes(), 
+                "ref-id-000000003", 
+                "application/xhtml+xml", 
+                "UTF-8");
+
+        HashDataInput signedRef4 = new ByteArrayHashDataInput(
+                "<xml>HashDataInput_004</xml>".getBytes(), 
+                "ref-id-000000004", 
+                "text/xml", 
+                "UTF-8");
 
         //
         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,8 +120,8 @@ public class BKUGUIWorker implements Runnable {
 
 
 
-        gui.showWelcomeDialog();
-
+//        gui.showWelcomeDialog();
+//
 //        Thread.sleep(2000);
 //        
 //        gui.showWaitDialog(null);
@@ -209,7 +147,7 @@ public class BKUGUIWorker implements Runnable {
 //            
 //            Thread.sleep(2000);
 //
-//            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
 //
 //            Thread.sleep(4000);
 //
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
index bfce0f0d..46f915a9 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
@@ -109,7 +109,7 @@ public class LocalSignRequestHandler extends SignRequestHandler {
       log.error("dsig:SignedInfo does not contain a data reference");
       throw new Exception("dsig:SignedInfo does not contain a data reference");
     }
-    gui.showHashDataInputDialog(selectedHashDataInputs, this, "ok");
+    gui.showHashDataInputDialog(selectedHashDataInputs, this, "hashDataDone");
   }
 
   private ByteArrayHashDataInput getByteArrayHashDataInput(HashDataInput hashDataInput) throws IOException {
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
index 7012fec0..3ae739d9 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
@@ -61,7 +61,7 @@ public class SMCCSTALFactory implements STALFactory {
     }
     BKUGUIFacade gui = BKUGUIFactory.createGUI(dialog.getContentPane(), 
             dialog.getLocale(),
-            BKUGUIFactory.ADVANCED_GUI,
+            BKUGUIFacade.Style.advanced,
             null,
             helpListener);
     stal = new SMCCSTAL(new BKUGuiProxy(dialog, gui), dialog);
diff --git a/BKULocalApp/src/main/java/at/gv/egiz/bku/local/app/BKULauncher.java b/BKULocalApp/src/main/java/at/gv/egiz/bku/local/app/BKULauncher.java
index 23a893b4..b2022d22 100644
--- a/BKULocalApp/src/main/java/at/gv/egiz/bku/local/app/BKULauncher.java
+++ b/BKULocalApp/src/main/java/at/gv/egiz/bku/local/app/BKULauncher.java
@@ -66,7 +66,11 @@ public class BKULauncher implements BKUControllerInterface {
   private void initFinished() {
     try {
       if (splash != null) {
-        splash.close();
+        try {
+          splash.close();
+        } catch (IllegalStateException ex) {
+          log.warn("Failed to close splash screen: " + ex.getMessage());
+        }
       }
       server.join();
     } catch (InterruptedException e) {
-- 
cgit v1.2.3


From bc81c317e254fa617fc24c8129b743ac74aad470 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 19 Nov 2008 11:49:55 +0000
Subject: GUI feature complete

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@180 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/hs_err_pid32072.log                      | 453 ---------------------
 BKUApplet/src/test/resources/appletTest.html       |   2 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 158 ++++---
 .../at/gv/egiz/bku/gui/HashDataTableModel.java     |  98 ++---
 .../java/at/gv/egiz/bku/gui/HashDataViewer.java    |   6 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |   2 +-
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   |   6 +-
 7 files changed, 141 insertions(+), 584 deletions(-)
 delete mode 100644 BKUApplet/hs_err_pid32072.log

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/hs_err_pid32072.log b/BKUApplet/hs_err_pid32072.log
deleted file mode 100644
index cf86d1c5..00000000
--- a/BKUApplet/hs_err_pid32072.log
+++ /dev/null
@@ -1,453 +0,0 @@
-#
-# An unexpected error has been detected by Java Runtime Environment:
-#
-#  SIGBUS (0x7) at pc=0xb7bcbc53, pid=32072, tid=3033660304
-#
-# Java VM: Java HotSpot(TM) Client VM (10.0-b22 mixed mode, sharing linux-x86)
-# Problematic frame:
-# C  [libzip.so+0xbc53]
-#
-# If you would like to submit a bug report, please visit:
-#   http://java.sun.com/webapps/bugreport/crash.jsp
-# The crash happened outside the Java Virtual Machine in native code.
-# See problematic frame for where to report the bug.
-#
-
----------------  T H R E A D  ---------------
-
-Current thread (0xb4faa400):  JavaThread "Thread-2" [_thread_in_native, id=32091, stack(0xb4ccf000,0xb4d20000)]
-
-siginfo:si_signo=SIGBUS: si_errno=0, si_code=2 (BUS_ADRERR), si_addr=0xb5804fc0
-
-Registers:
-EAX=0x080576a8, EBX=0xb7bd07bc, ECX=0xb5803000, EDX=0x0002d000
-ESP=0xb4d1dc10, EBP=0xb4d1dc38, ESI=0xb5804fa3, EDI=0x0839b310
-EIP=0xb7bcbc53, CR2=0xb5804fc0, EFLAGS=0x00210286
-
-Top of Stack: (sp=0xb4d1dc10)
-0xb4d1dc10:   00000030 b4fa9370 b4fa9378 b4fa9764
-0xb4d1dc20:   08057568 08057568 b7bcbc0b b7bd07bc
-0xb4d1dc30:   0828f3cc 00000000 b4d1dc68 b7bcc00b
-0xb4d1dc40:   080576a8 0828f3cc 00000000 00000000
-0xb4d1dc50:   b4faa400 00000004 87c67713 b7bd07bc
-0xb4d1dc60:   b4d1dcb0 b4faa4f4 b4d1e0d8 b7bc31b9
-0xb4d1dc70:   080576a8 b4d1dcb0 00000025 00000025
-0xb4d1dc80:   b4d1dcb0 6c706d69 49554765 2e303124 
-
-Instructions: (pc=0xb7bcbc53)
-0xb7bcbc43:   8b 70 04 8b 45 08 8b 48 10 8b 50 1c 01 ce 29 d6
-0xb7bcbc53:   0f b6 46 1d 0f b6 56 1c c1 e0 08 09 c2 89 55 f0 
-
-Stack: [0xb4ccf000,0xb4d20000],  sp=0xb4d1dc10,  free space=315k
-Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
-C  [libzip.so+0xbc53]
-C  [libzip.so+0xc00b]  ZIP_GetEntry+0x10b
-C  [libzip.so+0x31b9]  Java_java_util_zip_ZipFile_getEntry+0xc9
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-J  sun.misc.URLClassPath$JarLoader.getResource(Ljava/lang/String;Z)Lsun/misc/Resource;
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::StubRoutines (1)
-V  [libjvm.so+0x21c5cd]
-V  [libjvm.so+0x310748]
-V  [libjvm.so+0x21c460]
-V  [libjvm.so+0x272313]
-C  [libjava.so+0xaa5c]  Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2+0x3c
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::StubRoutines (1)
-V  [libjvm.so+0x21c5cd]
-V  [libjvm.so+0x310748]
-V  [libjvm.so+0x21c0f1]
-V  [libjvm.so+0x21c1da]
-V  [libjvm.so+0x375867]
-V  [libjvm.so+0x374305]
-V  [libjvm.so+0x373377]
-V  [libjvm.so+0x373082]
-V  [libjvm.so+0x1bc043]
-V  [libjvm.so+0x20c8e6]
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::StubRoutines (1)
-V  [libjvm.so+0x21c5cd]
-V  [libjvm.so+0x310748]
-V  [libjvm.so+0x21bee0]
-V  [libjvm.so+0x21bf6d]
-V  [libjvm.so+0x28c175]
-V  [libjvm.so+0x391f8d]
-V  [libjvm.so+0x3113f9]
-C  [libpthread.so.0+0x54fb]
-
-Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-J  sun.misc.URLClassPath$JarLoader.getResource(Ljava/lang/String;Z)Lsun/misc/Resource;
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::StubRoutines (1)
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::StubRoutines (1)
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::Interpreter
-v  ~BufferBlob::StubRoutines (1)
-
----------------  P R O C E S S  ---------------
-
-Java Threads: ( => current thread )
-  0xb5702400 JavaThread "Thread-3" [_thread_blocked, id=32217, stack(0xb4c7e000,0xb4ccf000)]
-=>0xb4faa400 JavaThread "Thread-2" [_thread_in_native, id=32091, stack(0xb4ccf000,0xb4d20000)]
-  0x0828e400 JavaThread "AWT-EventQueue-1" [_thread_blocked, id=32089, stack(0xb4eaf000,0xb4f00000)]
-  0xb57b9400 JavaThread "TimerQueue" daemon [_thread_blocked, id=32088, stack(0xb4dd5000,0xb4e26000)]
-  0xb4f8a400 JavaThread "DestroyJavaVM" [_thread_blocked, id=32073, stack(0xb7c43000,0xb7c94000)]
-  0xb57a1400 JavaThread "AWT-EventQueue-0" [_thread_blocked, id=32086, stack(0xb507f000,0xb50d0000)]
-  0xb57a0800 JavaThread "AWT-Shutdown" [_thread_blocked, id=32085, stack(0xb50d0000,0xb5121000)]
-  0xb5792000 JavaThread "AWT-XAWT" daemon [_thread_in_native, id=32082, stack(0xb520c000,0xb525d000)]
-  0xb5751000 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=32081, stack(0xb5285000,0xb52d6000)]
-  0xb5700c00 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=32079, stack(0xb5823000,0xb5874000)]
-  0x0808c000 JavaThread "CompilerThread0" daemon [_thread_blocked, id=32078, stack(0xb5874000,0xb58f5000)]
-  0x0808ac00 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=32077, stack(0xb58f5000,0xb5946000)]
-  0x08081c00 JavaThread "Finalizer" daemon [_thread_blocked, id=32076, stack(0xb598c000,0xb59dd000)]
-  0x08080c00 JavaThread "Reference Handler" daemon [_thread_blocked, id=32075, stack(0xb59dd000,0xb5a2e000)]
-
-Other Threads:
-  0x0807f400 VMThread [stack: 0xb5a2e000,0xb5aaf000] [id=32074]
-  0xb570a400 WatcherThread [stack: 0xb567f000,0xb5700000] [id=32080]
-
-VM state:not at safepoint (normal execution)
-
-VM Mutex/Monitor currently owned by a thread: None
-
-Heap
- def new generation   total 960K, used 512K [0x8bfe0000, 0x8c0e0000, 0x8c4c0000)
-  eden space 896K,  50% used [0x8bfe0000, 0x8c050378, 0x8c0c0000)
-  from space 64K, 100% used [0x8c0d0000, 0x8c0e0000, 0x8c0e0000)
-  to   space 64K,   0% used [0x8c0c0000, 0x8c0c0000, 0x8c0d0000)
- tenured generation   total 4096K, used 3837K [0x8c4c0000, 0x8c8c0000, 0x8ffe0000)
-   the space 4096K,  93% used [0x8c4c0000, 0x8c87f6a0, 0x8c87f800, 0x8c8c0000)
- compacting perm gen  total 12288K, used 6940K [0x8ffe0000, 0x90be0000, 0x93fe0000)
-   the space 12288K,  56% used [0x8ffe0000, 0x906a7308, 0x906a7400, 0x90be0000)
-    ro space 8192K,  73% used [0x93fe0000, 0x945c34a0, 0x945c3600, 0x947e0000)
-    rw space 12288K,  58% used [0x947e0000, 0x94ed8668, 0x94ed8800, 0x953e0000)
-
-Dynamic libraries:
-06000000-0641b000 r-xp 00000000 08:02 1085428    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/client/libjvm.so
-0641b000-06435000 rwxp 0041a000 08:02 1085428    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/client/libjvm.so
-06435000-06855000 rwxp 06435000 00:00 0 
-08048000-08052000 r-xp 00000000 08:02 1085534    /usr/lib/jvm/java-6-sun-1.6.0.06/bin/appletviewer
-08052000-08053000 rwxp 00009000 08:02 1085534    /usr/lib/jvm/java-6-sun-1.6.0.06/bin/appletviewer
-08053000-083f5000 rwxp 08053000 00:00 0          [heap]
-8bfe0000-8c0e0000 rwxp 8bfe0000 00:00 0 
-8c0e0000-8c4c0000 rwxp 8c0e0000 00:00 0 
-8c4c0000-8c8c0000 rwxp 8c4c0000 00:00 0 
-8c8c0000-8ffe0000 rwxp 8c8c0000 00:00 0 
-8ffe0000-90be0000 rwxp 8ffe0000 00:00 0 
-90be0000-93fe0000 rwxp 90be0000 00:00 0 
-93fe0000-945c4000 r-xs 00001000 08:02 1081430    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/client/classes.jsa
-945c4000-947e0000 rwxp 945c4000 00:00 0 
-947e0000-94ed9000 rwxp 005e5000 08:02 1081430    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/client/classes.jsa
-94ed9000-953e0000 rwxp 94ed9000 00:00 0 
-953e0000-954b9000 rwxp 00cde000 08:02 1081430    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/client/classes.jsa
-954b9000-957e0000 rwxp 954b9000 00:00 0 
-957e0000-957e4000 r-xs 00db7000 08:02 1081430    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/client/classes.jsa
-957e4000-95be0000 rwxp 957e4000 00:00 0 
-b4c7e000-b4c81000 ---p b4c7e000 00:00 0 
-b4c81000-b4ccf000 rwxp b4c81000 00:00 0 
-b4ccf000-b4cd2000 ---p b4ccf000 00:00 0 
-b4cd2000-b4d20000 rwxp b4cd2000 00:00 0 
-b4d20000-b4d23000 r-xs 00000000 08:02 3560016    /var/cache/fontconfig/5e10083637a12ecd1bff191eb66bfa2f-x86.cache-2
-b4d23000-b4d29000 r-xs 00000000 08:02 3560014    /var/cache/fontconfig/945677eb7aeaf62f1d50efc3fb3ec7d8-x86.cache-2
-b4d29000-b4d2c000 r-xs 00000000 08:02 3560019    /var/cache/fontconfig/e383d7ea5fbe662a33d9b44caf393297-x86.cache-2
-b4d2c000-b4d31000 r-xs 00000000 08:02 3560011    /var/cache/fontconfig/bddabcf04192498a6a74911686fc6962-x86.cache-2
-b4d31000-b4d34000 r-xs 00000000 08:02 3556212    /var/cache/fontconfig/a46337af8a0b4c9b317ad981ec3bdf87-x86.cache-2
-b4d34000-b4d35000 r-xs 00000000 08:02 3560013    /var/cache/fontconfig/fd9505950c048a77dc4b710eb6a628ed-x86.cache-2
-b4d35000-b4d37000 r-xs 00000000 08:02 3560021    /var/cache/fontconfig/ddc79d3ea06a7c6ffa86ede85f3bb5df-x86.cache-2
-b4d37000-b4d38000 r-xs 00000000 08:02 3560164    /var/cache/fontconfig/e3fa16a14183b06aa45b3e009278fd14-x86.cache-2
-b4d38000-b4d39000 r-xs 00000000 08:02 3560125    /var/cache/fontconfig/e7071f4a29fa870f4323321c154eba04-x86.cache-2
-b4d39000-b4d3a000 r-xs 00000000 08:02 3560023    /var/cache/fontconfig/a2ab74764b07279e7c36ddb1d302cf26-x86.cache-2
-b4d3a000-b4d3e000 r-xs 00000000 08:02 3560003    /var/cache/fontconfig/921a30a17f0be15c70ac14043cb7a739-x86.cache-2
-b4d3e000-b4d3f000 r-xs 00000000 08:02 3560018    /var/cache/fontconfig/c69f04ab05004e31a6d5e715764f16d8-x86.cache-2
-b4d3f000-b4d40000 r-xs 00000000 08:02 3560008    /var/cache/fontconfig/4c73fe0c47614734b17d736dbde7580a-x86.cache-2
-b4d40000-b4d42000 r-xs 00000000 08:02 3560007    /var/cache/fontconfig/646addb8444faa74ee138aa00ab0b6a0-x86.cache-2
-b4d42000-b4d45000 r-xs 00000000 08:02 3560006    /var/cache/fontconfig/a755afe4a08bf5b97852ceb7400b47bc-x86.cache-2
-b4d45000-b4d47000 r-xs 00000000 08:02 3560015    /var/cache/fontconfig/20bd79ad97094406f7d1b9654bfbd926-x86.cache-2
-b4d47000-b4d49000 r-xs 00000000 08:02 3560009    /var/cache/fontconfig/9c0624108b9a2ae8552f664125be8356-x86.cache-2
-b4d49000-b4d50000 r-xs 00000000 08:02 3560004    /var/cache/fontconfig/6d41288fd70b0be22e8c3a91e032eec0-x86.cache-2
-b4d50000-b4d53000 r-xs 00000000 08:02 3560012    /var/cache/fontconfig/de156ccd2eddbdc19d37a45b8b2aac9c-x86.cache-2
-b4d53000-b4d55000 r-xs 00000000 08:02 3556204    /var/cache/fontconfig/da1bd5ca8443ffe22927a23ce431d198-x86.cache-2
-b4d55000-b4d5d000 r-xs 00000000 08:02 3560169    /var/cache/fontconfig/e3de0de479f42330eadf588a55fb5bf4-x86.cache-2
-b4d5d000-b4d65000 r-xs 00000000 08:02 2409868    /var/cache/fontconfig/0f34bcd4b6ee430af32735b75db7f02b-x86.cache-2
-b4d65000-b4d66000 r-xs 00000000 08:02 3560126    /var/cache/fontconfig/4794a0821666d79190d59a36cb4f44b5-x86.cache-2
-b4d66000-b4d88000 r-xs 00000000 08:02 1392718    /var/cache/fontconfig/365b55f210c0a22e9a19e35191240f32-x86.cache-2
-b4d88000-b4d8a000 r-xs 00000000 08:02 3560017    /var/cache/fontconfig/2c5ba8142dffc8bf0377700342b8ca1a-x86.cache-2
-b4d8a000-b4d8d000 r-xs 00000000 08:02 3560022    /var/cache/fontconfig/de9486f0b47a4d768a594cb4198cb1c6-x86.cache-2
-b4d8d000-b4d94000 r-xs 00000000 08:02 3556202    /var/cache/fontconfig/d52a8644073d54c13679302ca1180695-x86.cache-2
-b4d94000-b4d99000 r-xs 00000000 08:02 3558093    /var/cache/fontconfig/105b9c7e6f0a4f82d8c9b6e39c52c6f9-x86.cache-2
-b4d99000-b4d9c000 r-xs 00000000 08:02 3560677    /var/cache/fontconfig/6386b86020ecc1ef9690bb720a13964f-x86.cache-2
-b4d9c000-b4da7000 r-xs 00000000 08:02 3556115    /var/cache/fontconfig/089dead882dea3570ffc31a9898cfb69-x86.cache-2
-b4da7000-b4db4000 r-xs 00000000 08:02 2409873    /var/cache/fontconfig/e13b20fdb08344e0e664864cc2ede53d-x86.cache-2
-b4dd5000-b4dd8000 ---p b4dd5000 00:00 0 
-b4dd8000-b4e26000 rwxp b4dd8000 00:00 0 
-b4e3b000-b4e46000 rwxs 00000000 00:09 1831534605  /SYSV00000000 (deleted)
-b4e46000-b4e47000 r--s 0000f000 00:11 751021     /var/run/pcscd/pcscd.pub
-b4e47000-b4e48000 r--s 0000e000 00:11 751021     /var/run/pcscd/pcscd.pub
-b4e48000-b4e49000 r--s 0000d000 00:11 751021     /var/run/pcscd/pcscd.pub
-b4e49000-b4e4a000 r--s 0000c000 00:11 751021     /var/run/pcscd/pcscd.pub
-b4e4a000-b4e4b000 r--s 0000b000 00:11 751021     /var/run/pcscd/pcscd.pub
-b4e4b000-b4e4c000 r--s 0000a000 00:11 751021     /var/run/pcscd/pcscd.pub
-b4e4c000-b4e4d000 r--s 00009000 00:11 751021     /var/run/pcscd/pcscd.pub
-b4e4d000-b4e4e000 r--s 00008000 00:11 751021     /var/run/pcscd/pcscd.pub
-b4e4e000-b4e4f000 r--s 00007000 00:11 751021     /var/run/pcscd/pcscd.pub
-b4e4f000-b4e50000 r--s 00006000 00:11 751021     /var/run/pcscd/pcscd.pub
-b4e50000-b4e51000 r--s 00005000 00:11 751021     /var/run/pcscd/pcscd.pub
-b4e51000-b4e52000 r--s 00004000 00:11 751021     /var/run/pcscd/pcscd.pub
-b4e52000-b4e5a000 r-xp 00000000 08:02 901283     /usr/lib/libpcsclite.so.1.0.0
-b4e5a000-b4e5b000 rwxp 00008000 08:02 901283     /usr/lib/libpcsclite.so.1.0.0
-b4e5b000-b4e5d000 r-xp 00000000 08:02 1085449    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libj2pcsc.so
-b4e5d000-b4e5e000 rwxp 00001000 08:02 1085449    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libj2pcsc.so
-b4e5e000-b4e61000 rwxp b4e5e000 00:00 0 
-b4e61000-b4eaf000 rwxp b4e61000 00:00 0 
-b4eaf000-b4eb2000 ---p b4eaf000 00:00 0 
-b4eb2000-b4fd2000 rwxp b4eb2000 00:00 0 
-b4fd2000-b5000000 ---p b4fd2000 00:00 0 
-b5000000-b5001000 r--s 00003000 00:11 751021     /var/run/pcscd/pcscd.pub
-b5001000-b5004000 r-xs 00027000 08:02 1086682    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/ext/sunjce_provider.jar
-b5004000-b5036000 rwxp b5004000 00:00 0 
-b5036000-b503a000 r-xs 00000000 08:02 3555788    /var/cache/fontconfig/4a195c91033ef4528a35b4a1ac51414e-x86.cache-2
-b503a000-b5048000 r-xs 00000000 08:02 3557818    /var/cache/fontconfig/865f88548240fee46819705c6468c165-x86.cache-2
-b5048000-b504f000 r-xs 00110000 08:02 1065527    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/resources.jar
-b504f000-b5077000 rwxp b504f000 00:00 0 
-b5077000-b507e000 r-xp 00000000 08:02 1085443    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libnio.so
-b507e000-b507f000 rwxp 00006000 08:02 1085443    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libnio.so
-b507f000-b5082000 ---p b507f000 00:00 0 
-b5082000-b50d0000 rwxp b5082000 00:00 0 
-b50d0000-b50d3000 ---p b50d0000 00:00 0 
-b50d3000-b5121000 rwxp b50d3000 00:00 0 
-b5121000-b5124000 r-xs 00000000 08:02 3560016    /var/cache/fontconfig/5e10083637a12ecd1bff191eb66bfa2f-x86.cache-2
-b5124000-b512a000 r-xs 00000000 08:02 3560014    /var/cache/fontconfig/945677eb7aeaf62f1d50efc3fb3ec7d8-x86.cache-2
-b512a000-b512d000 r-xs 00000000 08:02 3560019    /var/cache/fontconfig/e383d7ea5fbe662a33d9b44caf393297-x86.cache-2
-b512d000-b5132000 r-xs 00000000 08:02 3560011    /var/cache/fontconfig/bddabcf04192498a6a74911686fc6962-x86.cache-2
-b5132000-b5135000 r-xs 00000000 08:02 3556212    /var/cache/fontconfig/a46337af8a0b4c9b317ad981ec3bdf87-x86.cache-2
-b5135000-b5136000 r-xs 00000000 08:02 3560013    /var/cache/fontconfig/fd9505950c048a77dc4b710eb6a628ed-x86.cache-2
-b5136000-b5138000 r-xs 00000000 08:02 3560021    /var/cache/fontconfig/ddc79d3ea06a7c6ffa86ede85f3bb5df-x86.cache-2
-b5138000-b5139000 r-xs 00000000 08:02 3560164    /var/cache/fontconfig/e3fa16a14183b06aa45b3e009278fd14-x86.cache-2
-b5139000-b513a000 r-xs 00000000 08:02 3560125    /var/cache/fontconfig/e7071f4a29fa870f4323321c154eba04-x86.cache-2
-b513a000-b513b000 r-xs 00000000 08:02 3560023    /var/cache/fontconfig/a2ab74764b07279e7c36ddb1d302cf26-x86.cache-2
-b513b000-b513f000 r-xs 00000000 08:02 3560003    /var/cache/fontconfig/921a30a17f0be15c70ac14043cb7a739-x86.cache-2
-b513f000-b5140000 r-xs 00000000 08:02 3560018    /var/cache/fontconfig/c69f04ab05004e31a6d5e715764f16d8-x86.cache-2
-b5140000-b5141000 r-xs 00000000 08:02 3560008    /var/cache/fontconfig/4c73fe0c47614734b17d736dbde7580a-x86.cache-2
-b5141000-b5143000 r-xs 00000000 08:02 3560007    /var/cache/fontconfig/646addb8444faa74ee138aa00ab0b6a0-x86.cache-2
-b5143000-b5146000 r-xs 00000000 08:02 3560006    /var/cache/fontconfig/a755afe4a08bf5b97852ceb7400b47bc-x86.cache-2
-b5146000-b5148000 r-xs 00000000 08:02 3560015    /var/cache/fontconfig/20bd79ad97094406f7d1b9654bfbd926-x86.cache-2
-b5148000-b514a000 r-xs 00000000 08:02 3560009    /var/cache/fontconfig/9c0624108b9a2ae8552f664125be8356-x86.cache-2
-b514a000-b5151000 r-xs 00000000 08:02 3560004    /var/cache/fontconfig/6d41288fd70b0be22e8c3a91e032eec0-x86.cache-2
-b5151000-b5154000 r-xs 00000000 08:02 3560012    /var/cache/fontconfig/de156ccd2eddbdc19d37a45b8b2aac9c-x86.cache-2
-b5154000-b5156000 r-xs 00000000 08:02 3556204    /var/cache/fontconfig/da1bd5ca8443ffe22927a23ce431d198-x86.cache-2
-b5156000-b515e000 r-xs 00000000 08:02 3560169    /var/cache/fontconfig/e3de0de479f42330eadf588a55fb5bf4-x86.cache-2
-b515e000-b5166000 r-xs 00000000 08:02 2409868    /var/cache/fontconfig/0f34bcd4b6ee430af32735b75db7f02b-x86.cache-2
-b5166000-b5167000 r-xs 00000000 08:02 3560126    /var/cache/fontconfig/4794a0821666d79190d59a36cb4f44b5-x86.cache-2
-b5167000-b5189000 r-xs 00000000 08:02 1392718    /var/cache/fontconfig/365b55f210c0a22e9a19e35191240f32-x86.cache-2
-b5189000-b518b000 r-xs 00000000 08:02 3560017    /var/cache/fontconfig/2c5ba8142dffc8bf0377700342b8ca1a-x86.cache-2
-b518b000-b518e000 r-xs 00000000 08:02 3560022    /var/cache/fontconfig/de9486f0b47a4d768a594cb4198cb1c6-x86.cache-2
-b518e000-b5195000 r-xs 00000000 08:02 3556202    /var/cache/fontconfig/d52a8644073d54c13679302ca1180695-x86.cache-2
-b5195000-b519a000 r-xs 00000000 08:02 3558093    /var/cache/fontconfig/105b9c7e6f0a4f82d8c9b6e39c52c6f9-x86.cache-2
-b519a000-b519d000 r-xs 00000000 08:02 3560677    /var/cache/fontconfig/6386b86020ecc1ef9690bb720a13964f-x86.cache-2
-b519d000-b51a8000 r-xs 00000000 08:02 3556115    /var/cache/fontconfig/089dead882dea3570ffc31a9898cfb69-x86.cache-2
-b51a8000-b51b5000 r-xs 00000000 08:02 2409873    /var/cache/fontconfig/e13b20fdb08344e0e664864cc2ede53d-x86.cache-2
-b51b5000-b51bb000 r-xs 00091000 08:02 1065704    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/jsse.jar
-b51bb000-b51be000 rwxp b51bb000 00:00 0 
-b51be000-b520c000 rwxp b51be000 00:00 0 
-b520c000-b520f000 ---p b520c000 00:00 0 
-b520f000-b525d000 rwxp b520f000 00:00 0 
-b525d000-b5264000 r-xp 00000000 08:02 1343649    /usr/lib/libXrender.so.1.3.0
-b5264000-b5265000 rwxp 00007000 08:02 1343649    /usr/lib/libXrender.so.1.3.0
-b5265000-b526d000 r-xp 00000000 08:02 1343710    /usr/lib/libXcursor.so.1.0.2
-b526d000-b526e000 rwxp 00007000 08:02 1343710    /usr/lib/libXcursor.so.1.0.2
-b526e000-b526f000 r--s 00002000 00:11 751021     /var/run/pcscd/pcscd.pub
-b526f000-b5271000 r-xs 00017000 08:02 4065150    /home/clemens/workspace/mocca/BKUApplet/target/test-libs/iaik_jce_me4se-3.04.jar
-b5271000-b5284000 r-xp 00000000 08:02 1085442    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libnet.so
-b5284000-b5285000 rwxp 00013000 08:02 1085442    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libnet.so
-b5285000-b5288000 ---p b5285000 00:00 0 
-b5288000-b52d6000 rwxp b5288000 00:00 0 
-b52d6000-b5354000 r-xp 00000000 08:02 1085586    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libfontmanager.so
-b5354000-b535e000 rwxp 0007e000 08:02 1085586    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libfontmanager.so
-b535e000-b5363000 rwxp b535e000 00:00 0 
-b5363000-b536a000 r-xp 00000000 08:02 1343653    /usr/lib/libXi.so.6.0.0
-b536a000-b536b000 rwxp 00006000 08:02 1343653    /usr/lib/libXi.so.6.0.0
-b536b000-b5378000 r-xp 00000000 08:02 902010     /usr/lib/libXext.so.6.4.0
-b5378000-b5379000 rwxp 0000d000 08:02 902010     /usr/lib/libXext.so.6.4.0
-b5379000-b53ba000 r-xp 00000000 08:02 1085581    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/xawt/libmawt.so
-b53ba000-b53bd000 rwxp 00040000 08:02 1085581    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/xawt/libmawt.so
-b53bd000-b5438000 r-xp 00000000 08:02 1085578    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libawt.so
-b5438000-b543f000 rwxp 0007b000 08:02 1085578    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libawt.so
-b543f000-b5463000 rwxp b543f000 00:00 0 
-b5463000-b54c2000 r-xs 00b89000 08:02 1085573    /usr/lib/jvm/java-6-sun-1.6.0.06/lib/tools.jar
-b54c2000-b54f4000 rwxp b54c2000 00:00 0 
-b54f4000-b567f000 r-xs 02df0000 08:02 1065570    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/rt.jar
-b567f000-b5680000 ---p b567f000 00:00 0 
-b5680000-b5800000 rwxp b5680000 00:00 0 
-b5800000-b5801000 r--s 00001000 00:11 751021     /var/run/pcscd/pcscd.pub
-b5801000-b5803000 r-xs 0000d000 08:02 4065123    /home/clemens/workspace/mocca/BKUApplet/target/test-libs/commons-logging-1.1.1.jar
-b5803000-b5807000 r-xs 0002d000 08:02 4050367    /home/clemens/workspace/mocca/BKUApplet/target/BKUApplet-1.0-SNAPSHOT.jar
-b5807000-b580b000 r-xp 00000000 08:02 1343688    /usr/lib/libXtst.so.6.1.0
-b580b000-b580c000 rwxp 00003000 08:02 1343688    /usr/lib/libXtst.so.6.1.0
-b580c000-b5810000 r-xp 00000000 08:02 905383     /usr/lib/libXfixes.so.3.1.0
-b5810000-b5811000 rwxp 00003000 08:02 905383     /usr/lib/libXfixes.so.3.1.0
-b5811000-b5815000 r-xs 00000000 08:02 3555788    /var/cache/fontconfig/4a195c91033ef4528a35b4a1ac51414e-x86.cache-2
-b5815000-b5823000 r-xs 00000000 08:02 3557818    /var/cache/fontconfig/865f88548240fee46819705c6468c165-x86.cache-2
-b5823000-b5826000 ---p b5823000 00:00 0 
-b5826000-b5874000 rwxp b5826000 00:00 0 
-b5874000-b5877000 ---p b5874000 00:00 0 
-b5877000-b58f5000 rwxp b5877000 00:00 0 
-b58f5000-b58f8000 ---p b58f5000 00:00 0 
-b58f8000-b5946000 rwxp b58f8000 00:00 0 
-b5946000-b594d000 r-xs 00000000 08:02 912666     /usr/lib/gconv/gconv-modules.cache
-b594d000-b598c000 r-xp 00000000 08:02 2162962    /usr/lib/locale/de_AT.utf8/LC_CTYPE
-b598c000-b598f000 ---p b598c000 00:00 0 
-b598f000-b59dd000 rwxp b598f000 00:00 0 
-b59dd000-b59e0000 ---p b59dd000 00:00 0 
-b59e0000-b5a2e000 rwxp b59e0000 00:00 0 
-b5a2e000-b5a2f000 ---p b5a2e000 00:00 0 
-b5a2f000-b5abd000 rwxp b5a2f000 00:00 0 
-b5abd000-b5ad7000 rwxp b5abd000 00:00 0 
-b5ad7000-b5ada000 rwxp b5ad7000 00:00 0 
-b5ada000-b5af5000 rwxp b5ada000 00:00 0 
-b5af5000-b5af6000 rwxp b5af5000 00:00 0 
-b5af6000-b5af7000 rwxp b5af6000 00:00 0 
-b5af7000-b5afa000 rwxp b5af7000 00:00 0 
-b5afa000-b5b15000 rwxp b5afa000 00:00 0 
-b5b15000-b5b1b000 rwxp b5b15000 00:00 0 
-b5b1b000-b5b35000 rwxp b5b1b000 00:00 0 
-b5b35000-b5b46000 rwxp b5b35000 00:00 0 
-b5b46000-b5bc0000 rwxp b5b46000 00:00 0 
-b5bc0000-b5d10000 rwxp b5bc0000 00:00 0 
-b5d10000-b7bc0000 rwxp b5d10000 00:00 0 
-b7bc0000-b7bcf000 r-xp 00000000 08:02 1085437    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libzip.so
-b7bcf000-b7bd1000 rwxp 0000e000 08:02 1085437    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libzip.so
-b7bd1000-b7bf4000 r-xp 00000000 08:02 1085434    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libjava.so
-b7bf4000-b7bf6000 rwxp 00023000 08:02 1085434    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libjava.so
-b7bf6000-b7bff000 r-xp 00000000 08:02 2785878    /lib/tls/i686/cmov/libnss_files-2.7.so
-b7bff000-b7c01000 rwxp 00008000 08:02 2785878    /lib/tls/i686/cmov/libnss_files-2.7.so
-b7c01000-b7c09000 r-xp 00000000 08:02 2785986    /lib/tls/i686/cmov/libnss_nis-2.7.so
-b7c09000-b7c0b000 rwxp 00007000 08:02 2785986    /lib/tls/i686/cmov/libnss_nis-2.7.so
-b7c0b000-b7c1f000 r-xp 00000000 08:02 2785874    /lib/tls/i686/cmov/libnsl-2.7.so
-b7c1f000-b7c21000 rwxp 00013000 08:02 2785874    /lib/tls/i686/cmov/libnsl-2.7.so
-b7c21000-b7c23000 rwxp b7c21000 00:00 0 
-b7c23000-b7c24000 r--s 00000000 00:11 751021     /var/run/pcscd/pcscd.pub
-b7c24000-b7c25000 r-xs 00000000 08:02 3556750    /var/cache/fontconfig/4c599c202bc5c08e2d34565a40eac3b2-x86.cache-2
-b7c25000-b7c26000 r-xs 00000000 08:02 3556750    /var/cache/fontconfig/4c599c202bc5c08e2d34565a40eac3b2-x86.cache-2
-b7c26000-b7c31000 r-xp 00000000 08:02 1085433    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libverify.so
-b7c31000-b7c32000 rwxp 0000b000 08:02 1085433    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/libverify.so
-b7c32000-b7c3a000 rwxs 00000000 08:02 1328188    /tmp/hsperfdata_clemens/32072
-b7c3a000-b7c41000 r-xp 00000000 08:02 2786023    /lib/tls/i686/cmov/librt-2.7.so
-b7c41000-b7c43000 rwxp 00006000 08:02 2786023    /lib/tls/i686/cmov/librt-2.7.so
-b7c43000-b7c46000 ---p b7c43000 00:00 0 
-b7c46000-b7c94000 rwxp b7c46000 00:00 0 
-b7c94000-b7cb7000 r-xp 00000000 08:02 2785871    /lib/tls/i686/cmov/libm-2.7.so
-b7cb7000-b7cb9000 rwxp 00023000 08:02 2785871    /lib/tls/i686/cmov/libm-2.7.so
-b7cb9000-b7cba000 rwxp b7cb9000 00:00 0 
-b7cba000-b7cbe000 r-xp 00000000 08:02 905230     /usr/lib/libXdmcp.so.6.0.0
-b7cbe000-b7cbf000 rwxp 00003000 08:02 905230     /usr/lib/libXdmcp.so.6.0.0
-b7cbf000-b7cc1000 r-xp 00000000 08:02 901311     /usr/lib/libXau.so.6.0.0
-b7cc1000-b7cc2000 rwxp 00001000 08:02 901311     /usr/lib/libXau.so.6.0.0
-b7cc2000-b7cd9000 r-xp 00000000 08:02 901194     /usr/lib/libxcb.so.1.0.0
-b7cd9000-b7cda000 rwxp 00016000 08:02 901194     /usr/lib/libxcb.so.1.0.0
-b7cda000-b7cdb000 rwxp b7cda000 00:00 0 
-b7cdb000-b7cdc000 r-xp 00000000 08:02 901196     /usr/lib/libxcb-xlib.so.0.0.0
-b7cdc000-b7cdd000 rwxp 00000000 08:02 901196     /usr/lib/libxcb-xlib.so.0.0.0
-b7cdd000-b7e26000 r-xp 00000000 08:02 2785863    /lib/tls/i686/cmov/libc-2.7.so
-b7e26000-b7e27000 r-xp 00149000 08:02 2785863    /lib/tls/i686/cmov/libc-2.7.so
-b7e27000-b7e29000 rwxp 0014a000 08:02 2785863    /lib/tls/i686/cmov/libc-2.7.so
-b7e29000-b7e2c000 rwxp b7e29000 00:00 0 
-b7e2c000-b7e2e000 r-xp 00000000 08:02 2785869    /lib/tls/i686/cmov/libdl-2.7.so
-b7e2e000-b7e30000 rwxp 00001000 08:02 2785869    /lib/tls/i686/cmov/libdl-2.7.so
-b7e30000-b7e37000 r-xp 00000000 08:02 1085436    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/jli/libjli.so
-b7e37000-b7e39000 rwxp 00006000 08:02 1085436    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/jli/libjli.so
-b7e39000-b7f1d000 r-xp 00000000 08:02 901308     /usr/lib/libX11.so.6.2.0
-b7f1d000-b7f20000 rwxp 000e4000 08:02 901308     /usr/lib/libX11.so.6.2.0
-b7f20000-b7f21000 rwxp b7f20000 00:00 0 
-b7f21000-b7f35000 r-xp 00000000 08:02 2786020    /lib/tls/i686/cmov/libpthread-2.7.so
-b7f35000-b7f37000 rwxp 00013000 08:02 2786020    /lib/tls/i686/cmov/libpthread-2.7.so
-b7f37000-b7f3e000 rwxp b7f37000 00:00 0 
-b7f3e000-b7f45000 r-xp 00000000 08:02 2785875    /lib/tls/i686/cmov/libnss_compat-2.7.so
-b7f45000-b7f47000 rwxp 00006000 08:02 2785875    /lib/tls/i686/cmov/libnss_compat-2.7.so
-b7f47000-b7f4d000 r-xp 00000000 08:02 1085422    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/native_threads/libhpi.so
-b7f4d000-b7f4e000 rwxp 00006000 08:02 1085422    /usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/native_threads/libhpi.so
-b7f4e000-b7f4f000 rwxp b7f4e000 00:00 0 
-b7f4f000-b7f50000 r-xp b7f4f000 00:00 0 
-b7f50000-b7f52000 rwxp b7f50000 00:00 0 
-b7f52000-b7f53000 r-xp b7f52000 00:00 0          [vdso]
-b7f53000-b7f6d000 r-xp 00000000 08:02 2786582    /lib/ld-2.7.so
-b7f6d000-b7f6f000 rwxp 00019000 08:02 2786582    /lib/ld-2.7.so
-bfaac000-bfac1000 rwxp bffeb000 00:00 0          [stack]
-
-VM Arguments:
-jvm_args: -Dapplication.home=/usr/lib/jvm/java-6-sun-1.6.0.06 
-java_command: sun.applet.Main target/test-classes/appletTest.html
-Launcher Type: SUN_STANDARD
-
-Environment Variables:
-JAVA_HOME=/usr/lib/jvm/java-6-sun
-PATH=/home/clemens/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games
-LD_LIBRARY_PATH=/usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386/client:/usr/lib/jvm/java-6-sun-1.6.0.06/jre/lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.06/jre/../lib/i386
-SHELL=/bin/bash
-DISPLAY=:0
-
-Signal Handlers:
-SIGSEGV: [libjvm.so+0x3be710], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
-SIGBUS: [libjvm.so+0x3be710], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
-SIGFPE: [libjvm.so+0x30f810], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
-SIGPIPE: [libjvm.so+0x30f810], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
-SIGXFSZ: [libjvm.so+0x30f810], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
-SIGILL: [libjvm.so+0x30f810], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
-SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000
-SIGUSR2: [libjvm.so+0x311850], sa_mask[0]=0x00000000, sa_flags=0x10000004
-SIGHUP: [libjvm.so+0x3115f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
-SIGINT: [libjvm.so+0x3115f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
-SIGTERM: [libjvm.so+0x3115f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
-SIGQUIT: [libjvm.so+0x3115f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
-
-
----------------  S Y S T E M  ---------------
-
-OS:lenny/sid
-
-uname:Linux 2.6.24-19-generic #1 SMP Fri Jul 11 23:41:49 UTC 2008 i686
-libc:glibc 2.7 NPTL 2.7 
-rlimit: STACK 8192k, CORE 0k, NPROC 16381, NOFILE 1024, AS infinity
-load average:0.84 0.39 0.22
-
-CPU:total 2 (1 cores per cpu, 2 threads per core) family 15 model 4 stepping 3, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ht
-
-Memory: 4k page, physical 2075432k(62584k free), swap 1542200k(1502244k free)
-
-vm_info: Java HotSpot(TM) Client VM (10.0-b22) for linux-x86 JRE (1.6.0_06-b02), built on Mar 25 2008 00:39:19 by "java_re" with gcc 3.2.1-7a (J2SE release)
-
-time: Thu Oct  9 12:01:31 2008
-elapsed time: 55 seconds
-
diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
index 8204d0eb..2570e021 100644
--- a/BKUApplet/src/test/resources/appletTest.html
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -18,7 +18,7 @@
   <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"
+              archive="../BKUApplet-1.0.jar, ../test-libs/commons-logging-1.1.1.jar , ../test-libs/iaik_jce_me4se-3.04.jar"
               width=300 height=200>
               <param name="GuiStyle" value="simple"/>
               <!--param name="Background" value="jar:file:/home/clemens/workspace/mocca/BKUApplet/target/BKUApplet-1.0-SNAPSHOT.jar!/images/help.png"/-->
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 9d23315c..38247174 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -38,6 +38,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.swing.CellRendererPane;
 import javax.swing.GroupLayout;
 import javax.swing.ImageIcon;
@@ -50,8 +52,12 @@ import javax.swing.JPasswordField;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.LayoutStyle;
+import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -1013,80 +1019,75 @@ public class BKUGUIImpl implements BKUGUIFacade {
       }
       
       if (signedReferences.size() == 1) {
-        ActionListener saveHashDataListener = new ActionListener() {
-          @Override
-          public void actionPerformed(ActionEvent e) {
-            HashDataInput hdi = signedReferences.get(0);
-            showSaveHashDataInputDialog(Collections.singletonList(hdi), okListener, okCommand);
-          }
-        };
-        showHashDataViewer(signedReferences.get(0), saveHashDataListener, "save");
+        try {
+          log.debug("scheduling hashdata viewer");
+
+          SwingUtilities.invokeAndWait(new Runnable() {
+
+            @Override
+            public void run() {
+              ActionListener saveHashDataListener = new ActionListener() {
+
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                  HashDataInput hdi = signedReferences.get(0);
+                  showSaveHashDataInputDialog(Collections.singletonList(hdi), okListener, okCommand);
+                }
+              };
+              showHashDataViewer(signedReferences.get(0), saveHashDataListener, "save");
+            }
+          });
+       
+        } catch (InterruptedException ex) {
+          log.error("Failed to display HashDataViewer: " + ex.getMessage());
+        } catch (InvocationTargetException ex) {
+          log.error("Failed to display HashDataViewer: " + ex.getMessage());
+        }
       } else {
-        HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
-        showSignedReferencesListDialog(tableModel, okListener, okCommand);
+        showSignedReferencesListDialog(signedReferences, okListener, okCommand);
       }
     }
     
     /**
      * Opens HashDataViewer on mouse clicked event
      */
-    public class HashDataMouseListener extends MouseAdapter {
-      
-      private HashDataInput hashData;
-
-      public void setHashData(HashDataInput hashData) {
-        this.hashData = hashData;
-      }
-
-      @Override
-      public void mouseClicked(MouseEvent e) {
-        ActionListener saveListener = new ActionListener() {
-
-          @Override
-          public void actionPerformed(ActionEvent e) {
-            showSaveHashDataInputDialog(Collections.singletonList(hashData), null, null);
-          }
-        };
-        showHashDataViewer(hashData, saveListener, "save");
-        super.mouseClicked(e);
-      }
-
-      
-      
-    }
+//    public class HashDataMouseListener extends MouseAdapter {
+//      
+//      private HashDataInput hashData;
+//
+//      public void setHashData(HashDataInput hashData) {
+//        this.hashData = hashData;
+//      }
+//
+//      @Override
+//      public void mouseClicked(MouseEvent e) {
+//        ActionListener saveListener = new ActionListener() {
+//
+//          @Override
+//          public void actionPerformed(ActionEvent e) {
+//            showSaveHashDataInputDialog(Collections.singletonList(hashData), null, null);
+//          }
+//        };
+//        showHashDataViewer(hashData, saveListener, "save");
+//        super.mouseClicked(e);
+//      }
+//    }
     
     /**
-     * blocks until dialog returns (is closed)
+     * has to be called from event dispatcher thread
      * @param hashDataText
      * @param saveListener
      * @param saveCommand
      */
     private void showHashDataViewer(final HashDataInput hashDataInput, final ActionListener saveListener, final String saveCommand) {
       
-      try {
-        log.debug("scheduling plaintext hashdatainput dialog");
-
-        // avoid double-clicks on hashdata link
-        SwingUtilities.invokeAndWait(new Runnable() {
-
-          @Override
-          public void run() {
-
-            log.debug("show plaintext hashdatainput dialog");
+      log.debug("show hashdata viewer");
 
-            ActionListener l = helpListener.getActionListener();
-            HashDataViewer.showHashDataInput(contentPane, hashDataInput, messages, saveListener, saveCommand, l);
-          }
-        });
-        
-      } catch (InterruptedException ex) {
-        log.error("Failed to display HashDataViewer: " + ex.getMessage());
-      } catch (InvocationTargetException ex) {
-        log.error("Failed to display HashDataViewer: " + ex.getMessage());
-      }
+      ActionListener l = helpListener.getActionListener();
+      HashDataViewer.showHashDataInput(contentPane, hashDataInput, messages, saveListener, saveCommand, l);
     }
     
-    private void showSignedReferencesListDialog(final HashDataTableModel signedReferences, final ActionListener backListener, final String backCommand) {
+    private void showSignedReferencesListDialog(final List<HashDataInput> signedReferences, final ActionListener backListener, final String backCommand) {
       
       log.debug("scheduling signed references list dialog");
       
@@ -1109,21 +1110,40 @@ public class BKUGUIImpl implements BKUGUIFacade {
           JLabel refIdLabel = new JLabel();
           refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
           String refIdLabelPattern = messages.getString(MESSAGE_HASHDATALIST);
-          refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{signedReferences.getRowCount()}));
+          refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{signedReferences.size()}));
 
-          JTable hashDataTable = new JTable(signedReferences);
-          hashDataTable.setDefaultRenderer(HashDataInput.class, signedReferences.getRenderer());
-          
+          HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
+          JTable hashDataTable = new JTable(tableModel);
+//          hashDataTable.setDefaultRenderer(HashDataInput.class, signedReferences.getRenderer());
           hashDataTable.setTableHeader(null);
-  //        hashDataTable.setShowVerticalLines(false);
-          hashDataTable.setRowSelectionAllowed(true);
-//          TableColumn selectCol = hashDataTable.getColumnModel().getColumn(1);
-//          selectCol.setMinWidth(CHECKBOX_WIDTH);
-//          selectCol.setMaxWidth(CHECKBOX_WIDTH);
+          
+          hashDataTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+          hashDataTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
 
+            @Override
+            public void valueChanged(final ListSelectionEvent e) {
+              //invoke later to allow thread to paint selection background
+              SwingUtilities.invokeLater(new Runnable() {
 
-//          hashDataTable.setPreferredScrollableViewportSize(mainPanel.getPreferredSize());
+                @Override
+                public void run() {
+                  ListSelectionModel lsm = (ListSelectionModel) e.getSource();
+                  int selectionIdx = lsm.getMinSelectionIndex();
+                  if (selectionIdx >= 0) {
+                    final HashDataInput selection = signedReferences.get(selectionIdx);
+                    showHashDataViewer(selection, new ActionListener() {
 
+                      @Override
+                      public void actionPerformed(ActionEvent e) {
+                        showSaveHashDataInputDialog(Collections.singletonList(selection), null, null);
+                      }
+                    }, "save");
+                  }
+                }
+              });
+            }
+          });
+          
           JScrollPane hashDataScrollPane = new JScrollPane(hashDataTable);
 
           GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
@@ -1174,6 +1194,12 @@ public class BKUGUIImpl implements BKUGUIFacade {
       });
     }
     
+    /**
+     * 
+     * @param signedRefs
+     * @param okListener may be null
+     * @param okCommand
+     */
     private void showSaveHashDataInputDialog(final List<HashDataInput> signedRefs, final ActionListener okListener, final String okCommand) {
       
       log.debug("scheduling save hashdatainput dialog");
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
index a6709860..9a43e99d 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
@@ -17,21 +17,8 @@
 package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.stal.HashDataInput;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Cursor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 import java.util.List;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JTable;
 import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellRenderer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -43,17 +30,15 @@ class HashDataTableModel extends DefaultTableModel {
 
   protected static final Log log = LogFactory.getLog(HashDataTableModel.class);
   
-  protected Class[] types = new Class[]{HashDataInput.class};
+  protected Class[] types = new Class[]{ String.class, String.class };
   protected List<HashDataInput> hashDataInputs;
-  private HashDataLinkRenderer renderer;
   
   public HashDataTableModel(List<HashDataInput> hashDataInputs) {
-    super(0, 1);
+    super(0, 2);
     this.hashDataInputs = hashDataInputs;
     for (HashDataInput hdi : hashDataInputs) {
-      addRow(new Object[]{hdi});
+      addRow(new Object[]{hdi.getReferenceId(), hdi.getMimeType()});
     }
-    this.renderer = new HashDataLinkRenderer();
   }
 
   @Override
@@ -66,46 +51,45 @@ class HashDataTableModel extends DefaultTableModel {
     return false;
   }
 
-  
-  
-  public HashDataLinkRenderer getRenderer() {
-    return renderer;
-  }
+//  public HashDataInput getValue(int rowIndex) {
+//    return hashDataInputs.get(rowIndex);
+//  }
+//  
 
-  public class HashDataLinkRenderer extends JLabel
-          implements TableCellRenderer {
-//        extends DefaultTableCellRenderer {
-    
-//    protected ActionListener saveHashDataListener;
+//  public class HashDataLinkRenderer extends JLabel
+//          implements TableCellRenderer {
+////        extends DefaultTableCellRenderer {
+//    
+////    protected ActionListener saveHashDataListener;
+////
+////    public HashDataLinkRenderer(ActionListener saveHashDataListener) {
+////      this.saveHashDataListener = saveHashDataListener;
+////    }
+//    
+//    @Override
+//    public Component getTableCellRendererComponent(JTable table,
+//            Object value,
+//            boolean isSelected,
+//            boolean hasFocus,
+//            final int row,
+//            int column) {
+//      final HashDataInput hdi = (HashDataInput) value;
+//      log.debug("render hashdatainput " + hdi.getReferenceId() + " - (" + row + "," + column + ") " + isSelected + hasFocus);
+//      setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+//      setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD));
+//      setText(hdi.getReferenceId() + " (" + hdi.getMimeType() + ")");
+//      addMouseListener(new MouseAdapter() {
+//
+//        @Override
+//        public void mouseClicked(MouseEvent e) {
+//          log.debug("received mouseclick on " + hdi.getReferenceId());
+////          saveHashDataListener.actionPerformed();
+//          JOptionPane.showInputDialog(hashDataInputs.get(row).getReferenceId());
+//        }
+//        
+//      });
 //
-//    public HashDataLinkRenderer(ActionListener saveHashDataListener) {
-//      this.saveHashDataListener = saveHashDataListener;
+//      return this;
 //    }
-    
-    @Override
-    public Component getTableCellRendererComponent(JTable table,
-            Object value,
-            boolean isSelected,
-            boolean hasFocus,
-            final int row,
-            int column) {
-      final HashDataInput hdi = (HashDataInput) value;
-      log.debug("render hashdatainput " + hdi.getReferenceId() + " - (" + row + "," + column + ") " + isSelected + hasFocus);
-      setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-      setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD));
-      setText(hdi.getReferenceId() + " (" + hdi.getMimeType() + ")");
-      addMouseListener(new MouseAdapter() {
-
-        @Override
-        public void mouseClicked(MouseEvent e) {
-          log.debug("received mouseclick on " + hdi.getReferenceId());
-//          saveHashDataListener.actionPerformed();
-          JOptionPane.showInputDialog(hashDataInputs.get(row).getReferenceId());
-        }
-        
-      });
-
-      return this;
-    }
-  }
+//  }
 }
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
index db66bd52..263c3c04 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
@@ -16,6 +16,7 @@
  */
 package at.gv.egiz.bku.gui;
 
+import at.gv.egiz.bku.gui.html.RestrictedHTMLEditorKit;
 import at.gv.egiz.stal.HashDataInput;
 import java.awt.Component;
 import java.awt.Container;
@@ -45,6 +46,7 @@ import javax.swing.JScrollPane;
 import javax.swing.LayoutStyle;
 import javax.swing.text.Document;
 import javax.swing.text.EditorKit;
+import javax.swing.text.StyledEditorKit;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -182,9 +184,11 @@ public class HashDataViewer extends JDialog
     JEditorPane viewer = new JEditorPane();
     
     if ("text/plain".equals(mimeType)) {
+      //line wrapping, etc.
+      viewer.setEditorKit(new StyledEditorKit());
       viewer.setFont(new Font(PLAINTEXT_FONT, viewer.getFont().getStyle(), viewer.getFont().getSize()));
 //    } else if ("text/html".equals(mimeType)) {
-//      viewer.setEditorKitForContentType("text/html", new RestrictedHTMLEditorKit());
+//      viewer.setEditorKit(new RestrictedHTMLEditorKit());
     }
     viewer.setEditable(false);
     viewer.setContentType(mimeType);
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 82b42d0f..fec097f5 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
@@ -81,7 +81,7 @@ public class BKUGUIWorker implements Runnable {
         };
         HashDataInput signedRef1 = new ByteArrayHashDataInput(
                 "Ich bin ein einfacher Text mit Umlauten: öäüßéç@€\n123\n456\n\tHello, world!\n\nlkjsd\nnksdjf".getBytes(), 
-                "ref-id-000000001", 
+                "ref-id-0000000000000000000000001", 
                 "text/plain", 
                 "UTF-8");
         
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index 26905f50..d041a8cb 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -48,7 +48,6 @@ import at.gv.egiz.stal.SignResponse;
 import at.gv.egiz.stal.signedinfo.ObjectFactory;
 import at.gv.egiz.stal.signedinfo.SignedInfoType;
 import at.gv.egiz.stal.util.JCEAlgorithmNames;
-import java.awt.event.ActionListener;
 import java.security.DigestException;
 import java.util.List;
 
@@ -128,9 +127,6 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
         return true;
     }
 
-//    @Override
-//    public String providePIN(PINSpec spec, int retries) {
-    
   class STALPinProvider implements PINProvider {
     
     protected SignedInfoType signedInfo;
@@ -178,7 +174,7 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
       } else if (actionCommand.equals("sign")) {
         retryCounter++;
         return new String(gui.getPin());
-      } else if (actionCommand.equals("ok")) {
+      } else if (actionCommand.equals("hashDataDone")) {
         showSignaturePINDialog(spec, retries);
       } else if (actionCommand.equals("error")) {
         return null;
-- 
cgit v1.2.3


From d8901c075f9deb663e0edd640672ed620ffb4610 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 19 Nov 2008 16:14:57 +0000
Subject: GUI bugfixes and cleanup

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@181 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/src/test/resources/appletTest.html       |   3 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |  26 +-----
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 103 +++++++++------------
 .../at/gv/egiz/bku/gui/DefaultHelpListener.java    |   4 +
 .../at/gv/egiz/bku/gui/HashDataTableModel.java     |  47 +---------
 .../java/at/gv/egiz/bku/gui/HashDataViewer.java    |   1 -
 .../java/at/gv/egiz/bku/gui/HyperlinkRenderer.java |  38 ++++++++
 .../at/gv/egiz/bku/gui/Messages.properties         |   3 +-
 .../at/gv/egiz/bku/gui/Messages_en.properties      |  15 +--
 9 files changed, 101 insertions(+), 139 deletions(-)
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
index 2570e021..cc7c2bd7 100644
--- a/BKUApplet/src/test/resources/appletTest.html
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -20,7 +20,8 @@
       <applet code="at.gv.egiz.bku.online.applet.BKUApplet.class"
               archive="../BKUApplet-1.0.jar, ../test-libs/commons-logging-1.1.1.jar , ../test-libs/iaik_jce_me4se-3.04.jar"
               width=300 height=200>
-              <param name="GuiStyle" value="simple"/>
+              <param name="GuiStyle" value="advanced"/>
+              <param name="Locale" value="de"/>
               <!--param name="Background" value="jar:file:/home/clemens/workspace/mocca/BKUApplet/target/BKUApplet-1.0-SNAPSHOT.jar!/images/help.png"/-->
               <param name="Background" value="http://localhost:3495/img/BackgroundChipperling.png"/>
               <param name="WSDL_URL" value="http://localhost:3495/stal?wsdl"/>
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 2dbba730..7d912f11 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -19,9 +19,7 @@ package at.gv.egiz.bku.gui;
 import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.smcc.PINSpec;
 import java.awt.Color;
-import java.awt.Container;
 import java.awt.event.ActionListener;
-import java.net.URL;
 import java.util.List;
 import java.util.Locale;
 
@@ -71,7 +69,6 @@ public interface BKUGUIFacade {
   public static final String MESSAGE_HELP = "message.help";
   public static final String LABEL_PIN = "label.pin";
   public static final String LABEL_PINSIZE = "label.pinsize";
-//    public static final String ERROR_NO_HASHDATA = "error.no.hashdata";
   public static final String HELP_WELCOME = "help.welcome";
   public static final String HELP_WAIT = "help.wait";
   public static final String HELP_CARDNOTSUPPORTED = "help.cardnotsupported";
@@ -95,17 +92,13 @@ public interface BKUGUIFacade {
     
 //  public void init(Container contentPane, Locale locale, Style guiStyle, URL background, ActionListener helpListener);
 
-  /**
-   * 
-   * @return the locale of the message bundle (what if no message bundle could be loaded for the requested locale?)
-   */
   public Locale getLocale();
 
   public void showWelcomeDialog();
 
   /**
    * 
-   * @param waitMessage if null, a simple 'wait' text is displayed
+   * @param waitMessage if null, a simple 'please wait' text is displayed
    */
   public void showWaitDialog(String waitMessage);
 
@@ -123,25 +116,8 @@ public interface BKUGUIFacade {
 
   public char[] getPin();
 
-  /**
-   * TODO move to HashDataDisplay implementations
-   * @param signedReferences
-   * @param externalDisplay
-   * @param okListener
-   * @param okCommand
-   */
   public void showHashDataInputDialog(List<HashDataInput> signedReferences, ActionListener okListener, String okCommand);
 
-  /**
-   * TODO pull out from BKUGUIFacade. (or make this strictly an applet internal version)
-   * Problem: if standalone flag is provided, we also need the actionlistener..
-   * @param helpDocument
-   * @param mimeType
-   * @param encoding
-   */
-//  public void showHelpDialog(InputStream helpDocument, String mimeType, String encoding); //, boolean standalone); //, ActionListener okListener, String okCommand); 
-
-//    public void showPlainTextHashDataInputDialog(String text, ActionListener saveListener, String saveCommand, ActionListener cancelListener, String cancelCommand);
   public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams, ActionListener okListener, String actionCommand);
 
   public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams);
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 38247174..a190b9c0 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -26,6 +26,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionAdapter;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -554,44 +556,37 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
-                GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
-                GroupLayout.SequentialGroup pinHorizontal = mainPanelLayout.createSequentialGroup()
-                      .addComponent(cardPinLabel, 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(pinsizeLabel));
-                
-                GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
+                GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
+                          .addComponent(infoLabel);
+                GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                          .addComponent(infoLabel);
                 
                 if (!renderHeaderPanel) {
-                  GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
-                          .addComponent(infoLabel) //, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
+                  infoHorizontal
                           .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel); //, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                  mainHorizontal
-                          .addGroup(infoHorizontal)
-                          .addGroup(pinHorizontal);
-                  GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                          .addComponent(infoLabel)
                           .addComponent(helpLabel);
-                  mainVertical
-                          .addGroup(infoVertical)
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
-                } else {
-                  mainHorizontal
-                          .addGroup(pinHorizontal);
-                }
-
-                mainVertical
-                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                    .addComponent(cardPinLabel)
-                    .addComponent(pinField))
-                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                  .addComponent(pinsizeLabel);
+                  infoVertical
+                          .addComponent(helpLabel);
+                } 
                 
-                mainPanelLayout.setHorizontalGroup(mainHorizontal);
-                mainPanelLayout.setVerticalGroup(mainVertical);
+                mainPanelLayout.setHorizontalGroup(
+                        mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                          .addGroup(infoHorizontal)
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addComponent(cardPinLabel, 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(pinsizeLabel))));
+                mainPanelLayout.setVerticalGroup(
+                        mainPanelLayout.createSequentialGroup()
+                          .addGroup(infoVertical)
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(cardPinLabel)
+                            .addComponent(pinField))
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(pinsizeLabel));
                 
                 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
@@ -1048,31 +1043,6 @@ public class BKUGUIImpl implements BKUGUIFacade {
       }
     }
     
-    /**
-     * Opens HashDataViewer on mouse clicked event
-     */
-//    public class HashDataMouseListener extends MouseAdapter {
-//      
-//      private HashDataInput hashData;
-//
-//      public void setHashData(HashDataInput hashData) {
-//        this.hashData = hashData;
-//      }
-//
-//      @Override
-//      public void mouseClicked(MouseEvent e) {
-//        ActionListener saveListener = new ActionListener() {
-//
-//          @Override
-//          public void actionPerformed(ActionEvent e) {
-//            showSaveHashDataInputDialog(Collections.singletonList(hashData), null, null);
-//          }
-//        };
-//        showHashDataViewer(hashData, saveListener, "save");
-//        super.mouseClicked(e);
-//      }
-//    }
-    
     /**
      * has to be called from event dispatcher thread
      * @param hashDataText
@@ -1113,10 +1083,23 @@ public class BKUGUIImpl implements BKUGUIFacade {
           refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{signedReferences.size()}));
 
           HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
-          JTable hashDataTable = new JTable(tableModel);
-//          hashDataTable.setDefaultRenderer(HashDataInput.class, signedReferences.getRenderer());
+          final JTable hashDataTable = new JTable(tableModel);
+          hashDataTable.setDefaultRenderer(HashDataInput.class, new HyperlinkRenderer());
           hashDataTable.setTableHeader(null);
           
+          // not possible to add mouse listener to TableCellRenderer
+          hashDataTable.addMouseMotionListener(new MouseMotionAdapter() {
+
+            @Override
+            public void mouseMoved(MouseEvent e) {
+              if (hashDataTable.columnAtPoint(e.getPoint()) == 0) {
+                hashDataTable.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+              } else {
+                hashDataTable.setCursor(Cursor.getDefaultCursor());
+              }
+            }
+          });
+          
           hashDataTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
           hashDataTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
index 502f93ec..3c8c7d6c 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
@@ -27,6 +27,10 @@ import javax.swing.SwingUtilities;
  */
 public class DefaultHelpListener extends AbstractHelpListener {
 
+  /**
+   * applet context to open external links in help pages,
+   * if null, no external links will be opened
+   */
   protected AppletContext ctx;
 
   /**
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
index 9a43e99d..b0f51a78 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
@@ -30,14 +30,15 @@ class HashDataTableModel extends DefaultTableModel {
 
   protected static final Log log = LogFactory.getLog(HashDataTableModel.class);
   
-  protected Class[] types = new Class[]{ String.class, String.class };
+  /** HashDataInput in first column, register hyperlinkrenderer only here */
+  protected Class[] types = new Class[]{ HashDataInput.class, String.class };
   protected List<HashDataInput> hashDataInputs;
   
   public HashDataTableModel(List<HashDataInput> hashDataInputs) {
     super(0, 2);
     this.hashDataInputs = hashDataInputs;
     for (HashDataInput hdi : hashDataInputs) {
-      addRow(new Object[]{hdi.getReferenceId(), hdi.getMimeType()});
+      addRow(new Object[]{ hdi, hdi.getMimeType()});
     }
   }
 
@@ -50,46 +51,4 @@ class HashDataTableModel extends DefaultTableModel {
   public boolean isCellEditable(int rowIndex, int columnIndex) {
     return false;
   }
-
-//  public HashDataInput getValue(int rowIndex) {
-//    return hashDataInputs.get(rowIndex);
-//  }
-//  
-
-//  public class HashDataLinkRenderer extends JLabel
-//          implements TableCellRenderer {
-////        extends DefaultTableCellRenderer {
-//    
-////    protected ActionListener saveHashDataListener;
-////
-////    public HashDataLinkRenderer(ActionListener saveHashDataListener) {
-////      this.saveHashDataListener = saveHashDataListener;
-////    }
-//    
-//    @Override
-//    public Component getTableCellRendererComponent(JTable table,
-//            Object value,
-//            boolean isSelected,
-//            boolean hasFocus,
-//            final int row,
-//            int column) {
-//      final HashDataInput hdi = (HashDataInput) value;
-//      log.debug("render hashdatainput " + hdi.getReferenceId() + " - (" + row + "," + column + ") " + isSelected + hasFocus);
-//      setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-//      setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD));
-//      setText(hdi.getReferenceId() + " (" + hdi.getMimeType() + ")");
-//      addMouseListener(new MouseAdapter() {
-//
-//        @Override
-//        public void mouseClicked(MouseEvent e) {
-//          log.debug("received mouseclick on " + hdi.getReferenceId());
-////          saveHashDataListener.actionPerformed();
-//          JOptionPane.showInputDialog(hashDataInputs.get(row).getReferenceId());
-//        }
-//        
-//      });
-//
-//      return this;
-//    }
-//  }
 }
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
index 263c3c04..777e8960 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
@@ -184,7 +184,6 @@ public class HashDataViewer extends JDialog
     JEditorPane viewer = new JEditorPane();
     
     if ("text/plain".equals(mimeType)) {
-      //line wrapping, etc.
       viewer.setEditorKit(new StyledEditorKit());
       viewer.setFont(new Font(PLAINTEXT_FONT, viewer.getFont().getStyle(), viewer.getFont().getSize()));
 //    } else if ("text/html".equals(mimeType)) {
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java
new file mode 100644
index 00000000..f983706e
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.stal.HashDataInput;
+import javax.swing.table.DefaultTableCellRenderer;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class HyperlinkRenderer extends DefaultTableCellRenderer {
+
+  /**
+   * cannot change mouse cursor here, do in jTable
+   * @param value
+   */
+  @Override
+  protected void setValue(Object value) {
+    super.setText("<html><u>" + ((HashDataInput) value).getReferenceId() + "</u></html>");
+    setForeground(BKUGUIFacade.HYPERLINK_COLOR);
+  }
+}
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index b5a74ac1..88119fe2 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -16,7 +16,8 @@
 title.welcome=<html>Willkommen</html>
 title.insertcard=<html>Keine B\u00FCrgerkarte gefunden</html>
 title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
-title.cardpin=<html>{0} eingeben</html>
+#title.cardpin=<html>{0} eingeben</html>
+title.cardpin=<html>Karte wird gelesen</html>
 title.sign=<html>Signatur erstellen</html>
 title.error=<html>Fehler</html>
 title.retry=<html>Falscher PIN</html>
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index 94464982..63c8bf77 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -14,9 +14,10 @@
 # limitations under the License.
 
 title.welcome=<html>Welcome</html>
-title.insertcard=<html>No citizen-card found</html>
+title.insertcard=<html>No citizencard found</html>
 title.cardnotsupported=<html>This card is not supported</html>
-title.cardpin=<html>Enter {0}</html>
+#title.cardpin=<html>Enter {0}</html>
+title.cardpin=<html>Reading card</html>
 title.sign=<html>Create signature</html>
 title.error=<html>Error</html>
 title.retry=<html>Wrong PIN</html>
@@ -28,7 +29,7 @@ windowtitle.overwrite=Overwrite file?
 windowtitle.viewer=Signature data
 windowtitle.help=Help
 message.wait=<html>Please wait...</html>
-message.insertcard=<html>Please insert your citizen-card into the reader</html>
+message.insertcard=<html>Please insert your citizencard into the reader</html>
 message.enterpin=<html>Enter {0}</html>
 message.hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
 message.hashdata=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html> 
@@ -63,16 +64,16 @@ error.pcsc=<html>No PC/SC interface for smartcard access provided</html>
 error.cardterminal=<html>Could not find smartcard reader</html>
 error.unknown=<html>An error occured: {0}</html>
 error.test=<html>Error1 {0} - Error2 {1}</html>
-error.card.locked=<html>Citizen-card is locked</html>
-error.card.notactivated=<html>Citizen-card not activated</html>
+error.card.locked=<html>Citizencard is locked</html>
+error.card.notactivated=<html>Citizencard not activated</html>
 error.viewer=Failed to display contents: {0}
 error.external.link=<html>Externer Link {0} wird nicht ge\u00F6ffnet</html>
 
 # Help Topics
 help.welcome=Welcome page
 help.wait=Wait screen
-help.cardnotsupported=Unsupported citizen card
-help.insertcard=No citizen card found
+help.cardnotsupported=Unsupported citizencard
+help.insertcard=No citizencard found
 help.cardpin=Pin entry
 help.signpin=Signature pin entry
 help.retry=Wrong Pin
-- 
cgit v1.2.3


From 62d5372507c673be5303f5f78b1555178a9fe87b Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 19 Nov 2008 16:15:42 +0000
Subject: GUI bugfixes and cleanup

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@182 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/stal/impl/ByteArrayHashDataInput.java  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java b/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
index 2b5ee7e7..6ca9a0b2 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
@@ -1,8 +1,19 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
+* 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.
+*/
 package at.gv.egiz.stal.impl;
 
 import at.gv.egiz.stal.HashDataInput;
-- 
cgit v1.2.3


From d127f2c5ccc96eb44eeacf46bb76feebe100361f Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 24 Nov 2008 12:50:24 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@189
 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

---
 BKUCommonGUI/pom.xml | 11 +++++++++++
 STAL/pom.xml         | 11 +++++++++++
 pom.xml              |  9 ++++++++-
 smcc/pom.xml         | 13 ++++++++++++-
 smccSTAL/pom.xml     | 11 +++++++++++
 5 files changed, 53 insertions(+), 2 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 1aea89f6..c620746f 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -23,6 +23,17 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+	  <build>
+	    <plugins>
+	      <plugin>
+	        <artifactId>maven-compiler-plugin</artifactId>
+	        <groupId>org.apache.maven.plugins</groupId>
+	        <configuration>
+	          <debug>false</debug>
+	        </configuration>
+	      </plugin>
+	    </plugins>
+	  </build>
     <!--build>
         <plugins>
             <plugin>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 3d91dcc7..8d59722e 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -16,6 +16,17 @@
 			<artifactId>commons-logging</artifactId>
 		</dependency>
     </dependencies>
+	  <build>
+	    <plugins>
+	      <plugin>
+	        <artifactId>maven-compiler-plugin</artifactId>
+	        <groupId>org.apache.maven.plugins</groupId>
+	        <configuration>
+	          <debug>false</debug>
+	        </configuration>
+	      </plugin>
+	    </plugins>
+	  </build>
     <!--build>
         <plugins>
             <plugin>
diff --git a/pom.xml b/pom.xml
index 2797e2c8..54413a62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
@@ -92,6 +94,11 @@
 					<groupId>org.codehaus.mojo</groupId>
 					<version>1.10</version>
 				</plugin>
+				<plugin>
+				  <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.0-beta-7</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 110635c7..39af114f 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -12,6 +12,17 @@
   <packaging>jar</packaging>
   <version>1.0</version>
   <url>http://bku.egiz.gv.at</url>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<configuration>
+					<debug>false</debug>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
   <dependencies>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -28,5 +39,5 @@
       <groupId>iaik</groupId>
       <artifactId>iaik_jce_full_signed</artifactId>
     </dependency> -->
-  </dependencies> 
+  </dependencies>
 </project>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index d4a523b1..5c03cffd 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -11,6 +11,17 @@
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
     <version>1.0</version>
+	  <build>
+	    <plugins>
+	      <plugin>
+	        <artifactId>maven-compiler-plugin</artifactId>
+	        <groupId>org.apache.maven.plugins</groupId>
+	        <configuration>
+	          <debug>false</debug>
+	        </configuration>
+	      </plugin>
+	    </plugins>
+	  </build>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
-- 
cgit v1.2.3


From b93f035e2c9df0ad430300c4f755b775a4aa1ed3 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 24 Nov 2008 13:37:11 +0000
Subject: xhtml warning

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@192 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |  3 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 15 +++--
 .../java/at/gv/egiz/bku/gui/HashDataViewer.java    | 72 +++++++++++-----------
 .../at/gv/egiz/bku/gui/Messages.properties         |  3 +-
 .../at/gv/egiz/bku/gui/Messages_en.properties      |  3 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUITest.java   |  6 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |  5 +-
 7 files changed, 59 insertions(+), 48 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 7d912f11..d3cb76f2 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -62,11 +62,12 @@ public interface BKUGUIFacade {
   public static final String MESSAGE_INSERTCARD = "message.insertcard";
   public static final String MESSAGE_ENTERPIN = "message.enterpin";
   public static final String MESSAGE_HASHDATALINK = "message.hashdatalink";
-  public static final String MESSAGE_HASHDATA = "message.hashdata";
+//  public static final String MESSAGE_HASHDATA = "message.hashdata";
   public static final String MESSAGE_HASHDATALIST = "message.hashdatalist";
   public static final String MESSAGE_RETRIES = "message.retries";
   public static final String MESSAGE_OVERWRITE = "message.overwrite";
   public static final String MESSAGE_HELP = "message.help";
+  public static final String WARNING_XHTML = "warning.xhtml";
   public static final String LABEL_PIN = "label.pin";
   public static final String LABEL_PINSIZE = "label.pinsize";
   public static final String HELP_WELCOME = "help.welcome";
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index a190b9c0..c786a291 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -208,13 +208,16 @@ public class BKUGUIImpl implements BKUGUIFacade {
       if (background == null) {
         background = getClass().getResource(DEFAULT_BACKGROUND);
       }
-      if ("file".equals(background.getProtocol())) {
-        log.warn("file:// background images not permitted: " + background);
-        background = getClass().getResource(DEFAULT_BACKGROUND);
+      if (background == null) {
+          contentPanel = new JPanel();
+      } else {
+          if ("file".equals(background.getProtocol())) {
+            log.warn("file:// background images not permitted: " + background);
+            background = getClass().getResource(DEFAULT_BACKGROUND);
+          }
+          log.debug("loading background " + background);
+          contentPanel = new ImagePanel(background);
       }
-      log.debug("loading background " + background);
-      contentPanel = new ImagePanel(background);
-
       mainPanel = new JPanel();
       mainPanel.setOpaque(false);
       buttonPanel = new JPanel(); 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
index 777e8960..6c097b2a 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
@@ -125,9 +125,7 @@ public class HashDataViewer extends JDialog
     InputStreamReader isr = new InputStreamReader(hashDataInput.getHashDataInput(), cs);
     Reader content = new BufferedReader(isr);
   
-    JPanel hashDataPanel = createViewerPanel(
-            messages.getString(BKUGUIFacade.MESSAGE_HASHDATA), 
-            content, 
+    JPanel hashDataPanel = createViewerPanel(content, 
             hashDataInput.getMimeType(), 
             helpListener);
     JPanel buttonPanel = createButtonPanel(saveListener, saveCommand);
@@ -169,29 +167,28 @@ public class HashDataViewer extends JDialog
    * @param helpListener may be null
    * @return
    */
-  private JPanel createViewerPanel(String viewerLabelText, 
-          Reader content, 
+  private JPanel createViewerPanel(Reader content, 
           String mimeType, 
           final ActionListener helpListener) {
-    log.debug("viewer dialog: " + mimeType);
 
     if (mimeType == null) {
       mimeType = "text/plain";
-    } else if ("application/xhtml+xml".equals(mimeType)) {
-      mimeType = "text/html";
     }
+    log.debug("viewer dialog: " + mimeType);
 
     JEditorPane viewer = new JEditorPane();
+    viewer.setEditable(false);
+    viewer.setContentType(mimeType);
     
     if ("text/plain".equals(mimeType)) {
       viewer.setEditorKit(new StyledEditorKit());
       viewer.setFont(new Font(PLAINTEXT_FONT, viewer.getFont().getStyle(), viewer.getFont().getSize()));
 //    } else if ("text/html".equals(mimeType)) {
 //      viewer.setEditorKit(new RestrictedHTMLEditorKit());
+    } else if ("application/xhtml+xml".equals(mimeType)) {
+      viewer.setContentType("text/html");
     }
-    viewer.setEditable(false);
-    viewer.setContentType(mimeType);
-
+    
     EditorKit editorKit = viewer.getEditorKit();
     Document document = editorKit.createDefaultDocument();
 //    document.putProperty("IgnoreCharsetDirective", new Boolean(true));
@@ -210,15 +207,23 @@ public class HashDataViewer extends JDialog
     scrollPane.setAlignmentX(LEFT_ALIGNMENT);
     viewer.setCaretPosition(0);
 
-    JLabel viewerLabel = new JLabel();
-    viewerLabel.setText(viewerLabelText);
-    viewerLabel.setFont(viewerLabel.getFont().deriveFont(viewerLabel.getFont().getStyle() | java.awt.Font.BOLD));
-    viewerLabel.setLabelFor(viewer);
-
     JPanel viewerPanel = new JPanel();
     GroupLayout viewerPanelLayout = new GroupLayout(viewerPanel);
     viewerPanel.setLayout(viewerPanelLayout);
 
+    GroupLayout.SequentialGroup infoHorizontal = viewerPanelLayout.createSequentialGroup();
+    GroupLayout.ParallelGroup infoVertical = viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+
+    if ("application/xhtml+xml".equals(mimeType)) {
+      JLabel viewerLabel = new JLabel();
+      viewerLabel.setText(messages.getString(BKUGUIFacade.WARNING_XHTML));
+      viewerLabel.setFont(viewerLabel.getFont().deriveFont(viewerLabel.getFont().getStyle() | java.awt.Font.BOLD));
+      viewerLabel.setLabelFor(viewer);
+
+      infoHorizontal.addComponent(viewerLabel);
+      infoVertical.addComponent(viewerLabel);
+    }
+
     if (helpListener != null) {
       JLabel helpLabel = new JLabel();
       helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG)));
@@ -232,27 +237,24 @@ public class HashDataViewer extends JDialog
         }
       });
       helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-      viewerPanelLayout.setHorizontalGroup(
-            viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(viewerPanelLayout.createSequentialGroup().addComponent(viewerLabel).addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE).addComponent(helpLabel)).addComponent(scrollPane)); //, 0, 0, Short.MAX_VALUE));
-      viewerPanelLayout.setVerticalGroup(
-            viewerPanelLayout.createSequentialGroup()
-              .addGroup(viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                .addComponent(viewerLabel)
-                .addComponent(helpLabel))
-              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-              .addComponent(scrollPane)); 
-    } else {
-      viewerPanelLayout.setHorizontalGroup(
-            viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-              .addComponent(viewerLabel)
-              .addComponent(scrollPane)); 
-      viewerPanelLayout.setVerticalGroup(
-            viewerPanelLayout.createSequentialGroup()
-              .addComponent(viewerLabel)
-              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-              .addComponent(scrollPane)); 
 
+      infoHorizontal
+              .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+              .addComponent(helpLabel);
+      infoVertical
+              .addComponent(helpLabel);
     }
+
+    viewerPanelLayout.setHorizontalGroup(
+          viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+            .addGroup(infoHorizontal)
+            .addComponent(scrollPane));
+    viewerPanelLayout.setVerticalGroup(
+          viewerPanelLayout.createSequentialGroup()
+            .addGroup(infoVertical)
+            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+            .addComponent(scrollPane));
+
     
     return viewerPanel;
   }
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 88119fe2..a7363421 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -32,13 +32,14 @@ message.wait=<html>Bitte warten...</html>
 message.insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
 message.enterpin=<html>{0} eingeben</html>
 message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
-message.hashdata=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
+#message.hashdata=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
 #message.hashdata=<html>Dies ist eine Voransicht des zu signierenden Inhaltes. F\u00FCr Details siehe Hilfe (i).</html> 
 #verwenden sie bitte die von ihrem System zur Verf\u00FCgung gestellte {0} Anwendung. 
 message.hashdatalist=<html>{0} Signaturdaten:</html>
 message.retries=<html>Noch {0} Versuch(e)</html>
 message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
 message.help=<html>Hilfe zu {0}</html>
+warning.xhtml=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
 label.pin=<html>{0}:</html>
 label.pinsize=<html>({0} stellig)</html>
 button.ok=OK
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index 63c8bf77..7aae8eae 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -32,11 +32,12 @@ message.wait=<html>Please wait...</html>
 message.insertcard=<html>Please insert your citizencard into the reader</html>
 message.enterpin=<html>Enter {0}</html>
 message.hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
-message.hashdata=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html> 
+#message.hashdata=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
 message.hashdatalist=<html>{0} signature data objects:</html>
 message.retries=<html>{0} tries left</html>
 message.overwrite=<html>Overwrite {0}?</html>
 message.help=<html>Help topic {0}</html>
+warning.xhtml=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
 label.pin=<html>{0}:</html>
 label.pinsize=<html>({0} digits)</html>
 button.ok=OK
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index 0d2712dd..bc4bdb97 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -32,15 +32,15 @@ import org.junit.Test;
  *
  * @author clemens
  */
-//@Ignore
+@Ignore
 public class BKUGUITest {
 
     @Test
     public void testBKUGUI() {
         JFrame testFrame = new JFrame("BKUGUITest");
         Container contentPane = testFrame.getContentPane();
-        contentPane.setPreferredSize(new Dimension(380, 150));
-        BKUGUIFacade gui = BKUGUIFactory.createGUI(contentPane, null, BKUGUIFacade.Style.advanced, null, null);
+        contentPane.setPreferredSize(new Dimension(190, 130));
+        BKUGUIFacade gui = BKUGUIFactory.createGUI(contentPane, null, BKUGUIFacade.Style.simple, null, null);
         BKUGUIWorker worker = new BKUGUIWorker();
         worker.init(gui);
         testFrame.pack();
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 fec097f5..4d97f9fb 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
@@ -147,10 +147,13 @@ public class BKUGUIWorker implements Runnable {
 //            
 //            Thread.sleep(2000);
 //
-            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+//            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
 //
 //            Thread.sleep(4000);
 //
+
+    gui.showErrorDialog(BKUGUIFacade.ERR_NO_PCSC, null, null, null);
+    
 //            gui.showSignaturePINRetryDialog(signPinSpec, 2, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
 //
 //            Thread.sleep(2000);
-- 
cgit v1.2.3


From 11c83e13e032738ee927f22196dc9ca43589a8a4 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 24 Nov 2008 14:11:39 +0000
Subject: Version set to 1.0.0

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@193 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml                        | 14 +++++++-------
 BKUCommonGUI/pom.xml                     |  8 ++++----
 BKULocal/pom.xml                         | 14 +++++++-------
 BKULocalApp/pom.xml                      |  8 ++++----
 BKUOnline/pom.xml                        | 10 +++++-----
 BKUOnline/src/main/webapp/appletPage.jsp |  2 +-
 BKUViewer/pom.xml                        |  6 +++---
 STAL/pom.xml                             |  4 ++--
 STALService/pom.xml                      |  8 ++++----
 bkucommon/pom.xml                        |  8 ++++----
 pom.xml                                  |  6 +++---
 smcc/pom.xml                             |  4 ++--
 smccSTAL/pom.xml                         | 10 +++++-----
 utils/pom.xml                            |  8 ++++----
 14 files changed, 55 insertions(+), 55 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index eaaa5820..10cfa53a 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -3,13 +3,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0</version>
+  <version>1.0.0-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -116,27 +116,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0</version>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0</version>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0</version>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0</version>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0</version>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index c620746f..1cedb84d 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -3,23 +3,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0</version>
+    <version>1.0.0-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0</version>
+            <version>1.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 36503ca0..48b6d590 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -3,14 +3,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 
 	<scm>
 		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
@@ -57,22 +57,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -102,7 +102,7 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index f05aeba0..4476f3b5 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -77,13 +77,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0-SNAPSHOT</version>
+			<version>1.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index a1d92390..cee17e20 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -4,14 +4,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUOnline</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Online</name>
-	<version>1.0</version>
+	<version>1.0.0-SNAPSHOT</version>
 
 	<pluginRepositories>
 		<pluginRepository>
@@ -25,12 +25,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.0</version>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -62,7 +62,7 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>BKUApplet</artifactId> 
-          <version>1.0</version>
+          <version>1.0.0-SNAPSHOT</version>
           <scope>provided</scope> 
         </dependency>
 		<!--
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp
index 2dbd729c..5b221261 100644
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ b/BKUOnline/src/main/webapp/appletPage.jsp
@@ -45,7 +45,7 @@
 		var attributes = {
 			codebase :'applet',
 			code :'at.gv.egiz.bku.online.applet.BKUApplet.class',
-			archive :'BKUApplet-1.0.jar, commons-logging-1.1.1.jar, iaik_jce_me4se-3.04.jar',
+			archive :'BKUApplet-1.0.0.jar, commons-logging-1.1.1.jar, iaik_jce_me4se-3.04.jar',
 			width : <%=width%>,
 			height :<%=height%>
 		};
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 55c18ac2..5af7c057 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -3,19 +3,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 8d59722e..884c86a2 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0</version>
+    <version>1.0.0-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index f6f8649d..aa8ce064 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -4,24 +4,24 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0</version>
+    <version>1.0.0-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
         	<artifactId>utils</artifactId>
-        	<version>1.0-SNAPSHOT</version>
+        	<version>1.0.0-SNAPSHOTOT</version>
         </dependency-->
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 60c31a02..076f516c 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -4,24 +4,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0</version>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 54413a62..fa86e771 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -97,7 +97,7 @@
 				<plugin>
 				  <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.0-beta-7</version>
+          <version>2.0-beta-8</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -211,7 +211,7 @@
 			<dependency>
 				<groupId>iaik</groupId>
 				<artifactId>iaik_pki</artifactId>
-				<version>1.0-SNAPSHOT</version>
+				<version>1.0-MOCCA</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 39af114f..ba1ffcce 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0</version>
+  <version>1.0.0-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 5c03cffd..78ba1aea 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0</version>
+    <version>1.0.0-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -26,17 +26,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b980470d..871dbb0a 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -4,14 +4,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
@@ -53,10 +53,10 @@
 		add dependencies to determine build order of BKU modules | (scope
 		provided -> don't include dependencies in assembly) <dependencies>
 		<dependency> <groupId>at.gv.egiz</groupId>
-		<artifactId>slbinding</artifactId> <version>1.0-SNAPSHOT</version>
+		<artifactId>slbinding</artifactId> <version>1.0.0-SNAPSHOTOT</version>
 		<scope>provided</scope> </dependency> <dependency>
 		<groupId>at.gv.egiz</groupId> <artifactId>idlink</artifactId>
-		<version>1.0-SNAPSHOT</version> <scope>provided</scope> </dependency>
+		<versio1.0.0-SNAPSHOTSHOT</version> <scope>provided</scope> </dependency>
 		</dependencies
 	-->
 	<!--
-- 
cgit v1.2.3


From b1209c3cf4a3447b8dd1320a5b068bf205797980 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 25 Nov 2008 07:47:42 +0000
Subject: [maven-release-plugin] prepare release mocca-1.0.1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@201 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 295 +++++++++++++++++----------------
 BKUCommonGUI/pom.xml |  75 +++++----
 BKULocal/pom.xml     | 223 +++++++++++++------------
 BKULocalApp/pom.xml  | 199 +++++++++++-----------
 BKUOnline/pom.xml    | 441 +++++++++++++++++++++++++------------------------
 BKUViewer/pom.xml    |   9 +-
 STAL/pom.xml         |   6 +-
 STALService/pom.xml  |   9 +-
 bkucommon/pom.xml    |  17 +-
 pom.xml              | 453 +++++++++++++++++++++++++--------------------------
 smcc/pom.xml         |  85 +++++-----
 smccSTAL/pom.xml     |  96 ++++++-----
 utils/pom.xml        | 149 ++++++++---------
 13 files changed, 1015 insertions(+), 1042 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index d7d74b5e..6f900ad3 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -1,148 +1,147 @@
-<?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">
-  <parent>
-    <artifactId>bku</artifactId>
-    <groupId>at.gv.egiz</groupId>
-    <version>1.0.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>at.gv.egiz</groupId>
-  <artifactId>BKUApplet</artifactId>
-  <name>BKU Applet</name>
-  <version>1.0.0-SNAPSHOT</version>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack</id>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeGroupIds>at.gv.egiz</includeGroupIds>
-              <excludeTransitive>true</excludeTransitive>
-              <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-              <excludes>META-INF\/</excludes><!--
-              <artifactItems>
-                <artifactItem>
-                  <groupId>at.gv.egiz</groupId>
-                  <artifactId>smcc</artifactId>
-                  <type>jar</type>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>at.gv.egiz</groupId>
-                  <artifactId>smccSTAL</artifactId>
-                  <type>jar</type>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>at.gv.egiz</groupId>
-                  <artifactId>STAL</artifactId>
-                  <type>jar</type>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>at.gv.egiz</groupId>
-                  <artifactId>STALService</artifactId>
-                  <type>jar</type>
-                </artifactItem>
-                 <artifactItem>
-                  <groupId>at.gv.egiz</groupId>
-                  <artifactId>BKUCommonGUI</artifactId>
-                  <type>jar</type>
-                </artifactItem>
-              </artifactItems>
-            --></configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>sign</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <archive>
-            <addMavenDescriptor>false</addMavenDescriptor>
-            <index>false</index>
-            <manifest>
-              <addClasspath>false</addClasspath>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-          </archive>
-          <alias>test-applet signer</alias>
-          <keystore>./keystore.ks</keystore>
-          <storepass>storepass</storepass>
-          <keypass>keypass</keypass>
-          <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>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>smcc</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>STAL</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>STALService</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>smccSTAL</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
-     <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-  </dependencies>
-</project>
+<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>
+    <version>1.0.1</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>at.gv.egiz</groupId>
+  <artifactId>BKUApplet</artifactId>
+  <name>BKU Applet</name>
+  <version>1.0.1</version>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack</id>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>at.gv.egiz</includeGroupIds>
+              <excludeTransitive>true</excludeTransitive>
+              <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+              <excludes>META-INF\/</excludes><!--
+              <artifactItems>
+                <artifactItem>
+                  <groupId>at.gv.egiz</groupId>
+                  <artifactId>smcc</artifactId>
+                  <type>jar</type>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>at.gv.egiz</groupId>
+                  <artifactId>smccSTAL</artifactId>
+                  <type>jar</type>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>at.gv.egiz</groupId>
+                  <artifactId>STAL</artifactId>
+                  <type>jar</type>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>at.gv.egiz</groupId>
+                  <artifactId>STALService</artifactId>
+                  <type>jar</type>
+                </artifactItem>
+                 <artifactItem>
+                  <groupId>at.gv.egiz</groupId>
+                  <artifactId>BKUCommonGUI</artifactId>
+                  <type>jar</type>
+                </artifactItem>
+              </artifactItems>
+            --></configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>sign</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <archive>
+            <addMavenDescriptor>false</addMavenDescriptor>
+            <index>false</index>
+            <manifest>
+              <addClasspath>false</addClasspath>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+          </archive>
+          <alias>test-applet signer</alias>
+          <keystore>./keystore.ks</keystore>
+          <storepass>storepass</storepass>
+          <keypass>keypass</keypass>
+          <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>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>smcc</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>STAL</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>STALService</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>smccSTAL</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+     <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>BKUCommonGUI</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 1cedb84d..3ae1717d 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -1,39 +1,38 @@
-<?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">
-    <parent>
-        <artifactId>bku</artifactId>
-        <groupId>at.gv.egiz</groupId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>at.gv.egiz</groupId>
-    <artifactId>BKUCommonGUI</artifactId>
-    <name>BKU Common GUI</name>
-    <version>1.0.0-SNAPSHOT</version>
-    <dependencies>
-        <dependency>
-            <groupId>at.gv.egiz</groupId>
-            <artifactId>smcc</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>at.gv.egiz</groupId>
-            <artifactId>STAL</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-	  <build>
-	    <plugins>
-	      <plugin>
-	        <artifactId>maven-compiler-plugin</artifactId>
-	        <groupId>org.apache.maven.plugins</groupId>
-	        <configuration>
-	          <debug>false</debug>
-	        </configuration>
-	      </plugin>
-	    </plugins>
-	  </build>
+<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>
+        <version>1.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>at.gv.egiz</groupId>
+    <artifactId>BKUCommonGUI</artifactId>
+    <name>BKU Common GUI</name>
+    <version>1.0.1</version>
+    <dependencies>
+        <dependency>
+            <groupId>at.gv.egiz</groupId>
+            <artifactId>smcc</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>at.gv.egiz</groupId>
+            <artifactId>STAL</artifactId>
+            <version>1.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+	  <build>
+	    <plugins>
+	      <plugin>
+	        <artifactId>maven-compiler-plugin</artifactId>
+	        <groupId>org.apache.maven.plugins</groupId>
+	        <configuration>
+	          <debug>false</debug>
+	        </configuration>
+	      </plugin>
+	    </plugins>
+	  </build>
     <!--build>
         <plugins>
             <plugin>
@@ -44,5 +43,5 @@
                 </configuration>
             </plugin>
         </plugins>
-    </build-->
-</project>
+    </build-->
+</project>
\ No newline at end of file
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 54de31b2..3cf9b0cd 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -1,112 +1,111 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project 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>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>at.gv.egiz</groupId>
-	<artifactId>BKULocal</artifactId>
-	<packaging>war</packaging>
-	<name>BKU Local</name>
-	<version>1.0.0-SNAPSHOT</version>
-
-	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
-	</scm>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <manifest>
-            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-          </manifest>
-          <archive>
-            <manifestEntries>
-              <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>maven-buildnumber-plugin</artifactId>
-        <version>0.9.6</version>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>create</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <doCheck>false</doCheck>
-          <doUpdate>false</doUpdate>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-	<dependencies>
-		<dependency>
-			<groupId>at.gv.egiz</groupId>
-			<artifactId>STAL</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>at.gv.egiz</groupId>
-			<artifactId>bkucommon</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>at.gv.egiz</groupId>
-			<artifactId>smcc</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>at.gv.egiz</groupId>
-			<artifactId>smccSTAL</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>2.5.5</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>2.5.5</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>at.gv.egiz</groupId>
-			<artifactId>BKUApplet</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>at.gv.egiz</groupId>
-			<artifactId>BKUViewer</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
-	</dependencies>
-
-	<properties>
-        <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
-    </properties>
-</project>
+<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>
+		<version>1.0.1</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>at.gv.egiz</groupId>
+	<artifactId>BKULocal</artifactId>
+	<packaging>war</packaging>
+	<name>BKU Local</name>
+	<version>1.0.1</version>
+
+	<scm>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</url>
+	</scm>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.0.2</version>
+        <configuration>
+          <manifest>
+            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+          </manifest>
+          <archive>
+            <manifestEntries>
+              <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>maven-buildnumber-plugin</artifactId>
+        <version>0.9.6</version>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>create</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <doCheck>false</doCheck>
+          <doUpdate>false</doUpdate>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+	<dependencies>
+		<dependency>
+			<groupId>at.gv.egiz</groupId>
+			<artifactId>STAL</artifactId>
+			<version>1.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz</groupId>
+			<artifactId>bkucommon</artifactId>
+			<version>1.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz</groupId>
+			<artifactId>smcc</artifactId>
+			<version>1.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz</groupId>
+			<artifactId>smccSTAL</artifactId>
+			<version>1.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>2.5.5</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>2.5.5</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz</groupId>
+			<artifactId>BKUApplet</artifactId>
+			<version>1.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz</groupId>
+			<artifactId>BKUViewer</artifactId>
+			<version>1.0.1</version>
+		</dependency>
+	</dependencies>
+
+	<properties>
+        <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index 4476f3b5..2a5b8d19 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -1,101 +1,100 @@
-<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>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>at.gv.egiz.bku</groupId>
-	<artifactId>BKULocalApp</artifactId>
-	<name>BKU Local App</name>
-	<version>1.0.0-SNAPSHOT</version>
-	<description />
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<groupId>org.apache.maven.plugins</groupId>
-					<version>2.0.2</version>
-					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
-						<verbose>true</verbose>
-						<showWarnings>true</showWarnings>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<mainClass>at.gv.egiz.bku.local.app.BKULauncher</mainClass>
-						</manifest>
-						<manifestEntries>
-							<mode>development</mode>
-							<url>${pom.url}</url>
-							<SplashScreen-Image>splash.png</SplashScreen-Image>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}</outputDirectory>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>false</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-
-
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>at.gv.egiz</groupId>
-			<artifactId>BKULocal</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-			<type>war</type>
-		</dependency>
-		<dependency>
-			<artifactId>utils</artifactId>
-			<groupId>at.gv.egiz</groupId>
-			<version>1.0.0-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-cli</groupId>
-			<artifactId>commons-cli</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty</artifactId>
-			<version>6.1.10</version>
-		</dependency>
-	</dependencies>
-
+<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>
+		<version>1.0.1</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>at.gv.egiz.bku</groupId>
+	<artifactId>BKULocalApp</artifactId>
+	<name>BKU Local App</name>
+	<version>1.0.1</version>
+	<description />
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<groupId>org.apache.maven.plugins</groupId>
+					<version>2.0.2</version>
+					<configuration>
+						<source>1.6</source>
+						<target>1.6</target>
+						<verbose>true</verbose>
+						<showWarnings>true</showWarnings>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<mainClass>at.gv.egiz.bku.local.app.BKULauncher</mainClass>
+						</manifest>
+						<manifestEntries>
+							<mode>development</mode>
+							<url>${pom.url}</url>
+							<SplashScreen-Image>splash.png</SplashScreen-Image>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>false</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+
+
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz</groupId>
+			<artifactId>BKULocal</artifactId>
+			<version>1.0.1</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<artifactId>utils</artifactId>
+			<groupId>at.gv.egiz</groupId>
+			<version>1.0.1</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+			<version>1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty</artifactId>
+			<version>6.1.10</version>
+		</dependency>
+	</dependencies>
+
 </project>
\ No newline at end of file
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 0704cc12..7bee3a02 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -1,222 +1,219 @@
-<?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">
-	<parent>
-		<artifactId>bku</artifactId>
-		<groupId>at.gv.egiz</groupId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>at.gv.egiz</groupId>
-	<artifactId>BKUOnline</artifactId>
-	<packaging>war</packaging>
-	<name>BKU Online</name>
-	<version>1.0.0-SNAPSHOT</version>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>tlc</id>
-			<name>TLC Repository</name>
-			<url>http://commons.ucalgary.ca/pub/m2</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-	<dependencies>
-		<dependency>
-			<groupId>at.gv.egiz</groupId>
-			<artifactId>bkucommon</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>BKUViewer</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>2.5.5</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>2.5.5</version>
-		</dependency>
-		<dependency>
-			<groupId>at.gv.egiz</groupId>
-			<artifactId>STALService</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
-        <!-- build BKUApplet prior to BKUOnline -->
-        <dependency>
-          <groupId>at.gv.egiz</groupId>
-          <artifactId>BKUApplet</artifactId> 
-          <version>1.0.0-SNAPSHOT</version>
-          <scope>provided</scope> 
-        </dependency>
-        <dependency>
-          <groupId>at.gv.egiz</groupId>
-          <artifactId>STALService</artifactId> 
-          <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        
-		<!--
-			| see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
-		-->
-		<dependency>
-			<groupId>com.sun.xml.ws</groupId>
-			<artifactId>jaxws-rt</artifactId>
-			<version>2.1.4</version>
-            <!--scope>provided</scope-->
-			<!--
-				conflict with SAAJ from java 6 ? <exclusions> <exclusion>
-				<groupId>javax.xml.soap</groupId> <artifactId>saaj-api</artifactId>
-				</exclusion> <exclusion>
-				<groupId>com.sun.xml.messaging.saaj</groupId>
-				<artifactId>saaj-impl</artifactId> </exclusion> </exclusions
-			-->
-		</dependency>
-	</dependencies>
-	<properties>
-		<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
-	</properties>
-	<scm>
-	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
-	</scm>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copyapplet-dependencies</id>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-              <outputDirectory>${project.build.directory}/${project.build.finalName}/applet</outputDirectory>
-							<!--<artifactItems>
-								<artifactItem>
-									<groupId>at.gv.egiz</groupId>
-									<artifactId>BKUApplet</artifactId>
-									<version>1.0</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>commons-logging</groupId>
-									<artifactId>commons-logging</artifactId>
-								</artifactItem>
-								<artifactItem>
-									<groupId>iaik</groupId>
-									<artifactId>iaik_jce_me4se</artifactId>
-								</artifactItem>
-							</artifactItems>-->
-							<includeGroupIds>at.gv.egiz</includeGroupIds>
-							<includeArtifactIds>BKUApplet</includeArtifactIds>
-              <excludeTransitive>true</excludeTransitive>
-						</configuration>
-					</execution>
-          <execution>
-            <id>copyapplet</id>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/${project.build.finalName}/applet</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>commons-logging</groupId>
-                  <artifactId>commons-logging</artifactId>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>iaik</groupId>
-                  <artifactId>iaik_jce_me4se</artifactId>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-				</executions>
-			</plugin>
-            <!--plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId> 
-              <configuration>
-                <skip>true</skip>
-              </configuration> 
-            </plugin-->
-	    <!--plugin> 
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>jaxws-maven-plugin</artifactId> 
-              <executions> 
-                <execution>
-                  <goals> 
-                    <goal>wsimport</goal> 
-                  </goals> 
-                </execution> 
-              </executions> 
-              <configuration>
-                <target>2.0</target>
-                <verbose>true</verbose>
-                <bindingDirectory>${basedir}/src/main/custom-binding</bindingDirectory>
-                <bindingFiles> 
-                  <bindingFile>stalservice-custom.xml</bindingFile>
-                  <bindingFile>staltypes-custom.xml</bindingFile> 
-                </bindingFiles>
-                <wsdlDirectory>${basedir}/src/main/webapp/WEB-INF/wsdl</wsdlDirectory>
-                <wsdlFiles> 
-                  <wsdlFile>stal.wsdl</wsdlFile>
-                </wsdlFiles>
-                <sourceDestDir>${project.build.directory}/generated-sources/wsimport</sourceDestDir>
-                <staleFile>${project.build.directory}/generated-sources/wsimport/.staleFlag</staleFile>
-              </configuration> 
-            </plugin-->
-			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.0.2</version>
-				<configuration>
-					<manifest>
-						<addDefaultImplementationEntries>
-							true
-            </addDefaultImplementationEntries>
-					</manifest>
-					<archive>
-						<manifestEntries>
-							<Implementation-Build>
-								${project.version}-r${buildNumber}
-              </Implementation-Build>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>maven-buildnumber-plugin</artifactId>
-				<version>0.9.6</version>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>create</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<doCheck>false</doCheck>
-					<doUpdate>false</doUpdate>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+<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>
+		<version>1.0.1</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>at.gv.egiz</groupId>
+	<artifactId>BKUOnline</artifactId>
+	<packaging>war</packaging>
+	<name>BKU Online</name>
+	<version>1.0.1</version>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>tlc</id>
+			<name>TLC Repository</name>
+			<url>http://commons.ucalgary.ca/pub/m2</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>at.gv.egiz</groupId>
+			<artifactId>bkucommon</artifactId>
+			<version>1.0.1</version>
+		</dependency>
+		<dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>BKUViewer</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>2.5.5</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>2.5.5</version>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz</groupId>
+			<artifactId>STALService</artifactId>
+			<version>1.0.1</version>
+			<scope>compile</scope>
+		</dependency>
+        <!-- build BKUApplet prior to BKUOnline -->
+        <dependency>
+          <groupId>at.gv.egiz</groupId>
+          <artifactId>BKUApplet</artifactId> 
+          <version>1.0.1</version>
+          <scope>provided</scope> 
+        </dependency>
+        <dependency>
+          <groupId>at.gv.egiz</groupId>
+          <artifactId>STALService</artifactId> 
+          <version>1.0.1</version>
+        </dependency>
+        
+		<!--
+			| see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
+		-->
+		<dependency>
+			<groupId>com.sun.xml.ws</groupId>
+			<artifactId>jaxws-rt</artifactId>
+			<version>2.1.4</version>
+            <!--scope>provided</scope-->
+			<!--
+				conflict with SAAJ from java 6 ? <exclusions> <exclusion>
+				<groupId>javax.xml.soap</groupId> <artifactId>saaj-api</artifactId>
+				</exclusion> <exclusion>
+				<groupId>com.sun.xml.messaging.saaj</groupId>
+				<artifactId>saaj-impl</artifactId> </exclusion> </exclusions -->
+		</dependency>
+	</dependencies>
+	<properties>
+		<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
+	</properties>
+	<scm>
+	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</url>
+	</scm>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copyapplet-dependencies</id>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+              <outputDirectory>${project.build.directory}/${project.build.finalName}/applet</outputDirectory>
+							<!--<artifactItems>
+								<artifactItem>
+									<groupId>at.gv.egiz</groupId>
+									<artifactId>BKUApplet</artifactId>
+									<version>1.0</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>commons-logging</groupId>
+									<artifactId>commons-logging</artifactId>
+								</artifactItem>
+								<artifactItem>
+									<groupId>iaik</groupId>
+									<artifactId>iaik_jce_me4se</artifactId>
+								</artifactItem>
+							</artifactItems>-->
+							<includeGroupIds>at.gv.egiz</includeGroupIds>
+							<includeArtifactIds>BKUApplet</includeArtifactIds>
+              <excludeTransitive>true</excludeTransitive>
+						</configuration>
+					</execution>
+          <execution>
+            <id>copyapplet</id>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/${project.build.finalName}/applet</outputDirectory>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>commons-logging</groupId>
+                  <artifactId>commons-logging</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>iaik</groupId>
+                  <artifactId>iaik_jce_me4se</artifactId>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+				</executions>
+			</plugin>
+            <!--plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId> 
+              <configuration>
+                <skip>true</skip>
+              </configuration> 
+            </plugin-->
+	    <!--plugin> 
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>jaxws-maven-plugin</artifactId> 
+              <executions> 
+                <execution>
+                  <goals> 
+                    <goal>wsimport</goal> 
+                  </goals> 
+                </execution> 
+              </executions> 
+              <configuration>
+                <target>2.0</target>
+                <verbose>true</verbose>
+                <bindingDirectory>${basedir}/src/main/custom-binding</bindingDirectory>
+                <bindingFiles> 
+                  <bindingFile>stalservice-custom.xml</bindingFile>
+                  <bindingFile>staltypes-custom.xml</bindingFile> 
+                </bindingFiles>
+                <wsdlDirectory>${basedir}/src/main/webapp/WEB-INF/wsdl</wsdlDirectory>
+                <wsdlFiles> 
+                  <wsdlFile>stal.wsdl</wsdlFile>
+                </wsdlFiles>
+                <sourceDestDir>${project.build.directory}/generated-sources/wsimport</sourceDestDir>
+                <staleFile>${project.build.directory}/generated-sources/wsimport/.staleFlag</staleFile>
+              </configuration> 
+            </plugin-->
+			<plugin>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<manifest>
+						<addDefaultImplementationEntries>
+							true
+            </addDefaultImplementationEntries>
+					</manifest>
+					<archive>
+						<manifestEntries>
+							<Implementation-Build>
+								${project.version}-r${buildNumber}
+              </Implementation-Build>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>maven-buildnumber-plugin</artifactId>
+				<version>0.9.6</version>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<doCheck>false</doCheck>
+					<doUpdate>false</doUpdate>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 5af7c057..2af2a6cf 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -1,21 +1,20 @@
-<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>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 884c86a2..a1e76cd7 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index aa8ce064..51d2c6d8 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -1,22 +1,21 @@
 <?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>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.1</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 076f516c..e97eed97 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -1,27 +1,26 @@
 <?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>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -72,14 +71,12 @@
 				<wsdlFile>MOA-SPSS-1.3.wsdl</wsdlFile> </wsdlFiles>
 				<sourceDestDir>${project.build.directory}/generated-sources/moaspss</sourceDestDir>
 				<staleFile>${project.build.directory}/generated-sources/moaspss/.staleFlag</staleFile>
-				<xnocompile>true</xnocompile> </configuration> </plugin
-			-->
+				<xnocompile>true</xnocompile> </configuration> </plugin -->
 			<!--
 				skip tests temporarily <plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId> <configuration>
-				<skip>true</skip> </configuration> </plugin
-			-->
+				<skip>true</skip> </configuration> </plugin -->
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 39528296..cc8387db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,231 +1,224 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>at.gv.egiz</groupId>
-	<artifactId>bku</artifactId>
-	<packaging>pom</packaging>
-	<version>1.0.0-SNAPSHOT</version>
-	<name>BKU</name>
-	<url>http://bku.egiz.gv.at</url>
-	<modules>
-		<module>utils</module>
-		<module>bkucommon</module>
-		<module>STAL</module>
-		<module>BKUOnline</module>
-		<module>smcc</module>
-		<module>BKULocal</module>
-		<module>BKUApplet</module>
-		<module>smccSTAL</module>
-		<module>STALService</module>
-		<module>BKUCommonGUI</module>
-		<module>BKUViewer</module>
-		<module>BKULocalApp</module>
-	</modules>
-	<developers>
-		<developer>
-			<id>mcentner</id>
-			<name>Martin Centner</name>
-			<email>mcentner@egiz.gv.at</email>
-		</developer>
-		<developer>
-			<id>wbauer</id>
-			<name>Wolfgang Bauer</name>
-			<email>wbauer@egiz.gv.at</email>
-		</developer>
-		<developer>
-			<id>corthacker</id>
-			<name>Clemens Orthacker</name>
-			<email>corthacker@egiz.gv.at</email>
-		</developer>
-	</developers>
-	<scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
-	</scm>
-	<organization>
-		<name>E-Government Innovation Center (EGIZ)</name>
-		<url>http://www.egiz.gv.at</url>
-	</organization>
-    <build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<groupId>org.apache.maven.plugins</groupId>
-					<version>2.0.2</version>
-					<configuration>
-						<!--
-							fork>true</fork> <executable>${java_6_sun}/bin/javac</executable>
-							<compilerVersion>1.6</compilerVersion
-						-->
-						<source>1.6</source>
-						<target>1.6</target>
-						<verbose>true</verbose>
-						<showWarnings>true</showWarnings>
-                        <encoding>UTF-8</encoding>
-					</configuration>
-				</plugin>
-                <plugin>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <configuration>
-                        <encoding>UTF-8</encoding>
-                    </configuration>
-                </plugin>
-				<plugin>
-					<artifactId>maven-assembly-plugin</artifactId>
-					<groupId>org.apache.maven.plugins</groupId>
-					<version>2.2-beta-2</version>
-				</plugin>
-				<plugin>
-					<artifactId>maven-dependency-plugin</artifactId>
-					<groupId>org.apache.maven.plugins</groupId>
-					<version>2.0</version>
-				</plugin>
-				<!--
-					plugin> <artifactId>maven-jaxb2-plugin</artifactId>
-					<groupId>org.jvnet.jaxb2.maven2</groupId> <version>0.6.0</version>
-					</plugin
-				-->
-				<plugin>
-					<artifactId>jaxws-maven-plugin</artifactId>
-					<groupId>org.codehaus.mojo</groupId>
-					<version>1.10</version>
-				</plugin>
-				<plugin>
-				  <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.0-beta-7</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>${basedir}/src/main/assemblies/assembly-test.xml</descriptor>
-						<!--
-							descriptor>${basedir}/src/main/assemblies/assembly-online.xml</descriptor>
-							<descriptor>${basedir}/src/main/assemblies/assembly-local.xml</descriptor>
-							<descriptor>${basedir}/src/main/assemblies/assembly-server.xml</descriptor
-						-->
-					</descriptors>
-				</configuration>
-				<!--
-					don't include execution here, but explicitly in the execute command
-					(see custom goals: mvn clean package assembly:assembly) | NOTE:
-					Because of a quirk in Maven 2.0's execution model relating to
-					aggregator mojos and the inheritance hierarchy, | we need to
-					explicitly execute the package phase ahead of the assembly
-					invocation, to ensure all modules have been built. <executions>
-					<execution> <phase>package</phase> <goals> <goal>attached</goal>
-					</goals> </execution> </executions
-				-->
-			</plugin>
-		</plugins>
-	</build>
-	<repositories>
-		<repository>
-			<id>mocca-egovlabs</id>
-			<name>MOCCA EGovLabs</name>
-			<url>http://mocca.egovlabs.gv.at/m2/repository/</url>
-		</repository>
-		<repository>
-			<id>maven2-repository.dev.java.net</id>
-			<name>Java.net Repository for Maven 2</name>
-			<url>http://download.java.net/maven/2/</url>
-		</repository>
-		<repository>
-			<id>maven1-repository.dev.java.net</id>
-			<name>Java.net Repository for Maven 1</name>
-			<url>http://download.java.net/maven/1/</url>
-			<layout>legacy</layout>
-		</repository>
-	</repositories>
-	<dependencies>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>log4j</groupId>
-				<artifactId>log4j</artifactId>
-				<version>1.2.12</version>
-				<scope>runtime</scope>
-			</dependency>
-			<dependency>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging</artifactId>
-				<version>1.1.1</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.4</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>xerces</groupId>
-				<artifactId>xercesImpl</artifactId>
-				<version>2.9.1</version>
-			</dependency>
-			<dependency>
-				<groupId>xalan</groupId>
-				<artifactId>xalan</artifactId>
-				<version>2.7.0</version>
-			</dependency>
-			<dependency>
-				<groupId>iaik</groupId>
-				<artifactId>iaik_jce_full_signed</artifactId>
-				<version>3.16</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>iaik</groupId>
-				<artifactId>iaik_jce_me4se</artifactId>
-				<version>3.04</version>
-			</dependency>
-			<dependency>
-				<groupId>iaik</groupId>
-				<artifactId>iaik_ecc_signed</artifactId>
-				<version>2.15</version>
-			</dependency>
-			<dependency>
-				<groupId>iaik</groupId>
-				<artifactId>iaik_xsect</artifactId>
-				<version>1.14</version>
-			</dependency>
-			<dependency>
-				<groupId>iaik</groupId>
-				<artifactId>iaik_pki</artifactId>
-				<version>1.0-MOCCA</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>commons-fileupload</groupId>
-				<artifactId>commons-fileupload</artifactId>
-				<version>1.2.1</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>commons-httpclient</groupId>
-				<artifactId>commons-httpclient</artifactId>
-				<version>3.1</version>
-				<scope>compile</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+<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">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>at.gv.egiz</groupId>
+	<artifactId>bku</artifactId>
+	<packaging>pom</packaging>
+	<version>1.0.1</version>
+	<name>BKU</name>
+	<url>http://bku.egiz.gv.at</url>
+	<modules>
+		<module>utils</module>
+		<module>bkucommon</module>
+		<module>STAL</module>
+		<module>BKUOnline</module>
+		<module>smcc</module>
+		<module>BKULocal</module>
+		<module>BKUApplet</module>
+		<module>smccSTAL</module>
+		<module>STALService</module>
+		<module>BKUCommonGUI</module>
+		<module>BKUViewer</module>
+		<module>BKULocalApp</module>
+	</modules>
+	<developers>
+		<developer>
+			<id>mcentner</id>
+			<name>Martin Centner</name>
+			<email>mcentner@egiz.gv.at</email>
+		</developer>
+		<developer>
+			<id>wbauer</id>
+			<name>Wolfgang Bauer</name>
+			<email>wbauer@egiz.gv.at</email>
+		</developer>
+		<developer>
+			<id>corthacker</id>
+			<name>Clemens Orthacker</name>
+			<email>corthacker@egiz.gv.at</email>
+		</developer>
+	</developers>
+	<scm>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</url>
+	</scm>
+	<organization>
+		<name>E-Government Innovation Center (EGIZ)</name>
+		<url>http://www.egiz.gv.at</url>
+	</organization>
+    <build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<groupId>org.apache.maven.plugins</groupId>
+					<version>2.0.2</version>
+					<configuration>
+						<!--
+							fork>true</fork> <executable>${java_6_sun}/bin/javac</executable>
+							<compilerVersion>1.6</compilerVersion -->
+						<source>1.6</source>
+						<target>1.6</target>
+						<verbose>true</verbose>
+						<showWarnings>true</showWarnings>
+                        <encoding>UTF-8</encoding>
+					</configuration>
+				</plugin>
+                <plugin>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+				<plugin>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<groupId>org.apache.maven.plugins</groupId>
+					<version>2.2-beta-2</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-dependency-plugin</artifactId>
+					<groupId>org.apache.maven.plugins</groupId>
+					<version>2.0</version>
+				</plugin>
+				<!--
+					plugin> <artifactId>maven-jaxb2-plugin</artifactId>
+					<groupId>org.jvnet.jaxb2.maven2</groupId> <version>0.6.0</version>
+					</plugin -->
+				<plugin>
+					<artifactId>jaxws-maven-plugin</artifactId>
+					<groupId>org.codehaus.mojo</groupId>
+					<version>1.10</version>
+				</plugin>
+				<plugin>
+				  <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.0-beta-7</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>${basedir}/src/main/assemblies/assembly-test.xml</descriptor>
+						<!--
+							descriptor>${basedir}/src/main/assemblies/assembly-online.xml</descriptor>
+							<descriptor>${basedir}/src/main/assemblies/assembly-local.xml</descriptor>
+							<descriptor>${basedir}/src/main/assemblies/assembly-server.xml</descriptor -->
+					</descriptors>
+				</configuration>
+				<!--
+					don't include execution here, but explicitly in the execute command
+					(see custom goals: mvn clean package assembly:assembly) | NOTE:
+					Because of a quirk in Maven 2.0's execution model relating to
+					aggregator mojos and the inheritance hierarchy, | we need to
+					explicitly execute the package phase ahead of the assembly
+					invocation, to ensure all modules have been built. <executions>
+					<execution> <phase>package</phase> <goals> <goal>attached</goal>
+					</goals> </execution> </executions -->
+			</plugin>
+		</plugins>
+	</build>
+	<repositories>
+		<repository>
+			<id>mocca-egovlabs</id>
+			<name>MOCCA EGovLabs</name>
+			<url>http://mocca.egovlabs.gv.at/m2/repository/</url>
+		</repository>
+		<repository>
+			<id>maven2-repository.dev.java.net</id>
+			<name>Java.net Repository for Maven 2</name>
+			<url>http://download.java.net/maven/2/</url>
+		</repository>
+		<repository>
+			<id>maven1-repository.dev.java.net</id>
+			<name>Java.net Repository for Maven 1</name>
+			<url>http://download.java.net/maven/1/</url>
+			<layout>legacy</layout>
+		</repository>
+	</repositories>
+	<dependencies>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>log4j</groupId>
+				<artifactId>log4j</artifactId>
+				<version>1.2.12</version>
+				<scope>runtime</scope>
+			</dependency>
+			<dependency>
+				<groupId>commons-logging</groupId>
+				<artifactId>commons-logging</artifactId>
+				<version>1.1.1</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.4</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>xerces</groupId>
+				<artifactId>xercesImpl</artifactId>
+				<version>2.9.1</version>
+			</dependency>
+			<dependency>
+				<groupId>xalan</groupId>
+				<artifactId>xalan</artifactId>
+				<version>2.7.0</version>
+			</dependency>
+			<dependency>
+				<groupId>iaik</groupId>
+				<artifactId>iaik_jce_full_signed</artifactId>
+				<version>3.16</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>iaik</groupId>
+				<artifactId>iaik_jce_me4se</artifactId>
+				<version>3.04</version>
+			</dependency>
+			<dependency>
+				<groupId>iaik</groupId>
+				<artifactId>iaik_ecc_signed</artifactId>
+				<version>2.15</version>
+			</dependency>
+			<dependency>
+				<groupId>iaik</groupId>
+				<artifactId>iaik_xsect</artifactId>
+				<version>1.14</version>
+			</dependency>
+			<dependency>
+				<groupId>iaik</groupId>
+				<artifactId>iaik_pki</artifactId>
+				<version>1.0-MOCCA</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>commons-fileupload</groupId>
+				<artifactId>commons-fileupload</artifactId>
+				<version>1.2.1</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>commons-httpclient</groupId>
+				<artifactId>commons-httpclient</artifactId>
+				<version>3.1</version>
+				<scope>compile</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 </project>
\ No newline at end of file
diff --git a/smcc/pom.xml b/smcc/pom.xml
index ba1ffcce..ffdba367 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -1,43 +1,42 @@
-<?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">
-  <parent>
-    <artifactId>bku</artifactId>
-    <groupId>at.gv.egiz</groupId>
-    <version>1.0.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>at.gv.egiz</groupId>
-  <artifactId>smcc</artifactId>
-  <name>smcc</name>
-  <packaging>jar</packaging>
-  <version>1.0.0-SNAPSHOT</version>
-  <url>http://bku.egiz.gv.at</url>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<groupId>org.apache.maven.plugins</groupId>
-				<configuration>
-					<debug>false</debug>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-  <dependencies>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- FIXME just for testing 
-    <dependency>
-      <groupId>iaik</groupId>
-      <artifactId>iaik_jce_full_signed</artifactId>
-    </dependency> -->
-  </dependencies>
-</project>
+<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>
+    <version>1.0.1</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>at.gv.egiz</groupId>
+  <artifactId>smcc</artifactId>
+  <name>smcc</name>
+  <packaging>jar</packaging>
+  <version>1.0.1</version>
+  <url>http://bku.egiz.gv.at</url>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<configuration>
+					<debug>false</debug>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+  <dependencies>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- FIXME just for testing 
+    <dependency>
+      <groupId>iaik</groupId>
+      <artifactId>iaik_jce_full_signed</artifactId>
+    </dependency> -->
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 78ba1aea..6729f3f0 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -1,50 +1,48 @@
-<?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">
-    <parent>
-        <artifactId>bku</artifactId>
-        <groupId>at.gv.egiz</groupId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>at.gv.egiz</groupId>
-    <artifactId>smccSTAL</artifactId>
-    <name>smcc STAL</name>
-    <version>1.0.0-SNAPSHOT</version>
-	  <build>
-	    <plugins>
-	      <plugin>
-	        <artifactId>maven-compiler-plugin</artifactId>
-	        <groupId>org.apache.maven.plugins</groupId>
-	        <configuration>
-	          <debug>false</debug>
-	        </configuration>
-	      </plugin>
-	    </plugins>
-	  </build>
-    <dependencies>
-        <dependency>
-            <groupId>at.gv.egiz</groupId>
-            <artifactId>STAL</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>at.gv.egiz</groupId>
-            <artifactId>smcc</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>at.gv.egiz</groupId>
-            <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>iaik</groupId>
-            <artifactId>iaik_jce_me4se</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-    </dependencies>
+<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>
+        <version>1.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>at.gv.egiz</groupId>
+    <artifactId>smccSTAL</artifactId>
+    <name>smcc STAL</name>
+    <version>1.0.1</version>
+	  <build>
+	    <plugins>
+	      <plugin>
+	        <artifactId>maven-compiler-plugin</artifactId>
+	        <groupId>org.apache.maven.plugins</groupId>
+	        <configuration>
+	          <debug>false</debug>
+	        </configuration>
+	      </plugin>
+	    </plugins>
+	  </build>
+    <dependencies>
+        <dependency>
+            <groupId>at.gv.egiz</groupId>
+            <artifactId>STAL</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>at.gv.egiz</groupId>
+            <artifactId>smcc</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>at.gv.egiz</groupId>
+            <artifactId>BKUCommonGUI</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>iaik</groupId>
+            <artifactId>iaik_jce_me4se</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/utils/pom.xml b/utils/pom.xml
index 871dbb0a..b0769293 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -1,77 +1,72 @@
-<?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">
-	<parent>
-		<artifactId>bku</artifactId>
-		<groupId>at.gv.egiz</groupId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>at.gv.egiz</groupId>
-	<artifactId>utils</artifactId>
-	<name>BKU Utils</name>
-	<packaging>jar</packaging>
-	<version>1.0.0-SNAPSHOT</version>
-	<url>http://bku.egiz.gv.at</url>
-	<build>
-		<plugins>
-			<!--
-				the unpack goal binds by default to process-sources | also works
-				until phase prepare-package <plugin>
-				<artifactId>maven-dependency-plugin</artifactId> <executions>
-				<execution> <id>unpack</id> <goals> <goal>unpack</goal> </goals>
-				<configuration>
-				<outputDirectory>${project.build.outputDirectory}</outputDirectory>
-				<excludes>META-INF\/</excludes> <artifactItems> <artifactItem>
-				<groupId>at.gv.egiz</groupId> <artifactId>slbinding</artifactId>
-				<type>jar</type> </artifactItem> <artifactItem>
-				<groupId>at.gv.egiz</groupId> <artifactId>idlink</artifactId>
-				<type>jar</type> </artifactItem> </artifactItems> </configuration>
-				</execution> </executions> </plugin
-			-->
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>iaik</groupId>
-			<artifactId>iaik_jce_full_signed</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>iaik</groupId>
-			<artifactId>iaik_ecc_signed</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>iaik</groupId>
-			<artifactId>iaik_xsect</artifactId>
-		</dependency>
-	</dependencies>
-	<!--
-		add dependencies to determine build order of BKU modules | (scope
-		provided -> don't include dependencies in assembly) <dependencies>
-		<dependency> <groupId>at.gv.egiz</groupId>
-		<artifactId>slbinding</artifactId> <version>1.0.0-SNAPSHOTOT</version>
-		<scope>provided</scope> </dependency> <dependency>
-		<groupId>at.gv.egiz</groupId> <artifactId>idlink</artifactId>
-		<versio1.0.0-SNAPSHOTSHOT</version> <scope>provided</scope> </dependency>
-		</dependencies
-	-->
-	<!--
-		repositories> <repository> <id>maven2-repository.dev.java.net</id>
-		<name>Java.net Maven 2 Repository</name>
-		<url>http://download.java.net/maven/2</url> </repository> <repository>
-		<id>maven-repository.dev.java.net</id> <name>Java.net Maven 1
-		Repository (legacy)</name> <url>http://download.java.net/maven/1</url>
-		<layout>legacy</layout> </repository> </repositories>
-		<pluginRepositories> <pluginRepository>
-		<id>maven2-repository.dev.java.net</id> <name>Java.net Maven 2
-		Repository</name> <url>http://download.java.net/maven/2</url>
-		</pluginRepository> <pluginRepository>
-		<id>maven-repository.dev.java.net</id> <name>Java.net Maven 1
-		Repository (legacy)</name> <url>http://download.java.net/maven/1</url>
-		<layout>legacy</layout> </pluginRepository> </pluginRepositories
-	-->
-</project>
+<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>
+		<version>1.0.1</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>at.gv.egiz</groupId>
+	<artifactId>utils</artifactId>
+	<name>BKU Utils</name>
+	<packaging>jar</packaging>
+	<version>1.0.1</version>
+	<url>http://bku.egiz.gv.at</url>
+	<build>
+		<plugins>
+			<!--
+				the unpack goal binds by default to process-sources | also works
+				until phase prepare-package <plugin>
+				<artifactId>maven-dependency-plugin</artifactId> <executions>
+				<execution> <id>unpack</id> <goals> <goal>unpack</goal> </goals>
+				<configuration>
+				<outputDirectory>${project.build.outputDirectory}</outputDirectory>
+				<excludes>META-INF\/</excludes> <artifactItems> <artifactItem>
+				<groupId>at.gv.egiz</groupId> <artifactId>slbinding</artifactId>
+				<type>jar</type> </artifactItem> <artifactItem>
+				<groupId>at.gv.egiz</groupId> <artifactId>idlink</artifactId>
+				<type>jar</type> </artifactItem> </artifactItems> </configuration>
+				</execution> </executions> </plugin -->
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_jce_full_signed</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_ecc_signed</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_xsect</artifactId>
+		</dependency>
+	</dependencies>
+	<!--
+		add dependencies to determine build order of BKU modules | (scope
+		provided -> don't include dependencies in assembly) <dependencies>
+		<dependency> <groupId>at.gv.egiz</groupId>
+		<artifactId>slbinding</artifactId> <version>1.0.0-SNAPSHOTOT</version>
+		<scope>provided</scope> </dependency> <dependency>
+		<groupId>at.gv.egiz</groupId> <artifactId>idlink</artifactId>
+		<versio1.0.0-SNAPSHOTSHOT</version> <scope>provided</scope> </dependency>
+		</dependencies -->
+	<!--
+		repositories> <repository> <id>maven2-repository.dev.java.net</id>
+		<name>Java.net Maven 2 Repository</name>
+		<url>http://download.java.net/maven/2</url> </repository> <repository>
+		<id>maven-repository.dev.java.net</id> <name>Java.net Maven 1
+		Repository (legacy)</name> <url>http://download.java.net/maven/1</url>
+		<layout>legacy</layout> </repository> </repositories>
+		<pluginRepositories> <pluginRepository>
+		<id>maven2-repository.dev.java.net</id> <name>Java.net Maven 2
+		Repository</name> <url>http://download.java.net/maven/2</url>
+		</pluginRepository> <pluginRepository>
+		<id>maven-repository.dev.java.net</id> <name>Java.net Maven 1
+		Repository (legacy)</name> <url>http://download.java.net/maven/1</url>
+		<layout>legacy</layout> </pluginRepository> </pluginRepositories -->
+</project>
\ No newline at end of file
-- 
cgit v1.2.3


From 86962d8745b41a6cdb9fd95496176e698c0f6a9c Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 25 Nov 2008 07:47:48 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@203 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 13 files changed, 61 insertions(+), 61 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 6f900ad3..1d880919 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.1</version>
+    <version>1.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.1</version>
+  <version>1.0.1-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -117,27 +117,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 3ae1717d..21518416 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.1</version>
+    <version>1.0.1-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 3cf9b0cd..9fe36269 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.1</version>
+	<version>1.0.1-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index 2a5b8d19..c0d406b3 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.1</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 7bee3a02..88cdf9e8 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUOnline</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Online</name>
-	<version>1.0.1</version>
+	<version>1.0.1-SNAPSHOT</version>
 
 	<pluginRepositories>
 		<pluginRepository>
@@ -23,12 +23,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALService</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
         <!-- build BKUApplet prior to BKUOnline -->
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>BKUApplet</artifactId> 
-          <version>1.0.1</version>
+          <version>1.0.1-SNAPSHOT</version>
           <scope>provided</scope> 
         </dependency>
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALService</artifactId> 
-          <version>1.0.1</version>
+          <version>1.0.1-SNAPSHOT</version>
         </dependency>
         
 		<!--
@@ -89,9 +89,9 @@
 		<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
 	</properties>
 	<scm>
-	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</url>
+	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
 	</scm>
 	<build>
 		<plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 2af2a6cf..80fedbf5 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.1</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index a1e76cd7..de53808c 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.1</version>
+    <version>1.0.1-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 51d2c6d8..c313666f 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.1</version>
+    <version>1.0.1-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index e97eed97..61fe1942 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.1</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index cc8387db..ba7e0485 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.1</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -38,9 +38,9 @@
 		</developer>
 	</developers>
 	<scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index ffdba367..a8bdecf4 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.1</version>
+    <version>1.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.1</version>
+  <version>1.0.1-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 6729f3f0..fdb64e86 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.1</version>
+    <version>1.0.1-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b0769293..586a070b 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.1</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From c9ff6be4c89bfcb643c70fdb46e3a6425911b61f Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 25 Nov 2008 08:10:11 +0000
Subject: [maven-release-plugin] prepare release mocca-1.0.2

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@205 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 13 files changed, 61 insertions(+), 61 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 1d880919..49159c5e 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.2</version>
   <build>
     <plugins>
       <plugin>
@@ -117,27 +117,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 21518416..64b93904 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.2</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 9fe36269..0d175a7c 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.2</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index c0d406b3..e4bbbdf9 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.2</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.2</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 88cdf9e8..c6164540 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUOnline</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Online</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.2</version>
 
 	<pluginRepositories>
 		<pluginRepository>
@@ -23,12 +23,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALService</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.2</version>
 			<scope>compile</scope>
 		</dependency>
         <!-- build BKUApplet prior to BKUOnline -->
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>BKUApplet</artifactId> 
-          <version>1.0.1-SNAPSHOT</version>
+          <version>1.0.2</version>
           <scope>provided</scope> 
         </dependency>
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALService</artifactId> 
-          <version>1.0.1-SNAPSHOT</version>
+          <version>1.0.2</version>
         </dependency>
         
 		<!--
@@ -89,9 +89,9 @@
 		<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
 	</properties>
 	<scm>
-	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKUOnline</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKUOnline</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKUOnline</url>
 	</scm>
 	<build>
 		<plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 80fedbf5..439d03ea 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.2</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index de53808c..112a1830 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index c313666f..4dd2455b 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 61fe1942..586ab493 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.2</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index ba7e0485..62cc1779 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.2</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -38,9 +38,9 @@
 		</developer>
 	</developers>
 	<scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index a8bdecf4..2d56f24f 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.2</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index fdb64e86..7d4334bd 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 586a070b..52fa6917 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.2</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 38e77cff0a5cba8016dd3f9197647f7a82678880 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 25 Nov 2008 08:10:17 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@207 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 13 files changed, 61 insertions(+), 61 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 49159c5e..8947daa0 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.2</version>
+  <version>1.0.2-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -117,27 +117,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 64b93904..ff993fa2 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 0d175a7c..6b3b7fc8 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.2</version>
+	<version>1.0.2-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index e4bbbdf9..f2280e29 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.2</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index c6164540..7efbedb8 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUOnline</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Online</name>
-	<version>1.0.2</version>
+	<version>1.0.2-SNAPSHOT</version>
 
 	<pluginRepositories>
 		<pluginRepository>
@@ -23,12 +23,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALService</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
         <!-- build BKUApplet prior to BKUOnline -->
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>BKUApplet</artifactId> 
-          <version>1.0.2</version>
+          <version>1.0.2-SNAPSHOT</version>
           <scope>provided</scope> 
         </dependency>
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALService</artifactId> 
-          <version>1.0.2</version>
+          <version>1.0.2-SNAPSHOT</version>
         </dependency>
         
 		<!--
@@ -89,9 +89,9 @@
 		<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
 	</properties>
 	<scm>
-	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKUOnline</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKUOnline</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKUOnline</url>
+	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
 	</scm>
 	<build>
 		<plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 439d03ea..3b0fb86e 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.2</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 112a1830..050e2a3e 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 4dd2455b..a250f9a1 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 586ab493..e0cb1f7c 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.2</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 62cc1779..874dce5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.2</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -38,9 +38,9 @@
 		</developer>
 	</developers>
 	<scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 2d56f24f..da71c71e 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.2</version>
+  <version>1.0.2-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 7d4334bd..3fa65d19 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 52fa6917..b183ea03 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.2</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 4455f67be95f84ba0da82a90f0df47ddd4711937 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 25 Nov 2008 08:15:32 +0000
Subject: [maven-release-plugin] rollback the release of mocca-1.0.2

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@208 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 16 ++++++++--------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 14 +++++++-------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  2 +-
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 13 files changed, 52 insertions(+), 52 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 8947daa0..1d880919 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -117,27 +117,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index ff993fa2..21518416 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 6b3b7fc8..9fe36269 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.1-SNAPSHOT</version>
 
 	<scm>
 		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index f2280e29..c0d406b3 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 7efbedb8..88cdf9e8 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUOnline</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Online</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.1-SNAPSHOT</version>
 
 	<pluginRepositories>
 		<pluginRepository>
@@ -23,12 +23,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALService</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
         <!-- build BKUApplet prior to BKUOnline -->
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>BKUApplet</artifactId> 
-          <version>1.0.2-SNAPSHOT</version>
+          <version>1.0.1-SNAPSHOT</version>
           <scope>provided</scope> 
         </dependency>
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALService</artifactId> 
-          <version>1.0.2-SNAPSHOT</version>
+          <version>1.0.1-SNAPSHOT</version>
         </dependency>
         
 		<!--
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 3b0fb86e..80fedbf5 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 050e2a3e..de53808c 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index a250f9a1..c313666f 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index e0cb1f7c..61fe1942 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 874dce5b..ba7e0485 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index da71c71e..a8bdecf4 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 3fa65d19..fdb64e86 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b183ea03..586a070b 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 4353cad73d83ac86184b2242f889701c76c0c2b7 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 25 Nov 2008 08:24:03 +0000
Subject: [maven-release-plugin] prepare release mocca-1.0.1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@211 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 13 files changed, 61 insertions(+), 61 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 1d880919..6f900ad3 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.1</version>
   <build>
     <plugins>
       <plugin>
@@ -117,27 +117,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.1</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.1</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 21518416..3ae1717d 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 9fe36269..3cf9b0cd 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index c0d406b3..2a5b8d19 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 88cdf9e8..7bee3a02 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUOnline</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Online</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 
 	<pluginRepositories>
 		<pluginRepository>
@@ -23,12 +23,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.1</version>
     </dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALService</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 			<scope>compile</scope>
 		</dependency>
         <!-- build BKUApplet prior to BKUOnline -->
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>BKUApplet</artifactId> 
-          <version>1.0.1-SNAPSHOT</version>
+          <version>1.0.1</version>
           <scope>provided</scope> 
         </dependency>
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALService</artifactId> 
-          <version>1.0.1-SNAPSHOT</version>
+          <version>1.0.1</version>
         </dependency>
         
 		<!--
@@ -89,9 +89,9 @@
 		<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
 	</properties>
 	<scm>
-	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</url>
 	</scm>
 	<build>
 		<plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 80fedbf5..2af2a6cf 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index de53808c..a1e76cd7 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index c313666f..51d2c6d8 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.1</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 61fe1942..e97eed97 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index ba7e0485..cc8387db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -38,9 +38,9 @@
 		</developer>
 	</developers>
 	<scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index a8bdecf4..ffdba367 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.1</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index fdb64e86..6729f3f0 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.1</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 586a070b..b0769293 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 11953efc834fbb06f14c30d9f1783e2b4b941f7b Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 25 Nov 2008 08:29:39 +0000
Subject: [maven-release-plugin] rollback the release of mocca-1.0.1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@214 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 13 files changed, 61 insertions(+), 61 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 6f900ad3..1d880919 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.1</version>
+    <version>1.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.1</version>
+  <version>1.0.1-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -117,27 +117,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 3ae1717d..21518416 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.1</version>
+    <version>1.0.1-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 3cf9b0cd..9fe36269 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.1</version>
+	<version>1.0.1-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index 2a5b8d19..c0d406b3 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.1</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 7bee3a02..88cdf9e8 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUOnline</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Online</name>
-	<version>1.0.1</version>
+	<version>1.0.1-SNAPSHOT</version>
 
 	<pluginRepositories>
 		<pluginRepository>
@@ -23,12 +23,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALService</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
         <!-- build BKUApplet prior to BKUOnline -->
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>BKUApplet</artifactId> 
-          <version>1.0.1</version>
+          <version>1.0.1-SNAPSHOT</version>
           <scope>provided</scope> 
         </dependency>
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALService</artifactId> 
-          <version>1.0.1</version>
+          <version>1.0.1-SNAPSHOT</version>
         </dependency>
         
 		<!--
@@ -89,9 +89,9 @@
 		<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
 	</properties>
 	<scm>
-	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</url>
+	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
 	</scm>
 	<build>
 		<plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 2af2a6cf..80fedbf5 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.1</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index a1e76cd7..de53808c 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.1</version>
+    <version>1.0.1-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 51d2c6d8..c313666f 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.1</version>
+    <version>1.0.1-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index e97eed97..61fe1942 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.1</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index cc8387db..ba7e0485 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.1</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -38,9 +38,9 @@
 		</developer>
 	</developers>
 	<scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index ffdba367..a8bdecf4 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.1</version>
+    <version>1.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.1</version>
+  <version>1.0.1-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 6729f3f0..fdb64e86 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.1</version>
+    <version>1.0.1-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b0769293..586a070b 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.1</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 4421289feed2da8d81ed438d9e5d9a0be503cec1 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 25 Nov 2008 08:31:24 +0000
Subject: [maven-release-plugin] prepare release mocca-1.0.1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@215 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 13 files changed, 61 insertions(+), 61 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 1d880919..6f900ad3 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.1</version>
   <build>
     <plugins>
       <plugin>
@@ -117,27 +117,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.1</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.1</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 21518416..3ae1717d 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 9fe36269..3cf9b0cd 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index c0d406b3..2a5b8d19 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 88cdf9e8..7bee3a02 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUOnline</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Online</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 
 	<pluginRepositories>
 		<pluginRepository>
@@ -23,12 +23,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.1</version>
     </dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALService</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 			<scope>compile</scope>
 		</dependency>
         <!-- build BKUApplet prior to BKUOnline -->
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>BKUApplet</artifactId> 
-          <version>1.0.1-SNAPSHOT</version>
+          <version>1.0.1</version>
           <scope>provided</scope> 
         </dependency>
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALService</artifactId> 
-          <version>1.0.1-SNAPSHOT</version>
+          <version>1.0.1</version>
         </dependency>
         
 		<!--
@@ -89,9 +89,9 @@
 		<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
 	</properties>
 	<scm>
-	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</url>
 	</scm>
 	<build>
 		<plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 80fedbf5..2af2a6cf 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index de53808c..a1e76cd7 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index c313666f..51d2c6d8 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.1</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 61fe1942..e97eed97 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index ba7e0485..cc8387db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -38,9 +38,9 @@
 		</developer>
 	</developers>
 	<scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index a8bdecf4..ffdba367 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.1</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index fdb64e86..6729f3f0 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.1</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 586a070b..b0769293 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From b2d68a5fb093999cb42192bea77da8d8414bdb7b Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 25 Nov 2008 08:31:29 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@217 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 13 files changed, 61 insertions(+), 61 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 6f900ad3..8947daa0 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.1</version>
+  <version>1.0.2-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -117,27 +117,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 3ae1717d..ff993fa2 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 3cf9b0cd..6b3b7fc8 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.1</version>
+	<version>1.0.2-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index 2a5b8d19..f2280e29 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.1</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 7bee3a02..7efbedb8 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUOnline</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Online</name>
-	<version>1.0.1</version>
+	<version>1.0.2-SNAPSHOT</version>
 
 	<pluginRepositories>
 		<pluginRepository>
@@ -23,12 +23,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALService</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
         <!-- build BKUApplet prior to BKUOnline -->
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>BKUApplet</artifactId> 
-          <version>1.0.1</version>
+          <version>1.0.2-SNAPSHOT</version>
           <scope>provided</scope> 
         </dependency>
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALService</artifactId> 
-          <version>1.0.1</version>
+          <version>1.0.2-SNAPSHOT</version>
         </dependency>
         
 		<!--
@@ -89,9 +89,9 @@
 		<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
 	</properties>
 	<scm>
-	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1/BKUOnline</url>
+	  <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
 	</scm>
 	<build>
 		<plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 2af2a6cf..3b0fb86e 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.1</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index a1e76cd7..050e2a3e 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 51d2c6d8..a250f9a1 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index e97eed97..e0cb1f7c 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.1</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index cc8387db..874dce5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.1</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -38,9 +38,9 @@
 		</developer>
 	</developers>
 	<scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.1</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index ffdba367..da71c71e 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.1</version>
+  <version>1.0.2-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 6729f3f0..3fa65d19 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b0769293..b183ea03 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.1</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.1</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 959130f29903568c6b7fe3d6538b33887b3b1aaf Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 27 Nov 2008 15:22:32 +0000
Subject: help viewer label removed

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@221 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/gui/AbstractHelpListener.java   |  5 ++-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   |  7 ++--
 .../at/gv/egiz/bku/gui/DefaultHelpListener.java    |  8 ++--
 .../main/java/at/gv/egiz/bku/gui/HelpViewer.java   | 43 ++++++++++++----------
 .../at/gv/egiz/bku/gui/Messages.properties         |  2 +-
 .../at/gv/egiz/bku/gui/Messages_en.properties      | 14 +++----
 .../at/gv/egiz/bku/local/stal/BKUGuiProxy.java     |  7 ----
 7 files changed, 42 insertions(+), 44 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
index f46f5227..b871263e 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
@@ -30,6 +30,9 @@ import org.apache.commons.logging.LogFactory;
  * This class does not keep a GUI reference and subclasses should not interfere with the GUI.
  * Therefore, any errors occurring in showDocument() should be handled/displayed within
  * showDocument() and exceptions thrown from showDocument() are logged, not displayed in the GUI.
+ * <br/>
+ * The help URL is build as [baseURL]/[locale]/[helpTopic].html
+ * (note that no session information is contained).
  * 
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
@@ -41,7 +44,7 @@ public abstract class AbstractHelpListener implements ActionListener {
   protected ResourceBundle messages;
 
   public AbstractHelpListener(URL baseURL, Locale locale) {
-    if (baseURL == null || "".equals(baseURL)) {
+    if (baseURL == null || "".equals(baseURL.toString())) {
       throw new RuntimeException("no help URL provided");
     }
     this.baseURL = baseURL;
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index c786a291..d61c9a03 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -58,9 +58,6 @@ import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableModel;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -117,7 +114,9 @@ public class BKUGUIImpl implements BKUGUIFacade {
       this.contentPane = contentPane;
 
       if (locale != null) {
-          messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, locale);
+          Locale lang = new Locale(locale.getLanguage().substring(0,2));
+          log.debug("loading applet resources for language: " + lang.toString());
+          messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, lang);
       } else {
           messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
       }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
index 3c8c7d6c..c8594fe1 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
@@ -57,10 +57,10 @@ public class DefaultHelpListener extends AbstractHelpListener {
   /**
    * blocks until help viewer returns (is closed)
    * @param helpURL
-   * @param helpTopic
+   * @param helpTopic ignored
    */
   @Override
-  public void showDocument(final URL helpURL, final String helpTopic)  { 
+  public void showDocument(final URL helpURL, final String helpTopic)  {
 //    try {
       log.debug("schedule help dialog");
 
@@ -72,9 +72,9 @@ public class DefaultHelpListener extends AbstractHelpListener {
           log.debug("show help dialog");
 
           if (ctx == null) {
-            HelpViewer.showHelpDialog(helpURL, helpTopic, messages);
+            HelpViewer.showHelpDialog(helpURL, messages); // helpTopic, messages);
           } else {
-            HelpViewer.showHelpDialog(ctx, helpURL, helpTopic, messages);
+            HelpViewer.showHelpDialog(ctx, helpURL, messages); //helpTopic, messages);
           }
         }
       });
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
index 0fef3f75..364da6ec 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
@@ -32,7 +32,6 @@ import javax.swing.GroupLayout;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JEditorPane;
-import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -64,45 +63,44 @@ public class HelpViewer extends JDialog
    */
   public static void showHelpDialog(AppletContext ctx,
           URL helpURL,
-          String helpTopic,
+//          String helpTopic,
           ResourceBundle messages) {
-    showHelpDialog(null, ctx, helpURL, helpTopic, messages);
+    showHelpDialog(null, ctx, helpURL, messages); //helpTopic, messages);
   }
 
   public static void showHelpDialog(URL helpURL,
-          String helpTopic,
+//          String helpTopic,
           ResourceBundle messages) {
-    showHelpDialog(null, null, helpURL, helpTopic, messages);
+    showHelpDialog(null, null, helpURL, messages); // helpTopic, messages);
   }
 
   public static void showHelpDialog(Component owner,
           AppletContext ctx,
           URL helpURL,
-          String helpTopic,
+//          String helpTopic,
           ResourceBundle messages) {
 
     Frame frame = null;
     if (owner != null) {
       JOptionPane.getFrameForComponent(owner);
     }
-    dialog = new HelpViewer(frame, messages, ctx, helpURL, helpTopic);
+    dialog = new HelpViewer(frame, messages, ctx, helpURL); //, helpTopic);
     dialog.setVisible(true);
   }
 
   private HelpViewer(Frame frame,
           ResourceBundle messages,
           AppletContext ctx,
-          URL helpURL,
-          String helpTopic) {
+          URL helpURL) { //, String helpTopic) {
     super(frame, messages.getString(BKUGUIFacade.WINDOWTITLE_HELP), true);
     this.messages = messages;
     this.ctx = ctx;
 
-    String p = messages.getString(BKUGUIFacade.MESSAGE_HELP);
-    String helpItem = messages.getString(helpTopic);
-    String viewerLabel = MessageFormat.format(p, new Object[]{helpItem});
+//    String p = messages.getString(BKUGUIFacade.MESSAGE_HELP);
+//    String helpItem = messages.getString(helpTopic);
+//    String viewerLabel = MessageFormat.format(p, new Object[]{helpItem});
 
-    JPanel helpPanel = createViewerPanel(viewerLabel, helpURL);
+    JPanel helpPanel = createViewerPanel(helpURL); //viewerLabel, helpURL);
     JPanel buttonPanel = createButtonPanel();
 
     initContentPane(new Dimension(600, 600), helpPanel, buttonPanel);
@@ -128,7 +126,7 @@ public class HelpViewer extends JDialog
             mainLayout.createSequentialGroup().addContainerGap().addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED).addComponent(buttonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE).addContainerGap());
   }
 
-  private JPanel createViewerPanel(String viewerLabelText, URL helpURL) {
+  private JPanel createViewerPanel(URL helpURL) {  //String viewerLabelText, 
     log.debug("viewer dialog: " + helpURL.toString());
 
     final JEditorPane viewer = new JEditorPane();
@@ -170,19 +168,24 @@ public class HelpViewer extends JDialog
     scrollPane.setAlignmentX(LEFT_ALIGNMENT);
     viewer.setCaretPosition(0);
 
-    JLabel viewerLabel = new JLabel();
-    viewerLabel.setText(viewerLabelText);
-    viewerLabel.setFont(viewerLabel.getFont().deriveFont(viewerLabel.getFont().getStyle() | java.awt.Font.BOLD));
-    viewerLabel.setLabelFor(viewer);
+//    JLabel viewerLabel = new JLabel();
+//    viewerLabel.setText(viewerLabelText);
+//    viewerLabel.setFont(viewerLabel.getFont().deriveFont(viewerLabel.getFont().getStyle() | java.awt.Font.BOLD));
+//    viewerLabel.setLabelFor(viewer);
 
     JPanel viewerPanel = new JPanel();
     GroupLayout viewerPanelLayout = new GroupLayout(viewerPanel);
     viewerPanel.setLayout(viewerPanelLayout);
     
     viewerPanelLayout.setHorizontalGroup(
-            viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(viewerLabel).addComponent(scrollPane));
+            viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//              .addComponent(viewerLabel)
+              .addComponent(scrollPane));
     viewerPanelLayout.setVerticalGroup(
-            viewerPanelLayout.createSequentialGroup().addComponent(viewerLabel).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(scrollPane));
+            viewerPanelLayout.createSequentialGroup()
+//            .addComponent(viewerLabel)
+//            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+            .addComponent(scrollPane));
 
     return viewerPanel;
   }
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index a7363421..e5315c8d 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -27,7 +27,7 @@ windowtitle.save=Signaturdaten speichern
 windowtitle.savedir=Signaturdaten in Verzeichnis speichern
 windowtitle.overwrite=Datei \u00FCberschreiben?
 windowtitle.viewer=Signaturedaten
-windowtitle.help=Hilfe
+windowtitle.help=Hilfe zur B\u00FCrgerkarte
 message.wait=<html>Bitte warten...</html>
 message.insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
 message.enterpin=<html>{0} eingeben</html>
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index 7aae8eae..96f99a8a 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 title.welcome=<html>Welcome</html>
-title.insertcard=<html>No citizencard found</html>
+title.insertcard=<html>No citizen card found</html>
 title.cardnotsupported=<html>This card is not supported</html>
 #title.cardpin=<html>Enter {0}</html>
 title.cardpin=<html>Reading card</html>
@@ -27,9 +27,9 @@ windowtitle.save=Save signature data
 windowtitle.savedir=Save signature data to directory
 windowtitle.overwrite=Overwrite file?
 windowtitle.viewer=Signature data
-windowtitle.help=Help
+windowtitle.help=Citizen card help
 message.wait=<html>Please wait...</html>
-message.insertcard=<html>Please insert your citizencard into the reader</html>
+message.insertcard=<html>Please insert your citizen card into the reader</html>
 message.enterpin=<html>Enter {0}</html>
 message.hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
 #message.hashdata=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
@@ -65,16 +65,16 @@ error.pcsc=<html>No PC/SC interface for smartcard access provided</html>
 error.cardterminal=<html>Could not find smartcard reader</html>
 error.unknown=<html>An error occured: {0}</html>
 error.test=<html>Error1 {0} - Error2 {1}</html>
-error.card.locked=<html>Citizencard is locked</html>
-error.card.notactivated=<html>Citizencard not activated</html>
+error.card.locked=<html>Citizen card is locked</html>
+error.card.notactivated=<html>Citizen card not activated</html>
 error.viewer=Failed to display contents: {0}
 error.external.link=<html>Externer Link {0} wird nicht ge\u00F6ffnet</html>
 
 # Help Topics
 help.welcome=Welcome page
 help.wait=Wait screen
-help.cardnotsupported=Unsupported citizencard
-help.insertcard=No citizencard found
+help.cardnotsupported=Unsupported citizen card
+help.insertcard=No citizen card found
 help.cardpin=Pin entry
 help.signpin=Signature pin entry
 help.retry=Wrong Pin
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
index eaa4d6ad..a28ee1eb 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
@@ -1,13 +1,6 @@
 package at.gv.egiz.bku.local.stal;
 
-import java.awt.Container;
-import java.awt.EventQueue;
-import java.awt.Toolkit;
 import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.WindowEvent;
-import java.net.URL;
 import java.util.List;
 
 import java.util.Locale;
-- 
cgit v1.2.3


From e19797ef996b4157009418b03d0779c8338c6959 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 17 Dec 2008 13:35:21 +0000
Subject: bug #365

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@250 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index e5315c8d..e560ca98 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -26,7 +26,7 @@ title.hashdata=<html>Signaturdaten</html>
 windowtitle.save=Signaturdaten speichern
 windowtitle.savedir=Signaturdaten in Verzeichnis speichern
 windowtitle.overwrite=Datei \u00FCberschreiben?
-windowtitle.viewer=Signaturedaten
+windowtitle.viewer=Signaturdaten
 windowtitle.help=Hilfe zur B\u00FCrgerkarte
 message.wait=<html>Bitte warten...</html>
 message.insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
-- 
cgit v1.2.3


From 4618f05e6a202ef2d502c78a4bd0dc13b9c0aea2 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 20 Jan 2009 16:38:30 +0000
Subject: [maven-release-plugin] prepare release bku-1.0.2

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@273 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  8 ++++----
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              | 23 +++++++++--------------
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 14 files changed, 70 insertions(+), 75 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 8947daa0..49159c5e 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.2</version>
   <build>
     <plugins>
       <plugin>
@@ -117,27 +117,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index ff993fa2..64b93904 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 6b3b7fc8..d49ef4d7 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.1</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index f2280e29..e253ab46 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index e5db2e55..85209fa9 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
             <scope>compile</scope>
         </dependency>
 		<!-- build BKUApplet prior to BKUOnline -->
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <!-- TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
          |   so that BKUOnline does not have to depend on STALXService
@@ -107,9 +107,9 @@
         <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
     </properties>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 3b0fb86e..439d03ea 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.2</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 050e2a3e..112a1830 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index b62df5a2..9c4f159d 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.0.2-SNAPSHOT</version>
-  <description/>
+  <version>1.0.1</version>
+  <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index a250f9a1..4dd2455b 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 41691dc6..2ecd3f12 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.2</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 286e98a3..cd3ec664 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,9 @@
-<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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.2</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -40,9 +39,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
@@ -58,8 +57,7 @@
 					<configuration>
 						<!--
 							fork>true</fork> <executable>${java_6_sun}/bin/javac</executable>
-							<compilerVersion>1.6</compilerVersion
-						-->
+							<compilerVersion>1.6</compilerVersion -->
 						<source>1.6</source>
 						<target>1.6</target>
 						<verbose>true</verbose>
@@ -86,8 +84,7 @@
 				<!--
 					plugin> <artifactId>maven-jaxb2-plugin</artifactId>
 					<groupId>org.jvnet.jaxb2.maven2</groupId> <version>0.6.0</version>
-					</plugin
-				-->
+					</plugin -->
 				<plugin>
 					<artifactId>jaxws-maven-plugin</artifactId>
 					<groupId>org.codehaus.mojo</groupId>
@@ -109,8 +106,7 @@
 						<!--
 							descriptor>${basedir}/src/main/assemblies/assembly-online.xml</descriptor>
 							<descriptor>${basedir}/src/main/assemblies/assembly-local.xml</descriptor>
-							<descriptor>${basedir}/src/main/assemblies/assembly-server.xml</descriptor
-						-->
+							<descriptor>${basedir}/src/main/assemblies/assembly-server.xml</descriptor -->
 					</descriptors>
 				</configuration>
 				<!--
@@ -121,8 +117,7 @@
 					explicitly execute the package phase ahead of the assembly
 					invocation, to ensure all modules have been built. <executions>
 					<execution> <phase>package</phase> <goals> <goal>attached</goal>
-					</goals> </execution> </executions
-				-->
+					</goals> </execution> </executions -->
 			</plugin>
 		</plugins>
 	</build>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 62c60e75..a973c809 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.2</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 3fa65d19..7d4334bd 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b183ea03..52fa6917 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.2</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From ce598ba5142ff7673085dd90865f9323d69574be Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 20 Jan 2009 16:56:08 +0000
Subject: [maven-release-plugin] rollback the release of bku-1.0.2

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@274 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  8 ++++----
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              | 23 ++++++++++++++---------
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 14 files changed, 75 insertions(+), 70 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 49159c5e..8947daa0 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.2</version>
+  <version>1.0.2-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -117,27 +117,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 64b93904..ff993fa2 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index d49ef4d7..6b3b7fc8 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.1</version>
+	<version>1.0.2-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index e253ab46..f2280e29 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.1</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 85209fa9..e5db2e55 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 		<!-- build BKUApplet prior to BKUOnline -->
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <!-- TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
          |   so that BKUOnline does not have to depend on STALXService
@@ -107,9 +107,9 @@
         <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
     </properties>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 439d03ea..3b0fb86e 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.2</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 112a1830..050e2a3e 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 9c4f159d..b62df5a2 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.0.1</version>
-  <description />
+  <version>1.0.2-SNAPSHOT</version>
+  <description/>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 4dd2455b..a250f9a1 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 2ecd3f12..41691dc6 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.2</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index cd3ec664..286e98a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,10 @@
-<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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.2</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -39,9 +40,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
@@ -57,7 +58,8 @@
 					<configuration>
 						<!--
 							fork>true</fork> <executable>${java_6_sun}/bin/javac</executable>
-							<compilerVersion>1.6</compilerVersion -->
+							<compilerVersion>1.6</compilerVersion
+						-->
 						<source>1.6</source>
 						<target>1.6</target>
 						<verbose>true</verbose>
@@ -84,7 +86,8 @@
 				<!--
 					plugin> <artifactId>maven-jaxb2-plugin</artifactId>
 					<groupId>org.jvnet.jaxb2.maven2</groupId> <version>0.6.0</version>
-					</plugin -->
+					</plugin
+				-->
 				<plugin>
 					<artifactId>jaxws-maven-plugin</artifactId>
 					<groupId>org.codehaus.mojo</groupId>
@@ -106,7 +109,8 @@
 						<!--
 							descriptor>${basedir}/src/main/assemblies/assembly-online.xml</descriptor>
 							<descriptor>${basedir}/src/main/assemblies/assembly-local.xml</descriptor>
-							<descriptor>${basedir}/src/main/assemblies/assembly-server.xml</descriptor -->
+							<descriptor>${basedir}/src/main/assemblies/assembly-server.xml</descriptor
+						-->
 					</descriptors>
 				</configuration>
 				<!--
@@ -117,7 +121,8 @@
 					explicitly execute the package phase ahead of the assembly
 					invocation, to ensure all modules have been built. <executions>
 					<execution> <phase>package</phase> <goals> <goal>attached</goal>
-					</goals> </execution> </executions -->
+					</goals> </execution> </executions
+				-->
 			</plugin>
 		</plugins>
 	</build>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index a973c809..62c60e75 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.2</version>
+  <version>1.0.2-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 7d4334bd..3fa65d19 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 52fa6917..b183ea03 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.2</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 3f673f19aa8c4aec3d40d98731de289cbb7e79c6 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 20 Jan 2009 17:01:02 +0000
Subject: [maven-release-plugin] prepare release mocca-1.0.2

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@275 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  8 ++++----
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              | 23 +++++++++--------------
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 14 files changed, 70 insertions(+), 75 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 8947daa0..49159c5e 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.2</version>
   <build>
     <plugins>
       <plugin>
@@ -117,27 +117,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index ff993fa2..64b93904 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 6b3b7fc8..e147a6ad 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.1</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index f2280e29..e253ab46 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index e5db2e55..cfc5507e 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
             <scope>compile</scope>
         </dependency>
 		<!-- build BKUApplet prior to BKUOnline -->
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <!-- TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
          |   so that BKUOnline does not have to depend on STALXService
@@ -107,9 +107,9 @@
         <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
     </properties>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 3b0fb86e..439d03ea 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.2</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 050e2a3e..112a1830 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index b62df5a2..9c4f159d 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.0.2-SNAPSHOT</version>
-  <description/>
+  <version>1.0.1</version>
+  <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index a250f9a1..4dd2455b 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 41691dc6..2ecd3f12 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.2</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 286e98a3..7ab236f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,9 @@
-<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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.2</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -40,9 +39,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
@@ -58,8 +57,7 @@
 					<configuration>
 						<!--
 							fork>true</fork> <executable>${java_6_sun}/bin/javac</executable>
-							<compilerVersion>1.6</compilerVersion
-						-->
+							<compilerVersion>1.6</compilerVersion -->
 						<source>1.6</source>
 						<target>1.6</target>
 						<verbose>true</verbose>
@@ -86,8 +84,7 @@
 				<!--
 					plugin> <artifactId>maven-jaxb2-plugin</artifactId>
 					<groupId>org.jvnet.jaxb2.maven2</groupId> <version>0.6.0</version>
-					</plugin
-				-->
+					</plugin -->
 				<plugin>
 					<artifactId>jaxws-maven-plugin</artifactId>
 					<groupId>org.codehaus.mojo</groupId>
@@ -109,8 +106,7 @@
 						<!--
 							descriptor>${basedir}/src/main/assemblies/assembly-online.xml</descriptor>
 							<descriptor>${basedir}/src/main/assemblies/assembly-local.xml</descriptor>
-							<descriptor>${basedir}/src/main/assemblies/assembly-server.xml</descriptor
-						-->
+							<descriptor>${basedir}/src/main/assemblies/assembly-server.xml</descriptor -->
 					</descriptors>
 				</configuration>
 				<!--
@@ -121,8 +117,7 @@
 					explicitly execute the package phase ahead of the assembly
 					invocation, to ensure all modules have been built. <executions>
 					<execution> <phase>package</phase> <goals> <goal>attached</goal>
-					</goals> </execution> </executions
-				-->
+					</goals> </execution> </executions -->
 			</plugin>
 		</plugins>
 	</build>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 62c60e75..a973c809 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.2</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 3fa65d19..7d4334bd 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b183ea03..52fa6917 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.2</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From ce977ee25ede5535beaf72bd0555c0984d5741bf Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 20 Jan 2009 17:01:18 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@277 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 14 files changed, 64 insertions(+), 64 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 49159c5e..303a44ff 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -117,27 +117,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.3-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 64b93904..fc99b6bb 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2</version>
+        <version>1.0.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index e147a6ad..ab1b9fb9 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.1</version>
+	<version>1.0.3-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.3-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index e253ab46..10035ee5 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.1</version>
+	<version>1.0.3-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.3-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.2</version>
+			<version>1.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index cfc5507e..d705ee3d 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2</version>
+        <version>1.0.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 		<!-- build BKUApplet prior to BKUOnline -->
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3-SNAPSHOT</version>
         </dependency>
         <!-- TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
          |   so that BKUOnline does not have to depend on STALXService
@@ -107,9 +107,9 @@
         <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
     </properties>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 439d03ea..7e650178 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.2</version>
+	<version>1.0.3-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 112a1830..b9377b9b 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2</version>
+        <version>1.0.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 9c4f159d..db1dc48d 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.0.1</version>
+  <version>1.0.3-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.3-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 4dd2455b..f06cc0ae 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2</version>
+        <version>1.0.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 2ecd3f12..c2e272dd 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.2</version>
+	<version>1.0.3-SNAPSHOT</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 7ab236f5..f959d717 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.2</version>
+	<version>1.0.3-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -39,9 +39,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index a973c809..b40dd784 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 7d4334bd..84c4d410 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.2</version>
+        <version>1.0.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 52fa6917..7f712937 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.2</version>
+		<version>1.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.2</version>
+	<version>1.0.3-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From b06ecc665c64c3e16a3beac5712d607b35d988d8 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 21 Jan 2009 13:28:18 +0000
Subject: [maven-release-plugin] prepare release mocca-1.0.3

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@279 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 14 files changed, 64 insertions(+), 64 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 303a44ff..3212798d 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.3-SNAPSHOT</version>
+  <version>1.0.3</version>
   <build>
     <plugins>
       <plugin>
@@ -117,27 +117,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.3-SNAPSHOT</version>
+      <version>1.0.3</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.3-SNAPSHOT</version>
+      <version>1.0.3</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.3-SNAPSHOT</version>
+      <version>1.0.3</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.3-SNAPSHOT</version>
+      <version>1.0.3</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.3-SNAPSHOT</version>
+      <version>1.0.3</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index fc99b6bb..91a578dc 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.3-SNAPSHOT</version>
+            <version>1.0.3</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.3-SNAPSHOT</version>
+            <version>1.0.3</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index ab1b9fb9..b77fa54d 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.3-SNAPSHOT</version>
+		<version>1.0.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.3-SNAPSHOT</version>
+	<version>1.0.1</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.3-SNAPSHOT</version>
+			<version>1.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.3-SNAPSHOT</version>
+			<version>1.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.3-SNAPSHOT</version>
+			<version>1.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.3-SNAPSHOT</version>
+			<version>1.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.3-SNAPSHOT</version>
+			<version>1.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.3-SNAPSHOT</version>
+			<version>1.0.3</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index 10035ee5..a7ae57e9 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.3-SNAPSHOT</version>
+		<version>1.0.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.3-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.3-SNAPSHOT</version>
+			<version>1.0.1</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.3-SNAPSHOT</version>
+			<version>1.0.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index d705ee3d..4eae4ac0 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.0.3-SNAPSHOT</version>
+            <version>1.0.3</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.0.3-SNAPSHOT</version>
+            <version>1.0.3</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.3-SNAPSHOT</version>
+            <version>1.0.3</version>
             <scope>compile</scope>
         </dependency>
 		<!-- build BKUApplet prior to BKUOnline -->
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.0.3-SNAPSHOT</version>
+            <version>1.0.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.3-SNAPSHOT</version>
+            <version>1.0.3</version>
         </dependency>
         <!-- TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
          |   so that BKUOnline does not have to depend on STALXService
@@ -107,9 +107,9 @@
         <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
     </properties>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 7e650178..f22f6665 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.3-SNAPSHOT</version>
+		<version>1.0.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.3-SNAPSHOT</version>
+	<version>1.0.3</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.3-SNAPSHOT</version>
+			<version>1.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index b9377b9b..18d1c224 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index db1dc48d..3a0ff069 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.0.3-SNAPSHOT</version>
+  <version>1.0.1</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.3-SNAPSHOT</version>
+      <version>1.0.3</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index f06cc0ae..9f5415bd 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.3-SNAPSHOT</version>
+            <version>1.0.3</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index c2e272dd..b6535993 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.3-SNAPSHOT</version>
+		<version>1.0.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.3-SNAPSHOT</version>
+	<version>1.0.3</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.3-SNAPSHOT</version>
+			<version>1.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.0.3-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index f959d717..525d0122 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.3-SNAPSHOT</version>
+	<version>1.0.3</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -39,9 +39,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index b40dd784..f3d1a77e 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.3-SNAPSHOT</version>
+  <version>1.0.3</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 84c4d410..f0690389 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.3-SNAPSHOT</version>
+            <version>1.0.3</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.3-SNAPSHOT</version>
+            <version>1.0.3</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.3-SNAPSHOT</version>
+            <version>1.0.3</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 7f712937..a1f8ce70 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.3-SNAPSHOT</version>
+		<version>1.0.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.3-SNAPSHOT</version>
+	<version>1.0.3</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 5a4d7efb69c4b44e78f3e8e797e88fc2b5f4f668 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 21 Jan 2009 13:28:34 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@281 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 14 files changed, 64 insertions(+), 64 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 3212798d..f0ee7255 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.3</version>
+  <version>1.0.4-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -117,27 +117,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 91a578dc..32d39042 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index b77fa54d..0572fcb2 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.3</version>
+		<version>1.0.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.1</version>
+	<version>1.0.4-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.3</version>
+			<version>1.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.3</version>
+			<version>1.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.3</version>
+			<version>1.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.3</version>
+			<version>1.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.3</version>
+			<version>1.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.3</version>
+			<version>1.0.4-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index a7ae57e9..ac56c906 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.3</version>
+		<version>1.0.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.1</version>
+	<version>1.0.4-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.4-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.3</version>
+			<version>1.0.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 4eae4ac0..c5c77546 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 		<!-- build BKUApplet prior to BKUOnline -->
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4-SNAPSHOT</version>
         </dependency>
         <!-- TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
          |   so that BKUOnline does not have to depend on STALXService
@@ -107,9 +107,9 @@
         <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
     </properties>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index f22f6665..7e5fd256 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.3</version>
+		<version>1.0.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.3</version>
+	<version>1.0.4-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.3</version>
+			<version>1.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 18d1c224..f7214f04 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 3a0ff069..bbf6697a 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.0.1</version>
+  <version>1.0.4-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 9f5415bd..72f22b0e 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index b6535993..71070e7b 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.3</version>
+		<version>1.0.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.3</version>
+	<version>1.0.4-SNAPSHOT</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.3</version>
+			<version>1.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 525d0122..53013b02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.3</version>
+	<version>1.0.4-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -39,9 +39,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.3</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index f3d1a77e..f19f178f 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.3</version>
+  <version>1.0.4-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index f0690389..96ed97b2 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index a1f8ce70..55a8aef9 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.3</version>
+		<version>1.0.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.3</version>
+	<version>1.0.4-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 212bbffc24ccc1cd909cabdc9650491dd221cd60 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 22 Jan 2009 13:21:50 +0000
Subject: STALTranslator

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@283 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml                                  |   7 -
 .../gv/egiz/bku/online/applet/AppletBKUWorker.java | 204 ++++++++-------
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |   2 +-
 BKUApplet/src/test/resources/appletTest.html       |   2 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   1 +
 .../at/gv/egiz/bku/gui/Messages.properties         |   1 +
 .../at/gv/egiz/bku/gui/Messages_en.properties      |   3 +-
 .../stal/service/impl/STALRequestBrokerImpl.java   | 109 +++++---
 .../gv/egiz/stal/service/impl/STALServiceImpl.java |   4 +-
 .../stal/service/translator/STALTranslator.java    | 274 +++++++++++++++++++++
 .../service/translator/TranslationException.java   |  42 ++++
 .../java/at/gv/egiz/stal/util/STALTranslator.java  | 114 ---------
 .../service/translator/STALTranslatorTest.java     | 146 +++++++++++
 .../src/test/resources/commons-logging.properties  |   1 +
 14 files changed, 665 insertions(+), 245 deletions(-)
 create mode 100644 STALService/src/main/java/at/gv/egiz/stal/service/translator/STALTranslator.java
 create mode 100644 STALService/src/main/java/at/gv/egiz/stal/service/translator/TranslationException.java
 delete mode 100644 STALService/src/main/java/at/gv/egiz/stal/util/STALTranslator.java
 create mode 100644 STALService/src/test/java/at/gv/egiz/stal/service/translator/STALTranslatorTest.java
 create mode 100644 STALService/src/test/resources/commons-logging.properties

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index f0ee7255..4491ff3a 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -104,13 +104,6 @@
 					</execution>
 				</executions>
 			</plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
index 3903bf10..3b6d007a 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
@@ -23,13 +23,14 @@ import at.gv.egiz.stal.STALResponse;
 import at.gv.egiz.stal.SignRequest;
 import at.gv.egiz.stal.service.STALPortType;
 import at.gv.egiz.stal.service.STALService;
+import at.gv.egiz.stal.service.translator.STALTranslator;
+import at.gv.egiz.stal.service.translator.TranslationException;
 import at.gv.egiz.stal.service.types.ErrorResponseType;
 import at.gv.egiz.stal.service.types.GetNextRequestResponseType;
 import at.gv.egiz.stal.service.types.GetNextRequestType;
 import at.gv.egiz.stal.service.types.ObjectFactory;
 import at.gv.egiz.stal.service.types.RequestType;
 import at.gv.egiz.stal.service.types.ResponseType;
-import at.gv.egiz.stal.util.STALTranslator;
 import java.applet.AppletContext;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -37,6 +38,7 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceException;
 
 /**
  * 
@@ -49,6 +51,7 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
   protected String sessionId;
   protected STALPortType stalPort;
   private ObjectFactory stalObjFactory = new ObjectFactory();
+  private STALTranslator translator = new STALTranslator();
 
   public AppletBKUWorker(BKUGUIFacade gui, AppletContext ctx,
           AppletParameterProvider paramProvider) {
@@ -72,108 +75,147 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
   @Override
   public void run() {
     gui.showWelcomeDialog();
+
     try {
       stalPort = getSTALPort();
-    } catch (Exception e) {
-      log.fatal("Failed to get STAL web-service port: " + e.getMessage(), e);
-      actionCommandList.clear();
-      actionCommandList.add("ok");
-      gui.showErrorDialog(BKUGUIFacade.ERR_SERVICE_UNREACHABLE,
-              new Object[]{e.getMessage()});
-      try {
-        waitForAction();
-      } catch (InterruptedException e1) {
-        log.error(e1);
-      }
-      return;
-    }
 
-    try {
-      registerSignRequestHandler();
+      registerSignRequestHandler(stalPort, sessionId);
 
       GetNextRequestResponseType nextRequestResp = stalPort.connect(sessionId);
+
       do {
-        List<JAXBElement<? extends RequestType>> requests = nextRequestResp.getInfoboxReadRequestOrSignRequestOrQuitRequest();
+        List<JAXBElement<? extends RequestType>> requests;
+        List<JAXBElement<? extends ResponseType>> responses = new ArrayList<JAXBElement<? extends ResponseType>>();
 
-        // (rather use validator)
-        if (requests.size() == 0) {
-          log.error("Received empty NextRequestResponse: no STAL requests to handle. (STAL-X requests might not have gotten unmarshalled)");
-          throw new Exception("No STAL requests to handle.");
-        }
+        try {
+          requests = nextRequestResp.getInfoboxReadRequestOrSignRequestOrQuitRequest();
+          responses.clear();
 
-        List<STALRequest> stalRequests = STALTranslator.translateRequests(requests);
+          // (rather use validator)
+          if (requests.size() == 0) {
+            log.error("Received empty NextRequestResponse: no STAL requests to handle. (STAL-X requests might not have gotten unmarshalled)");
+            throw new RuntimeException("No STAL requests to handle.");
+          }
 
-        if (log.isInfoEnabled()) {
-          StringBuilder sb = new StringBuilder("Received ");
-          sb.append(stalRequests.size());
-          sb.append(" STAL requests: ");
-          for (STALRequest r : stalRequests) {
-            sb.append(r.getClass());
-            sb.append(' ');
+          if (log.isInfoEnabled()) {
+            StringBuilder sb = new StringBuilder("Received ");
+            sb.append(requests.size());
+            sb.append(" requests: ");
+            for (JAXBElement<? extends RequestType> r : requests) {
+              sb.append(r.getValue().getClass());
+              sb.append(' ');
+            }
+            log.info(sb.toString());
           }
-          log.info(sb.toString());
-        }
 
-        boolean handle = true;
-        for (STALRequest request : stalRequests) {
-          if (request instanceof at.gv.egiz.stal.InfoboxReadRequest) {
-            at.gv.egiz.stal.InfoboxReadRequest r = (at.gv.egiz.stal.InfoboxReadRequest) request;
-            String infoboxId = r.getInfoboxIdentifier();
-            String domainId = r.getDomainIdentifier();
-            if ("IdentityLink".equals(infoboxId) && domainId == null) {
-              if (!InternalSSLSocketFactory.getInstance().isEgovAgency()) {
-                  handle = false;
-              }
+          List<STALRequest> stalRequests = new ArrayList<STALRequest>();
+          for (JAXBElement<? extends RequestType> req : requests) {
+            try {
+              stalRequests.add(translator.translate(req));
+            } catch (TranslationException ex) {
+              log.error("Received unknown request from server STAL: " + ex.getMessage());
+              throw new RuntimeException(ex);
             }
           }
-        }
 
-        List<JAXBElement<? extends ResponseType>> responses;
-        if (handle) {
+          checkPermission(stalRequests);
+
           List<STALResponse> stalResponses = handleRequest(stalRequests);
-          if (log.isInfoEnabled()) {
-            StringBuilder sb = new StringBuilder(stalResponses.size());
-            sb.append(" STAL responses: ");
-            for (STALResponse r : stalResponses) {
-              sb.append(r.getClass());
-              sb.append(' ');
+          for (STALResponse stalResponse : stalResponses) {
+            try {
+              responses.add(translator.translate(stalResponse));
+            } catch (TranslationException ex) {
+              log.error("Received unknown response from STAL: " + ex.getMessage());
+              throw new RuntimeException(ex);
             }
-            log.info(sb.toString());
           }
-          responses = STALTranslator.fromSTAL(stalResponses);
-        } else {
-          log.error("Insufficient rights to execute command InfoboxReadRequest for Infobox IdentityLink, return Error 6002");
-          responses = new ArrayList<JAXBElement<? extends ResponseType>>(1);
+
+        } catch (RuntimeException ex) {
+          // return ErrorResponse to server, which displays error page
+          log.error(ex.getMessage());
+          Throwable cause = ex.getCause();
           ErrorResponseType err = stalObjFactory.createErrorResponseType();
-          err.setErrorCode(6002);
-          // err.setErrorMessage();
+          if (cause != null) {
+            log.error("caused by: " + cause.getMessage());
+            if (cause instanceof SecurityException) {
+              err.setErrorCode(6002);
+            } else {
+              err.setErrorCode(4000);
+            }
+          } else {
+            err.setErrorCode(4000);
+          }
+          responses.clear();
           responses.add(stalObjFactory.createGetNextRequestTypeErrorResponse(err));
-        }
 
-        if (!finished) {
-          log.info("Not finished yet (BKUWorker: " + this + "), sending responses");
-          GetNextRequestType nextRequest = stalObjFactory.createGetNextRequestType();
-          nextRequest.setSessionId(sessionId);
-          nextRequest.getInfoboxReadResponseOrSignResponseOrErrorResponse().addAll(responses);
-          nextRequestResp = stalPort.getNextRequest(nextRequest);
+        } finally {
+          if (!finished) {
+            if (log.isInfoEnabled()) {
+              StringBuilder sb = new StringBuilder("Sending ");
+              sb.append(responses.size());
+              sb.append(" responses: ");
+              for (JAXBElement<? extends ResponseType> r : responses) {
+                sb.append(r.getValue().getClass());
+                sb.append(' ');
+              }
+              log.info(sb.toString());
+            }
+            GetNextRequestType nextRequest = stalObjFactory.createGetNextRequestType();
+            nextRequest.setSessionId(sessionId);
+            nextRequest.getInfoboxReadResponseOrSignResponseOrErrorResponse().addAll(responses);
+            nextRequestResp = stalPort.getNextRequest(nextRequest);
+          }
         }
+
+
       } while (!finished);
       log.info("Done " + Thread.currentThread().getName());
+
+    } catch (WebServiceException ex) {
+      log.fatal("communication error with server STAL: " + ex.getMessage(), ex);
+      showErrorDialog(BKUGUIFacade.ERR_SERVICE_UNREACHABLE, ex);
+    } catch (MalformedURLException ex) {
+      log.fatal(ex.getMessage(), ex);
+      showErrorDialog(BKUGUIFacade.ERR_CONFIG, ex);
     } catch (Exception ex) {
       log.error(ex.getMessage(), ex);
-      gui.showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, new Object[]{ex.getMessage()});
-      try {
-        waitForAction();
-      } catch (InterruptedException e) {
-        log.error(e);
-      }
+      showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, ex);
+    } finally {
       if (signatureCard != null) {
         signatureCard.disconnect(false);
       }
     }
+
     sendRedirect();
   }
 
+  private void checkPermission(List<STALRequest> stalRequests) {
+    for (STALRequest request : stalRequests) {
+      if (request instanceof at.gv.egiz.stal.InfoboxReadRequest) {
+        at.gv.egiz.stal.InfoboxReadRequest r = (at.gv.egiz.stal.InfoboxReadRequest) request;
+        String infoboxId = r.getInfoboxIdentifier();
+        String domainId = r.getDomainIdentifier();
+        if ("IdentityLink".equals(infoboxId) && domainId == null) {
+          if (!InternalSSLSocketFactory.getInstance().isEgovAgency()) {
+            throw new RuntimeException(new SecurityException("Insufficient rights to execute command InfoboxReadRequest for Infobox IdentityLink"));
+          }
+        }
+      }
+    }
+  }
+
+  private void showErrorDialog(String err_code, Exception ex) {
+    actionCommandList.clear();
+    actionCommandList.add("ok");
+    gui.showErrorDialog(err_code,
+            new Object[]{ex.getMessage()}, this, "ok");
+    try {
+      waitForAction();
+    } catch (InterruptedException e) {
+      log.error(e);
+    }
+  }
+
   protected void sendRedirect() {
     try {
       URL redirectURL = params.getURLParameter(BKUApplet.REDIRECT_URL,
@@ -201,20 +243,10 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
     return stal.getSTALPort();
   }
 
-  private void registerSignRequestHandler() throws MalformedURLException {
-    String hashDataDisplayStyle = params.getAppletParameter(BKUApplet.HASHDATA_DISPLAY);
-    if (BKUApplet.HASHDATA_DISPLAY_BROWSER.equals(hashDataDisplayStyle)) {
-      URL hashDataURL = params.getURLParameter(BKUApplet.HASHDATA_URL,
-              sessionId);
-      log.debug("register SignRequestHandler for HashDataURL " + hashDataURL);
-      addRequestHandler(SignRequest.class, new BrowserHashDataDisplay(ctx,
-              hashDataURL));
-    } else {
-      // BKUApplet.HASHDATA_DISPLAY_FRAME
-      log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
-      AppletHashDataDisplay handler = new AppletHashDataDisplay(stalPort,
-              sessionId);
-      addRequestHandler(SignRequest.class, handler);
-    }
+  private void registerSignRequestHandler(STALPortType stalPort, String sessionId) {
+    log.debug("register SignRequestHandler (resolve hashdata via STAL Webservice)");
+    AppletHashDataDisplay handler = new AppletHashDataDisplay(stalPort,
+            sessionId);
+    addRequestHandler(SignRequest.class, handler);
   }
 }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index d0f6d489..41dae3ba 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -53,7 +53,7 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
   public static final String REDIRECT_URL = "RedirectURL";
   public static final String REDIRECT_TARGET = "RedirectTarget";
 //  public static final String HASHDATA_DISPLAY_INTERNAL = "internal";
-  public static final String HASHDATA_DISPLAY_BROWSER = "browser";
+//  public static final String HASHDATA_DISPLAY_BROWSER = "browser";
   public static final String HASHDATA_DISPLAY_FRAME = "frame";
   
   /**
diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
index b3f68a91..2bf9ba0c 100644
--- a/BKUApplet/src/test/resources/appletTest.html
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -18,7 +18,7 @@
   <body>
     <center>
       <applet code="at.gv.egiz.bku.online.applet.BKUApplet.class"
-              archive="../BKUApplet-1.0.2-SNAPSHOT.jar, ../test-libs/commons-logging-1.1.1.jar , ../test-libs/iaik_jce_me4se-3.04.jar"
+              archive="../BKUApplet-1.0.4-SNAPSHOT.jar, ../test-libs/commons-logging-1.1.1.jar , ../test-libs/iaik_jce_me4se-3.04.jar"
               width=300 height=200>
               <param name="GuiStyle" value="advanced"/>
               <param name="Locale" value="en_US"/>
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index d3cb76f2..5ee0058f 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -37,6 +37,7 @@ public interface BKUGUIFacade {
   public static final String ERR_CARD_NOTACTIVATED = "error.card.notactivated";
   public static final String ERR_VIEWER = "error.viewer";
   public static final String ERR_EXTERNAL_LINK = "error.external.link";
+  public static final String ERR_CONFIG = "error.config";
   
   public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
   public static final String DEFAULT_BACKGROUND = "/images/BackgroundChipperling.png";
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index e560ca98..d2b47a9d 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -72,6 +72,7 @@ error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
 error.card.notactivated=<html>B\u00FCrgerkartenfunktion ist nicht aktiviert</html>
 error.viewer=Der Inhalt kann nicht dargestellt werden: {0}
 error.external.link=<html>Externer Link {0} wird nicht ge\u00F6ffnet</html>
+error.config=<html>Fehlerhafte Konfiguration des Systems: {0}</html>
 
 # Help Topics
 help.welcome=Startseite
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index 96f99a8a..524a2a98 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -68,7 +68,8 @@ error.test=<html>Error1 {0} - Error2 {1}</html>
 error.card.locked=<html>Citizen card is locked</html>
 error.card.notactivated=<html>Citizen card not activated</html>
 error.viewer=Failed to display contents: {0}
-error.external.link=<html>Externer Link {0} wird nicht ge\u00F6ffnet</html>
+error.external.link=<html>Cannot open external link {0}</html>
+error.config=<html>Incorrect system configuration: {0}</html>
 
 # Help Topics
 help.welcome=Welcome page
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
index 252327d3..a617c61f 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
@@ -24,13 +24,14 @@ 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.service.translator.STALTranslator;
+import at.gv.egiz.stal.service.translator.TranslationException;
 import at.gv.egiz.stal.service.types.InfoboxReadRequestType;
 import at.gv.egiz.stal.service.types.ObjectFactory;
 import at.gv.egiz.stal.service.types.QuitRequestType;
 import at.gv.egiz.stal.service.types.RequestType;
 import at.gv.egiz.stal.service.types.ResponseType;
 import at.gv.egiz.stal.service.types.SignRequestType;
-import at.gv.egiz.stal.util.STALTranslator;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -54,7 +55,8 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
 
     private static final Log log = LogFactory.getLog(STALRequestBrokerImpl.class);
 
-    private ObjectFactory stalObjFactory = new ObjectFactory();
+    private ObjectFactory of = new ObjectFactory();
+    private STALTranslator translator = new STALTranslator();
     
     private boolean interrupted = false;
     
@@ -69,6 +71,7 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
       if (timeoutMillisec <= 0) 
         timeoutMillisec = DEFAULT_TIMEOUT_MS;
       timeout = timeoutMillisec;
+//      translator.registerTranslationHandler(handler);
       requests = new ArrayList<JAXBElement<? extends RequestType>>();
       responses = new ArrayList<JAXBElement<? extends ResponseType>>();
       hashDataInputs = new ArrayList<HashDataInput>();
@@ -97,42 +100,70 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
             hashDataInputs.clear();
             
             for (STALRequest stalRequest : stalRequests) {
+              try {
+                JAXBElement<? extends RequestType> request = translator.translate(stalRequest);
+                requests.add(request);
                 if (stalRequest instanceof SignRequest) {
-                  log.trace("Received SignRequest, keep HashDataInput.");
-                  SignRequestType reqT = stalObjFactory.createSignRequestType();
-                  reqT.setKeyIdentifier(((SignRequest) stalRequest).getKeyIdentifier());
-                  reqT.setSignedInfo(((SignRequest) stalRequest).getSignedInfo());
-                  JAXBElement<SignRequestType> req = stalObjFactory.createGetNextRequestResponseTypeSignRequest(reqT);
-                  requests.add(req);
-                  //DataObjectHashDataInput with reference caching enabled DataObject 
+                  //TODO refactor SignRequestType to keep HDI
+                  // and getHashDataInput() accesses request obj
+                  // (requests are cleared only when we receive the response)
+                  // DataObjectHashDataInput with reference caching enabled DataObject
                   hashDataInputs.addAll(((SignRequest) stalRequest).getHashDataInput());
-                  break;
-                } else if (stalRequest instanceof InfoboxReadRequest) {
-                  log.trace("Received InfoboxReadRequest");
-                  InfoboxReadRequestType reqT = new InfoboxReadRequestType();
-                  reqT.setInfoboxIdentifier(((InfoboxReadRequest) stalRequest).getInfoboxIdentifier());
-                  reqT.setDomainIdentifier(((InfoboxReadRequest) stalRequest).getDomainIdentifier());
-                  JAXBElement<InfoboxReadRequestType> req = stalObjFactory.createGetNextRequestResponseTypeInfoboxReadRequest(reqT);
-                  requests.add(req);
                 } else if (stalRequest instanceof QuitRequest) {
                   log.trace("Received QuitRequest, do not wait for responses.");
-                  QuitRequestType reqT = stalObjFactory.createQuitRequestType();
-                  JAXBElement<QuitRequestType> req = stalObjFactory.createGetNextRequestResponseTypeQuitRequest(reqT);
-                  requests.add(req);
-                  log.trace("notifying request consumers");
-                  requests.notify();
-                  return new ArrayList<STALResponse>();
-                } else {
-                  log.error("Received unsupported STAL request: " + stalRequest.getClass().getName() + ", send QUIT");
-                  requests.clear();
-                  QuitRequestType reqT = stalObjFactory.createQuitRequestType();
-                  JAXBElement<QuitRequestType> req = stalObjFactory.createGetNextRequestResponseTypeQuitRequest(reqT);
-                  requests.add(req);
                   log.trace("notifying request consumers");
                   requests.notify();
                   return new ArrayList<STALResponse>();
                 }
+              } catch (TranslationException ex) {
+                log.error(ex.getMessage() + ", send QUIT");
+                requests.clear();
+                QuitRequestType reqT = of.createQuitRequestType();
+                JAXBElement<QuitRequestType> req = of.createGetNextRequestResponseTypeQuitRequest(reqT);
+                requests.add(req);
+                log.trace("notifying request consumers");
+                requests.notify();
+                return new ArrayList<STALResponse>();
+              }
             }
+              
+
+//                if (stalRequest instanceof SignRequest) {
+//                  log.trace("Received SignRequest, keep HashDataInput.");
+//                  SignRequestType reqT = of.createSignRequestType();
+//                  reqT.setKeyIdentifier(((SignRequest) stalRequest).getKeyIdentifier());
+//                  reqT.setSignedInfo(((SignRequest) stalRequest).getSignedInfo());
+//                  JAXBElement<SignRequestType> req = of.createGetNextRequestResponseTypeSignRequest(reqT);
+//                  requests.add(req);
+//                  //DataObjectHashDataInput with reference caching enabled DataObject
+//                  hashDataInputs.addAll(((SignRequest) stalRequest).getHashDataInput());
+//                  break;
+//                } else if (stalRequest instanceof InfoboxReadRequest) {
+//                  log.trace("Received InfoboxReadRequest");
+//                  InfoboxReadRequestType reqT = new InfoboxReadRequestType();
+//                  reqT.setInfoboxIdentifier(((InfoboxReadRequest) stalRequest).getInfoboxIdentifier());
+//                  reqT.setDomainIdentifier(((InfoboxReadRequest) stalRequest).getDomainIdentifier());
+//                  JAXBElement<InfoboxReadRequestType> req = of.createGetNextRequestResponseTypeInfoboxReadRequest(reqT);
+//                  requests.add(req);
+//                } else if (stalRequest instanceof QuitRequest) {
+//                  log.trace("Received QuitRequest, do not wait for responses.");
+//                  QuitRequestType reqT = of.createQuitRequestType();
+//                  JAXBElement<QuitRequestType> req = of.createGetNextRequestResponseTypeQuitRequest(reqT);
+//                  requests.add(req);
+//                  log.trace("notifying request consumers");
+//                  requests.notify();
+//                  return new ArrayList<STALResponse>();
+//                } else {
+//                  log.error("Received unsupported STAL request: " + stalRequest.getClass().getName() + ", send QUIT");
+//                  requests.clear();
+//                  QuitRequestType reqT = of.createQuitRequestType();
+//                  JAXBElement<QuitRequestType> req = of.createGetNextRequestResponseTypeQuitRequest(reqT);
+//                  requests.add(req);
+//                  log.trace("notifying request consumers");
+//                  requests.notify();
+//                  return new ArrayList<STALResponse>();
+//                }
+//            }
             log.trace("notifying request consumers");
             requests.notify();
           }
@@ -150,12 +181,24 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
                 }
             }
             log.trace("consuming responses");
-            List<STALResponse> resps = STALTranslator.toSTAL(responses);
+            List<STALResponse> stalResponses = new ArrayList<STALResponse>();
+            try {
+              for (JAXBElement<? extends ResponseType> resp : responses) {
+                  STALResponse stalResp = translator.translate(resp);
+                  stalResponses.add(stalResp);
+              }
+            } catch (TranslationException ex) {
+              log.error(ex.getMessage() + ", return ErrorResponse (4000)");
+              ErrorResponse stalResp = new ErrorResponse(4000);
+              stalResp.setErrorMessage(ex.getMessage());
+              stalResponses = Collections.singletonList((STALResponse) stalResp);
+            }
+
             responses.clear();
             log.trace("notifying response producers");
             responses.notify();
 
-            return resps;
+            return stalResponses;
           }
         } catch (InterruptedException ex) {
             log.warn("interrupt in handleRequest(): " + ex.getMessage());
@@ -277,8 +320,8 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
     }
 
     private List<JAXBElement<? extends RequestType>> createSingleQuitRequest() {
-      QuitRequestType quitT = stalObjFactory.createQuitRequestType();
-      JAXBElement<QuitRequestType> quit = stalObjFactory.createGetNextRequestResponseTypeQuitRequest(quitT);
+      QuitRequestType quitT = of.createQuitRequestType();
+      JAXBElement<QuitRequestType> quit = of.createGetNextRequestResponseTypeQuitRequest(quitT);
       ArrayList<JAXBElement<? extends RequestType>> l = new ArrayList<JAXBElement<? extends RequestType>>();
       l.add(quit);
       return l;
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
index 45629869..afeba9cb 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
@@ -147,8 +147,8 @@ public class STALServiceImpl implements STALPortType {
       sb.append("] containing ");
       sb.append(responsesIn.size());
       sb.append(" responses: ");
-      for (Object respIn : responsesIn) {
-        sb.append(respIn.getClass());
+      for (JAXBElement<? extends ResponseType> respIn : responsesIn) {
+        sb.append(respIn.getValue().getClass());
         sb.append(' ');
       }
       log.debug(sb.toString());
diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/translator/STALTranslator.java b/STALService/src/main/java/at/gv/egiz/stal/service/translator/STALTranslator.java
new file mode 100644
index 00000000..c4a3d62e
--- /dev/null
+++ b/STALService/src/main/java/at/gv/egiz/stal/service/translator/STALTranslator.java
@@ -0,0 +1,274 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.stal.service.translator;
+
+import at.gv.egiz.stal.ErrorResponse;
+import at.gv.egiz.stal.InfoboxReadRequest;
+import at.gv.egiz.stal.InfoboxReadResponse;
+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.SignResponse;
+import at.gv.egiz.stal.service.types.ErrorResponseType;
+import at.gv.egiz.stal.service.types.InfoboxReadRequestType;
+import at.gv.egiz.stal.service.types.InfoboxReadResponseType;
+import at.gv.egiz.stal.service.types.ObjectFactory;
+import at.gv.egiz.stal.service.types.QuitRequestType;
+import at.gv.egiz.stal.service.types.RequestType;
+import at.gv.egiz.stal.service.types.ResponseType;
+import at.gv.egiz.stal.service.types.SignRequestType;
+import at.gv.egiz.stal.service.types.SignResponseType;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.xml.bind.JAXBElement;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class STALTranslator {
+
+  private static final Log log = LogFactory.getLog(STALTranslator.class);
+  protected Map<Class, TranslationHandler> handlerMap = new HashMap<Class, TranslationHandler>();
+
+  public STALTranslator() {
+    registerTranslationHandler(new DefaultTranslationHandler());
+  }
+
+  /**
+   * overwrites previously registered handlers for the same type
+   * @param handler
+   */
+  public void registerTranslationHandler(TranslationHandler handler) {
+    for (Class t : handler.getSupportedTypes()) {
+      if (log.isDebugEnabled()) {
+        log.debug("register " + t + " with translation handler " + handler.getClass());
+      }
+      handlerMap.put(t, handler);
+    }
+  }
+
+  /**
+   * Translate a STAL request to a STAL Webservice request.
+   * @param request
+   * @return
+   * @throws at.gv.egiz.stal.service.translator.TranslationException
+   */
+  public JAXBElement<? extends RequestType> translate(STALRequest request) throws TranslationException {
+    if (handlerMap.containsKey(request.getClass())) {
+      TranslationHandler handler = handlerMap.get(request.getClass());
+      JAXBElement<? extends RequestType> r = handler.translate(request);
+      if (r != null) {
+        return r;
+      }
+    }
+    log.error("unknown STAL request type " + request.getClass());
+    throw new TranslationException(request.getClass());
+  }
+
+  /**
+   * Translate a STAL Webservice request to a STAL request.
+   * @param request
+   * @return
+   * @throws at.gv.egiz.stal.service.translator.TranslationException
+   */
+  public STALRequest translate(JAXBElement<? extends RequestType> request) throws TranslationException {
+    RequestType req = request.getValue();
+    if (req == null) {
+      throw new RuntimeException("RequestType must not be null");
+    }
+    if (handlerMap.containsKey(req.getClass())) {
+      TranslationHandler handler = handlerMap.get(req.getClass());
+      STALRequest stalRequest = handler.translate(req);
+      if (stalRequest != null) {
+        return stalRequest;
+      }
+    }
+    log.error("unknown request type " + req.getClass());
+    throw new TranslationException(req.getClass());
+  }
+
+  /**
+   * Translate a STAL response to a STAL Webservice response.
+   * @param request
+   * @return
+   * @throws at.gv.egiz.stal.service.translator.TranslationException
+   */
+  public JAXBElement<? extends ResponseType> translate(STALResponse response) throws TranslationException {
+    if (handlerMap.containsKey(response.getClass())) {
+      TranslationHandler handler = handlerMap.get(response.getClass());
+      JAXBElement<? extends ResponseType> r = handler.translate(response);
+      if (r != null) {
+        return r;
+      }
+    }
+    log.error("unknown STAL response type " + response.getClass());
+    throw new TranslationException(response.getClass());
+  }
+
+  /**
+   * Translate a STAL Webservice response to a STAL response.
+   * @param request
+   * @return
+   * @throws at.gv.egiz.stal.service.translator.TranslationException
+   */
+  public STALResponse translate(JAXBElement<? extends ResponseType> response) throws TranslationException {
+    ResponseType resp = response.getValue();
+    if (resp == null) {
+      throw new RuntimeException("ResponseType must not be null");
+    }
+    if (handlerMap.containsKey(resp.getClass())) {
+      TranslationHandler handler = handlerMap.get(resp.getClass());
+      STALResponse stalResponse = handler.translate(resp);
+      if (stalResponse != null) {
+        return stalResponse;
+      }
+    }
+    log.error("unknown response type " + resp.getClass());
+    throw new TranslationException(resp.getClass());
+  }
+
+  /**
+   * public (static) interface implemented by STAL extensions
+   */
+  public static interface TranslationHandler {
+
+    List<Class> getSupportedTypes();
+
+    JAXBElement<? extends RequestType> translate(STALRequest request) throws TranslationException;
+
+    STALRequest translate(RequestType request) throws TranslationException;
+
+    JAXBElement<? extends ResponseType> translate(STALResponse response) throws TranslationException;
+
+    STALResponse translate(ResponseType response) throws TranslationException;
+  }
+
+
+  /**
+   * Default Handler 
+   */
+  protected static class DefaultTranslationHandler implements TranslationHandler {
+
+    private static final Log log = LogFactory.getLog(DefaultTranslationHandler.class);
+    private ObjectFactory of;
+
+    public DefaultTranslationHandler() {
+      of = new ObjectFactory();
+    }
+
+    @Override
+    public List<Class> getSupportedTypes() {
+//      log.warn(" *** Fake STALTranslator ***");
+      return Arrays.asList(new Class[]{InfoboxReadRequest.class,
+                SignRequest.class,
+                QuitRequest.class,
+                InfoboxReadRequestType.class,
+                SignRequestType.class,
+                QuitRequestType.class,
+                InfoboxReadResponse.class,
+                SignResponse.class,
+                ErrorResponse.class,
+                InfoboxReadResponseType.class,
+                SignResponseType.class,
+                ErrorResponseType.class
+      });
+    }
+
+    @Override
+    public JAXBElement<? extends RequestType> translate(STALRequest request) throws TranslationException {
+      log.trace("translate " + request.getClass());
+      if (request instanceof SignRequest) {
+        SignRequestType req = of.createSignRequestType();
+        req.setKeyIdentifier(((SignRequest) request).getKeyIdentifier());
+        req.setSignedInfo(((SignRequest) request).getSignedInfo());
+        //TODO add hashdatainput (refactor signRequestType)
+        return of.createGetNextRequestResponseTypeSignRequest(req);
+      } else if (request instanceof InfoboxReadRequest) {
+        InfoboxReadRequestType req = of.createInfoboxReadRequestType();
+        req.setInfoboxIdentifier(((InfoboxReadRequest) request).getInfoboxIdentifier());
+        req.setDomainIdentifier(((InfoboxReadRequest) request).getDomainIdentifier());
+        return of.createGetNextRequestResponseTypeInfoboxReadRequest(req);
+      } else if (request instanceof QuitRequest) {
+        return of.createGetNextRequestResponseTypeQuitRequest(of.createQuitRequestType());
+      }
+      throw new TranslationException(request.getClass());
+    }
+
+    @Override
+    public STALRequest translate(RequestType request) throws TranslationException {
+      if (request instanceof InfoboxReadRequestType) {
+        InfoboxReadRequest stalReq = new InfoboxReadRequest();
+        stalReq.setDomainIdentifier(((InfoboxReadRequestType) request).getDomainIdentifier());
+        stalReq.setInfoboxIdentifier(((InfoboxReadRequestType) request).getInfoboxIdentifier());
+        return stalReq;
+      } else if (request instanceof SignRequestType) {
+        SignRequest stalReq = new SignRequest();
+        stalReq.setKeyIdentifier(((SignRequestType) request).getKeyIdentifier());
+        stalReq.setSignedInfo(((SignRequestType) request).getSignedInfo());
+        return stalReq;
+      } else if (request instanceof QuitRequestType) {
+        return new QuitRequest();
+      }
+      throw new TranslationException(request.getClass());
+    }
+
+    @Override
+    public JAXBElement<? extends ResponseType> translate(STALResponse response) throws TranslationException {
+      if (response instanceof InfoboxReadResponse) {
+        InfoboxReadResponseType resp = of.createInfoboxReadResponseType();
+        resp.setInfoboxValue(((InfoboxReadResponse) response).getInfoboxValue());
+        return of.createGetNextRequestTypeInfoboxReadResponse(resp);
+      } else if (response instanceof SignResponse) {
+        SignResponseType resp = of.createSignResponseType();
+        resp.setSignatureValue(((SignResponse) response).getSignatureValue());
+        return of.createGetNextRequestTypeSignResponse(resp);
+      } else if (response instanceof ErrorResponse) {
+        ErrorResponseType resp = of.createErrorResponseType();
+        resp.setErrorCode(((ErrorResponse) response).getErrorCode());
+        resp.setErrorMessage(((ErrorResponse) response).getErrorMessage());
+        return of.createGetNextRequestTypeErrorResponse(resp);
+      }
+      throw new TranslationException(response.getClass());
+    }
+
+    @Override
+    public STALResponse translate(ResponseType response) throws TranslationException {
+      if (response instanceof InfoboxReadResponseType) {
+        InfoboxReadResponse stalResp = new InfoboxReadResponse();
+        stalResp.setInfoboxValue(((InfoboxReadResponseType) response).getInfoboxValue());
+        return stalResp;
+      } else if (response instanceof SignResponseType) {
+        SignResponse stalResp = new SignResponse();
+        stalResp.setSignatureValue(((SignResponseType) response).getSignatureValue());
+        return stalResp;
+      } else if (response instanceof ErrorResponseType) {
+        ErrorResponse stalResp = new ErrorResponse();
+        stalResp.setErrorCode(((ErrorResponseType) response).getErrorCode());
+        stalResp.setErrorMessage(((ErrorResponseType) response).getErrorMessage());
+        return stalResp;
+      }
+      throw new TranslationException(response.getClass());
+    }
+  }
+}
+
diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/translator/TranslationException.java b/STALService/src/main/java/at/gv/egiz/stal/service/translator/TranslationException.java
new file mode 100644
index 00000000..fd9da988
--- /dev/null
+++ b/STALService/src/main/java/at/gv/egiz/stal/service/translator/TranslationException.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.stal.service.translator;
+
+/**
+ * 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class TranslationException extends Exception {
+
+  private Class unknownClass;
+
+  /**
+   * Creates a new instance of <code>TranslationException</code> without detail message.
+   * @param unknownClass the class that could not be translated
+   */
+  public TranslationException(Class unkownClass) {
+    this.unknownClass = unkownClass;
+  }
+
+  @Override
+  public String getMessage() {
+    return "Failed to translate type " + unknownClass;
+  }
+
+
+
+}
diff --git a/STALService/src/main/java/at/gv/egiz/stal/util/STALTranslator.java b/STALService/src/main/java/at/gv/egiz/stal/util/STALTranslator.java
deleted file mode 100644
index 6bbd7301..00000000
--- a/STALService/src/main/java/at/gv/egiz/stal/util/STALTranslator.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package at.gv.egiz.stal.util;
-
-import at.gv.egiz.stal.ErrorResponse;
-import at.gv.egiz.stal.InfoboxReadRequest;
-import at.gv.egiz.stal.InfoboxReadResponse;
-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.SignResponse;
-import at.gv.egiz.stal.service.types.*;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- *
- * @author clemens
- */
-public class STALTranslator {
-
-  protected static final Log log = LogFactory.getLog(STALTranslator.class);
-
-  public static List<STALRequest> translateRequests(List<JAXBElement<? extends RequestType>> requests) {
-    List<STALRequest> stalRequests = new ArrayList<STALRequest>(requests.size());
-    for (JAXBElement<? extends RequestType> requestElt : requests) {
-      RequestType request = requestElt.getValue();
-      if (request instanceof InfoboxReadRequestType) {
-        InfoboxReadRequest stalReq = new InfoboxReadRequest();
-        stalReq.setDomainIdentifier(((InfoboxReadRequestType) request).getDomainIdentifier());
-        stalReq.setInfoboxIdentifier(((InfoboxReadRequestType) request).getInfoboxIdentifier());
-        stalRequests.add(stalReq);
-      } else if (request instanceof SignRequestType) {
-        SignRequest stalReq = new SignRequest();
-        stalReq.setKeyIdentifier(((SignRequestType) request).getKeyIdentifier());
-        stalReq.setSignedInfo(((SignRequestType) request).getSignedInfo());
-        stalRequests.add(stalReq);
-      } else if (request instanceof QuitRequestType) {
-        stalRequests.add(new QuitRequest());
-      } else {
-        log.error("unknown STALService request type: " + request.getClass());
-        stalRequests = Collections.singletonList((STALRequest) new QuitRequest());
-        break;
-      }
-    }
-    return stalRequests;
-  }
-
-  public static List<JAXBElement<? extends ResponseType>> fromSTAL(List<STALResponse> stalResponses) {
-    ObjectFactory stalObjFactory = new ObjectFactory();
-    List<JAXBElement<? extends ResponseType>> responses = new ArrayList<JAXBElement<? extends ResponseType>>(stalResponses.size());
-    for (STALResponse stalResp : stalResponses) {
-      if (stalResp instanceof InfoboxReadResponse) {
-        InfoboxReadResponseType resp = stalObjFactory.createInfoboxReadResponseType();
-        resp.setInfoboxValue(((InfoboxReadResponse) stalResp).getInfoboxValue());
-        responses.add(stalObjFactory.createGetNextRequestTypeInfoboxReadResponse(resp));
-      } else if (stalResp instanceof SignResponse) {
-        SignResponseType resp = stalObjFactory.createSignResponseType();
-        resp.setSignatureValue(((SignResponse) stalResp).getSignatureValue());
-        responses.add(stalObjFactory.createGetNextRequestTypeSignResponse(resp));
-      } else if (stalResp instanceof ErrorResponse) {
-        ErrorResponseType resp = stalObjFactory.createErrorResponseType();
-        resp.setErrorCode(((ErrorResponse) stalResp).getErrorCode());
-        resp.setErrorMessage(((ErrorResponse) stalResp).getErrorMessage());
-        responses.add(stalObjFactory.createGetNextRequestTypeErrorResponse(resp));
-      } else {
-        log.error("unknown STAL response type: " + stalResp.getClass());
-        ErrorResponseType resp = stalObjFactory.createErrorResponseType();
-        resp.setErrorCode(4000);
-        resp.setErrorMessage("unknown STAL response type: " + stalResp.getClass());
-        responses.clear();
-        responses.add(stalObjFactory.createGetNextRequestTypeErrorResponse(resp));
-        break;
-      }
-    }
-    return responses;
-  }
-  
-  public static List<STALResponse> toSTAL(List<JAXBElement<? extends ResponseType>> responses) {
-    List<STALResponse> stalResponses = new ArrayList<STALResponse>(responses.size());
-    for (JAXBElement<? extends ResponseType> respElt : responses) {
-      ResponseType resp = respElt.getValue();
-      if (resp instanceof InfoboxReadResponseType) {
-        InfoboxReadResponse stalResp = new InfoboxReadResponse();
-        stalResp.setInfoboxValue(((InfoboxReadResponseType) resp).getInfoboxValue());
-        stalResponses.add(stalResp);
-      } else if (resp instanceof SignResponseType) {
-        SignResponse stalResp = new SignResponse();
-        stalResp.setSignatureValue(((SignResponseType) resp).getSignatureValue());
-        stalResponses.add(stalResp);
-      } else if (resp instanceof ErrorResponseType) {
-        ErrorResponse stalResp = new ErrorResponse();
-        stalResp.setErrorCode(((ErrorResponseType) resp).getErrorCode());
-        stalResp.setErrorMessage(((ErrorResponseType) resp).getErrorMessage());
-        stalResponses.add(stalResp);
-      } else {
-        log.error("unknown STALService response type: " + resp.getClass());
-        ErrorResponse stalResp = new ErrorResponse(); 
-        stalResp.setErrorCode(4000);
-        stalResp.setErrorMessage("unknown STALService response type: " + resp.getClass());
-        stalResponses = Collections.singletonList((STALResponse) stalResp);
-        break;
-      }
-    }
-    return stalResponses;
-  }
-}
diff --git a/STALService/src/test/java/at/gv/egiz/stal/service/translator/STALTranslatorTest.java b/STALService/src/test/java/at/gv/egiz/stal/service/translator/STALTranslatorTest.java
new file mode 100644
index 00000000..1dad7973
--- /dev/null
+++ b/STALService/src/test/java/at/gv/egiz/stal/service/translator/STALTranslatorTest.java
@@ -0,0 +1,146 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.stal.service.translator;
+
+import at.gv.egiz.stal.STALRequest;
+import at.gv.egiz.stal.STALResponse;
+import at.gv.egiz.stal.SignRequest;
+import at.gv.egiz.stal.service.translator.STALTranslator.TranslationHandler;
+import at.gv.egiz.stal.service.types.ObjectFactory;
+import at.gv.egiz.stal.service.types.RequestType;
+import at.gv.egiz.stal.service.types.ResponseType;
+import at.gv.egiz.stal.service.types.SignRequestType;
+import javax.xml.bind.JAXBElement;
+import javax.xml.namespace.QName;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author clemens
+ */
+public class STALTranslatorTest {
+
+  static ObjectFactory of;
+
+    public STALTranslatorTest() {
+    }
+
+  @BeforeClass
+  public static void setUpClass() throws Exception {
+    of = new ObjectFactory();
+  }
+
+  @AfterClass
+  public static void tearDownClass() throws Exception {
+  }
+
+    @Before
+    public void setUp() {
+    }
+
+    @After
+    public void tearDown() {
+    }
+
+  /**
+   * Test of registerTranslationHandler method, of class STALTranslator.
+   */
+  @Test
+  @Ignore
+  public void testRegisterTranslationHandler() {
+    System.out.println("registerTranslationHandler");
+    TranslationHandler handler = null;
+    STALTranslator instance = new STALTranslator();
+    instance.registerTranslationHandler(handler);
+
+    // TODO review the generated test code and remove the default call to fail.
+    fail("The test case is a prototype.");
+  }
+
+  /**
+   * Test of translate method, of class STALTranslator.
+   */
+  @Test
+  public void testTranslate_STALRequest() throws Exception {
+    System.out.println("translate");
+    SignRequest request = new SignRequest();
+    request.setKeyIdentifier("kid");
+    request.setSignedInfo("signedinfo".getBytes());
+    STALTranslator instance = new STALTranslator();
+    JAXBElement<? extends RequestType> result = instance.translate(request);
+    assertEquals(SignRequestType.class, result.getValue().getClass());
+    SignRequestType resultT = (SignRequestType) result.getValue();
+    assertEquals(request.getKeyIdentifier(), resultT.getKeyIdentifier());
+    assertEquals(request.getSignedInfo(), resultT.getSignedInfo());
+  }
+
+  /**
+   * Test of translate method, of class STALTranslator.
+   */
+  @Test
+  public void testTranslate_1args_1() throws Exception {
+    System.out.println("translate");
+    SignRequestType req = of.createSignRequestType();
+    req.setKeyIdentifier("kid");
+    req.setSignedInfo("signedinfo".getBytes());
+    JAXBElement<? extends RequestType> request = of.createGetNextRequestResponseTypeSignRequest(req);
+    STALTranslator instance = new STALTranslator();
+    STALRequest result = instance.translate(request);
+    assertEquals(SignRequest.class, result.getClass());
+    assertEquals(req.getKeyIdentifier(), ((SignRequest) result).getKeyIdentifier());
+    assertEquals(req.getSignedInfo(), ((SignRequest) result).getSignedInfo());
+  }
+
+  @Test(expected=RuntimeException.class)
+  public void testTranslate_invalidInput() throws Exception {
+    System.out.println("translate");
+    QName n =  new QName("http://www.egiz.gv.at/stal", "SignRequest");
+    JAXBElement<? extends RequestType> request = new JAXBElement<SignRequestType>(n, SignRequestType.class, null);
+    STALTranslator instance = new STALTranslator();
+    STALRequest result = instance.translate(request);
+    assertEquals(SignRequest.class, result.getClass());
+  }
+
+
+  /**
+   * Test of translate method, of class STALTranslator.
+   */
+  @Test
+  @Ignore
+  public void testTranslate_STALResponse() throws Exception {
+    System.out.println("translate");
+    STALResponse response = null;
+    STALTranslator instance = new STALTranslator();
+    JAXBElement<? extends ResponseType> expResult = null;
+    JAXBElement<? extends ResponseType> result = instance.translate(response);
+    assertEquals(expResult, result);
+    // TODO review the generated test code and remove the default call to fail.
+    fail("The test case is a prototype.");
+  }
+
+  /**
+   * Test of translate method, of class STALTranslator.
+   */
+  @Test
+  @Ignore
+  public void testTranslate_1args_2() throws Exception {
+    System.out.println("translate");
+    JAXBElement<? extends ResponseType> response = null;
+    STALTranslator instance = new STALTranslator();
+    STALResponse expResult = null;
+    STALResponse result = instance.translate(response);
+    assertEquals(expResult, result);
+    // TODO review the generated test code and remove the default call to fail.
+    fail("The test case is a prototype.");
+  }
+
+}
\ No newline at end of file
diff --git a/STALService/src/test/resources/commons-logging.properties b/STALService/src/test/resources/commons-logging.properties
new file mode 100644
index 00000000..29292562
--- /dev/null
+++ b/STALService/src/test/resources/commons-logging.properties
@@ -0,0 +1 @@
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
-- 
cgit v1.2.3


From 9ef5d25ffec1c26ccf76ad46131e33a861335da1 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 23 Jan 2009 13:45:39 +0000
Subject: tiny applet

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@286 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |   5 +-
 BKUApplet/src/test/resources/appletTest.html       |  12 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   4 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 140 ++++++++++++++++-----
 .../at/gv/egiz/bku/gui/HashDataTableModel.java     |  21 +++-
 .../java/at/gv/egiz/bku/gui/HyperlinkRenderer.java |  14 ++-
 .../at/gv/egiz/bku/gui/Messages.properties         |   4 +-
 .../at/gv/egiz/bku/gui/Messages_en.properties      |   5 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUITest.java   |   4 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |   6 +-
 10 files changed, 158 insertions(+), 57 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 41dae3ba..5e60ed3e 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -91,8 +91,11 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
     log.debug("setting locale to " + getLocale());
 
     BKUGUIFacade.Style guiStyle;
-    if ("advanced".equals(getAppletParameter(GUI_STYLE))) { 
+    String guiStyleParam = getAppletParameter(GUI_STYLE);
+    if ("advanced".equals(guiStyleParam)) {
       guiStyle = BKUGUIFacade.Style.advanced;
+    } else if ("tiny".equals(guiStyleParam)) {
+      guiStyle = BKUGUIFacade.Style.tiny;
     } else {
       guiStyle = BKUGUIFacade.Style.simple;
     }
diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
index 2bf9ba0c..c8bd99d3 100644
--- a/BKUApplet/src/test/resources/appletTest.html
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -19,15 +19,13 @@
     <center>
       <applet code="at.gv.egiz.bku.online.applet.BKUApplet.class"
               archive="../BKUApplet-1.0.4-SNAPSHOT.jar, ../test-libs/commons-logging-1.1.1.jar , ../test-libs/iaik_jce_me4se-3.04.jar"
-              width=300 height=200>
-              <param name="GuiStyle" value="advanced"/>
-              <param name="Locale" value="en_US"/>
+              width=152 height=145>
+              <param name="GuiStyle" value="tiny"/>
+              <param name="Locale" value="ja_JA"/>
               <!--param name="Background" value="jar:file:/home/clemens/workspace/mocca/BKUApplet/target/BKUApplet-1.0-SNAPSHOT.jar!/images/help.png"/-->
-              <param name="Background" value="http://localhost:3495/img/BackgroundChipperling.png"/>
-              <param name="WSDL_URL" value="http://localhost:3495/stal?wsdl"/>
+              <!--param name="Background" value="http://localhost:3495/img/BackgroundChipperling.png"/-->
+              <param name="WSDL_URL" value="https://danu.gv.at:3496/stal?wsdl"/>
               <param name="HelpURL" value="http://apps.egiz.gv.at/bkuonline/help/"/>
-              <param name="HashDataDisplay" value="frame"/>
-              <!--param name="HashDataURL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/hashDataInput"/-->
               <param name="SessionId" value="TestSession"/>
               <param name="RedirectURL" value="http://localhost:3495/bkuResult"/>
       </applet>
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 5ee0058f..51906616 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -63,9 +63,11 @@ public interface BKUGUIFacade {
   public static final String MESSAGE_INSERTCARD = "message.insertcard";
   public static final String MESSAGE_ENTERPIN = "message.enterpin";
   public static final String MESSAGE_HASHDATALINK = "message.hashdatalink";
+  public static final String MESSAGE_HASHDATALINK_TINY = "message.hashdatalink.tiny";
 //  public static final String MESSAGE_HASHDATA = "message.hashdata";
   public static final String MESSAGE_HASHDATALIST = "message.hashdatalist";
   public static final String MESSAGE_RETRIES = "message.retries";
+  public static final String MESSAGE_LAST_RETRY = "message.retries.last";
   public static final String MESSAGE_OVERWRITE = "message.overwrite";
   public static final String MESSAGE_HELP = "message.help";
   public static final String WARNING_XHTML = "warning.xhtml";
@@ -90,7 +92,7 @@ public interface BKUGUIFacade {
   public static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
   public static final String ALT_HELP = "alt.help";
 
-  public enum Style { simple, advanced };
+  public enum Style { tiny, simple, advanced };
     
 //  public void init(Container contentPane, Locale locale, Style guiStyle, URL background, ActionListener helpListener);
 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index d61c9a03..1e63c8d7 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -53,6 +53,7 @@ import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
+import javax.swing.JTextField;
 import javax.swing.LayoutStyle;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
@@ -69,6 +70,10 @@ public class BKUGUIImpl implements BKUGUIFacade {
     
     private static final Log log = LogFactory.getLog(BKUGUIImpl.class);
 
+    protected enum PinLabelPosition {
+      LEFT, ABOVE
+    }
+
     protected HelpMouseListener helpListener;
     
     protected Container contentPane;
@@ -92,6 +97,9 @@ public class BKUGUIImpl implements BKUGUIFacade {
     protected boolean renderHeaderPanel = false;
     protected boolean renderIconPanel = false;
     protected boolean renderCancelButton = false;
+    protected boolean shortText = false;
+    protected PinLabelPosition pinLabelPos = PinLabelPosition.LEFT;
+    protected boolean renderRefId = false;
 
     /**
      * set contentPane
@@ -125,6 +133,10 @@ public class BKUGUIImpl implements BKUGUIFacade {
         renderHeaderPanel = true;
         renderIconPanel = false;
         renderCancelButton = true;
+        renderRefId = true;
+      } else if (guiStyle == Style.tiny) {
+        shortText = true;
+        pinLabelPos = PinLabelPosition.ABOVE;
       }
 
       registerHelpListener(helpListener);
@@ -537,11 +549,21 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 if (numRetries < 0) {
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                   String infoPattern = messages.getString(MESSAGE_ENTERPIN);
-                  infoLabel.setText(MessageFormat.format(infoPattern, new Object[] {pinSpec.getLocalizedName()}));
+                  if (shortText) {
+                    infoLabel.setText(MessageFormat.format(infoPattern, new Object[] {"PIN"}));
+                  } else {
+                    infoLabel.setText(MessageFormat.format(infoPattern, new Object[] {pinSpec.getLocalizedName()}));
+                  }
                   helpListener.setHelpTopic(HELP_CARDPIN);
                 } else {
+                  String retryPattern;
+                  if (numRetries < 2) {
+                    retryPattern = messages.getString(MESSAGE_LAST_RETRY);
+                  } else {
+                    retryPattern = messages.getString(MESSAGE_RETRIES);
+                  }
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                  infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
+                  infoLabel.setText(MessageFormat.format(retryPattern, new Object[]{String.valueOf(numRetries)}));
                   infoLabel.setForeground(ERROR_COLOR);
                   helpListener.setHelpTopic(HELP_RETRY);
                 }
@@ -570,27 +592,47 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   infoVertical
                           .addComponent(helpLabel);
                 } 
-                
-                mainPanelLayout.setHorizontalGroup(
-                        mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                          .addGroup(infoHorizontal)
+
+                GroupLayout.Group pinHorizontal;
+                GroupLayout.Group pinVertical;
+
+                if (pinLabelPos == PinLabelPosition.ABOVE) {
+                  pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                          .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                          .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                           .addGroup(mainPanelLayout.createSequentialGroup()
-                            .addComponent(cardPinLabel, 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(pinsizeLabel))));
-                mainPanelLayout.setVerticalGroup(
-                        mainPanelLayout.createSequentialGroup()
-                          .addGroup(infoVertical)
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                            .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
+                  pinVertical = mainPanelLayout.createSequentialGroup()
+                          .addComponent(cardPinLabel)
                           .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                            .addComponent(cardPinLabel)
-                            .addComponent(pinField))
+                          .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
+                } else {
+                  pinHorizontal = mainPanelLayout.createSequentialGroup()
+                          .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                           .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                          .addComponent(pinsizeLabel));
-                
-                
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING)
+                            .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                            .addComponent(pinsizeLabel));
+                  pinVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                          .addComponent(cardPinLabel)
+                          .addComponent(pinField);
+                }
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addGroup(infoHorizontal)
+                    .addGroup(pinHorizontal));
+
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createSequentialGroup()
+                    .addGroup(infoVertical)
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addGroup(pinVertical)
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addComponent(pinsizeLabel));
+
+
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
@@ -707,7 +749,11 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 JLabel infoLabel = new JLabel();
                 if (numRetries < 0) {
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                  infoLabel.setText(messages.getString(MESSAGE_HASHDATALINK));
+                  if (shortText) {
+                    infoLabel.setText(messages.getString(MESSAGE_HASHDATALINK_TINY));
+                  } else {
+                    infoLabel.setText(messages.getString(MESSAGE_HASHDATALINK));
+                  }
                   infoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
                   infoLabel.setForeground(HYPERLINK_COLOR);
                   infoLabel.addMouseListener(new MouseAdapter() {
@@ -720,8 +766,14 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   });
                   helpListener.setHelpTopic(HELP_SIGNPIN);
                 } else {
+                  String retryPattern;
+                  if (numRetries < 2) {
+                    retryPattern = messages.getString(MESSAGE_LAST_RETRY);
+                  } else {
+                    retryPattern = messages.getString(MESSAGE_RETRIES);
+                  }
+                  infoLabel.setText(MessageFormat.format(retryPattern, new Object[]{String.valueOf(numRetries)}));
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                  infoLabel.setText(MessageFormat.format(messages.getString(MESSAGE_RETRIES), new Object[]{String.valueOf(numRetries)}));
                   infoLabel.setForeground(ERROR_COLOR);
                   helpListener.setHelpTopic(HELP_RETRY);
                 }
@@ -737,28 +789,48 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 if (!renderHeaderPanel) {
                   infoHorizontal
                           .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel); //, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
+                          .addComponent(helpLabel);
                   infoVertical
                           .addComponent(helpLabel);
                 }
 
+                GroupLayout.Group pinHorizontal;
+                GroupLayout.Group pinVertical;
+
+                if (pinLabelPos == PinLabelPosition.ABOVE) {
+                  pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                          .addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                          .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                            .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
+                          
+                  pinVertical = mainPanelLayout.createSequentialGroup()
+                          .addComponent(signPinLabel)
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
+                } else {
+                  pinHorizontal = 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(pinsizeLabel));
+                  pinVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                          .addComponent(signPinLabel)
+                          .addComponent(pinField);
+                }
+
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                     .addGroup(infoHorizontal)
-                    .addGroup(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(pinsizeLabel))));
+                    .addGroup(pinHorizontal));
 
                 mainPanelLayout.setVerticalGroup(
                   mainPanelLayout.createSequentialGroup()
                     .addGroup(infoVertical)
                     .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                        .addComponent(signPinLabel)
-                        .addComponent(pinField))
+                    .addGroup(pinVertical)
                     .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                     .addComponent(pinsizeLabel));
 
@@ -1084,9 +1156,9 @@ public class BKUGUIImpl implements BKUGUIFacade {
           String refIdLabelPattern = messages.getString(MESSAGE_HASHDATALIST);
           refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{signedReferences.size()}));
 
-          HashDataTableModel tableModel = new HashDataTableModel(signedReferences);
+          HashDataTableModel tableModel = new HashDataTableModel(signedReferences, renderRefId);
           final JTable hashDataTable = new JTable(tableModel);
-          hashDataTable.setDefaultRenderer(HashDataInput.class, new HyperlinkRenderer());
+          hashDataTable.setDefaultRenderer(HashDataInput.class, new HyperlinkRenderer(renderRefId));
           hashDataTable.setTableHeader(null);
           
           // not possible to add mouse listener to TableCellRenderer
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
index b0f51a78..70842102 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java
@@ -31,14 +31,23 @@ class HashDataTableModel extends DefaultTableModel {
   protected static final Log log = LogFactory.getLog(HashDataTableModel.class);
   
   /** HashDataInput in first column, register hyperlinkrenderer only here */
-  protected Class[] types = new Class[]{ HashDataInput.class, String.class };
+  protected Class[] types;
   protected List<HashDataInput> hashDataInputs;
-  
-  public HashDataTableModel(List<HashDataInput> hashDataInputs) {
-    super(0, 2);
+
+  public HashDataTableModel(List<HashDataInput> hashDataInputs, boolean twoColLayout) {
+    super(0, (twoColLayout) ? 2 : 1);
     this.hashDataInputs = hashDataInputs;
-    for (HashDataInput hdi : hashDataInputs) {
-      addRow(new Object[]{ hdi, hdi.getMimeType()});
+
+    if (twoColLayout) {
+      types = new Class[] { HashDataInput.class, String.class };
+      for (HashDataInput hdi : hashDataInputs) {
+        addRow(new Object[] { hdi, hdi.getMimeType() });
+      }
+    } else {
+      types = new Class[] { HashDataInput.class };
+      for (HashDataInput hdi : hashDataInputs) {
+        addRow(new Object[] { hdi });
+      }
     }
   }
 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java
index f983706e..16024fcc 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java
@@ -26,13 +26,25 @@ import javax.swing.table.DefaultTableCellRenderer;
  */
 public class HyperlinkRenderer extends DefaultTableCellRenderer {
 
+  protected boolean renderReferenceId;
+
+  public HyperlinkRenderer(boolean renderReferenceId) {
+    this.renderReferenceId = renderReferenceId;
+  }
+
   /**
    * cannot change mouse cursor here, do in jTable
    * @param value
    */
   @Override
   protected void setValue(Object value) {
-    super.setText("<html><u>" + ((HashDataInput) value).getReferenceId() + "</u></html>");
+    String hrefText;
+    if (renderReferenceId) {
+      hrefText = ((HashDataInput) value).getReferenceId();
+    } else {
+      hrefText = ((HashDataInput) value).getMimeType();
+    }
+    super.setText("<html><u>" + hrefText + "</u></html>");
     setForeground(BKUGUIFacade.HYPERLINK_COLOR);
   }
 }
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index d2b47a9d..4562fda5 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -32,11 +32,13 @@ message.wait=<html>Bitte warten...</html>
 message.insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
 message.enterpin=<html>{0} eingeben</html>
 message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
+message.hashdatalink.tiny=<html><a href=\"anzeige\">Signaturdaten</a></html>
 #message.hashdata=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
 #message.hashdata=<html>Dies ist eine Voransicht des zu signierenden Inhaltes. F\u00FCr Details siehe Hilfe (i).</html> 
 #verwenden sie bitte die von ihrem System zur Verf\u00FCgung gestellte {0} Anwendung. 
 message.hashdatalist=<html>{0} Signaturdaten:</html>
-message.retries=<html>Noch {0} Versuch(e)</html>
+message.retries.last=<html>Letzter Versuch!</html>
+message.retries=<html>Noch {0} Versuche</html>
 message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
 message.help=<html>Hilfe zu {0}</html>
 warning.xhtml=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index 524a2a98..0faa3dba 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -32,8 +32,10 @@ message.wait=<html>Please wait...</html>
 message.insertcard=<html>Please insert your citizen card into the reader</html>
 message.enterpin=<html>Enter {0}</html>
 message.hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
+message.hashdatalink.tiny=<html><a href=\"anzeige\">signature data</a></html>
 #message.hashdata=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
 message.hashdatalist=<html>{0} signature data objects:</html>
+message.retries.last=<html>Last try!</html>
 message.retries=<html>{0} tries left</html>
 message.overwrite=<html>Overwrite {0}?</html>
 message.help=<html>Help topic {0}</html>
@@ -60,7 +62,8 @@ error.no.hashdata=<html>No signature data available: {0}</html>
 error.display.hashdata=<html>Could not display signature data: {0}</html>
 error.write.hashdata=<html>Could not save signature data: {0}</html>
 error.invalid.hash=<html>Invalid signature data: {0}</html>
-error.ws.unreachable=<html>Web-service unreachable: {0}</html>
+error.ws.unreachable=<html>Server unreachable</html>
+#error.ws.unreachable=<html>Web-service unreachable: {0}</html>
 error.pcsc=<html>No PC/SC interface for smartcard access provided</html>
 error.cardterminal=<html>Could not find smartcard reader</html>
 error.unknown=<html>An error occured: {0}</html>
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index bc4bdb97..d413f812 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -39,8 +39,8 @@ public class BKUGUITest {
     public void testBKUGUI() {
         JFrame testFrame = new JFrame("BKUGUITest");
         Container contentPane = testFrame.getContentPane();
-        contentPane.setPreferredSize(new Dimension(190, 130));
-        BKUGUIFacade gui = BKUGUIFactory.createGUI(contentPane, null, BKUGUIFacade.Style.simple, null, null);
+        contentPane.setPreferredSize(new Dimension(170, 150));
+        BKUGUIFacade gui = BKUGUIFactory.createGUI(contentPane, null, BKUGUIFacade.Style.tiny, null, null);
         BKUGUIWorker worker = new BKUGUIWorker();
         worker.init(gui);
         testFrame.pack();
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 4d97f9fb..73aaab46 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
@@ -142,17 +142,17 @@ public class BKUGUIWorker implements Runnable {
 //            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(4000);
 //
 
-    gui.showErrorDialog(BKUGUIFacade.ERR_NO_PCSC, null, null, null);
+//            gui.showErrorDialog(BKUGUIFacade.ERR_NO_PCSC, null, null, null);
     
 //            gui.showSignaturePINRetryDialog(signPinSpec, 2, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
 //
-- 
cgit v1.2.3


From bd34234d256ef1f81c6daba2de33ed68ccc790f1 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 23 Jan 2009 14:04:04 +0000
Subject: [maven-release-plugin] prepare release mocca-1.0.4-fon

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@287 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 14 files changed, 64 insertions(+), 64 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 4491ff3a..cfae6716 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.0.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.4-SNAPSHOT</version>
+  <version>1.0.4</version>
   <build>
     <plugins>
       <plugin>
@@ -110,27 +110,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
+      <version>1.0.4</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
+      <version>1.0.4</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
+      <version>1.0.4</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
+      <version>1.0.4</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
+      <version>1.0.4</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 32d39042..9088a711 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.4-SNAPSHOT</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.0.4</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
+            <version>1.0.4</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
+            <version>1.0.4</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 0572fcb2..8b5fe405 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.4-SNAPSHOT</version>
+		<version>1.0.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.1</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.4</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index ac56c906..0e552bf0 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.4-SNAPSHOT</version>
+		<version>1.0.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.1</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index c5c77546..18c5d122 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.4-SNAPSHOT</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.0.4</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
+            <version>1.0.4</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
+            <version>1.0.4</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
+            <version>1.0.4</version>
             <scope>compile</scope>
         </dependency>
 		<!-- build BKUApplet prior to BKUOnline -->
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
+            <version>1.0.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
+            <version>1.0.4</version>
         </dependency>
         <!-- TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
          |   so that BKUOnline does not have to depend on STALXService
@@ -107,9 +107,9 @@
         <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
     </properties>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 7e5fd256..3a691de1 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.4-SNAPSHOT</version>
+		<version>1.0.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.4</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index f7214f04..850a69ec 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.4-SNAPSHOT</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.0.4</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index bbf6697a..5730a567 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.0.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.0.4-SNAPSHOT</version>
+  <version>1.0.1</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
+      <version>1.0.4</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 72f22b0e..a602d68c 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.4-SNAPSHOT</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.0.4</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
+            <version>1.0.4</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 71070e7b..7ecda857 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.4-SNAPSHOT</version>
+		<version>1.0.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.4</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 53013b02..62d8d4ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.4</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -39,9 +39,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index f19f178f..c10e9533 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.0.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.4-SNAPSHOT</version>
+  <version>1.0.4</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 96ed97b2..7ebd7c93 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.4-SNAPSHOT</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.0.4</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
+            <version>1.0.4</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
+            <version>1.0.4</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
+            <version>1.0.4</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 55a8aef9..7108f689 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.4-SNAPSHOT</version>
+		<version>1.0.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.4</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From eeacc400e7186429ebea0f718b076d8b9861c58e Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 23 Jan 2009 14:05:18 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@289 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 20 ++++++++++----------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 14 files changed, 64 insertions(+), 64 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index cfae6716..3b115399 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.4</version>
+  <version>1.0.5-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -110,27 +110,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.4</version>
+      <version>1.0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.4</version>
+      <version>1.0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.4</version>
+      <version>1.0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.4</version>
+      <version>1.0.5-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.4</version>
+      <version>1.0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 9088a711..47cd7545 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.4</version>
+        <version>1.0.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 8b5fe405..0f5757b8 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.4</version>
+		<version>1.0.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.1</version>
+	<version>1.0.4-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.5-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index 0e552bf0..52bc4e36 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.4</version>
+		<version>1.0.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz.bku</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.1</version>
+	<version>1.0.4-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.4-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.4</version>
+			<version>1.0.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 18c5d122..c82cfc1e 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.4</version>
+        <version>1.0.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,20 +53,20 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 		<!-- build BKUApplet prior to BKUOnline -->
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.5-SNAPSHOT</version>
         </dependency>
         <!-- TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
          |   so that BKUOnline does not have to depend on STALXService
@@ -107,9 +107,9 @@
         <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
     </properties>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 3a691de1..d82d1adc 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.4</version>
+		<version>1.0.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.4</version>
+	<version>1.0.5-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 850a69ec..81d5352f 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.4</version>
+        <version>1.0.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 5730a567..90e051cf 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.0.1</version>
+  <version>1.0.4-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.4</version>
+      <version>1.0.5-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index a602d68c..a341d292 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.4</version>
+        <version>1.0.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.5-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 7ecda857..79516b1d 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.4</version>
+		<version>1.0.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.4</version>
+	<version>1.0.5-SNAPSHOT</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 62d8d4ec..9db504a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.4</version>
+	<version>1.0.5-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -39,9 +39,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.4-fon</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index c10e9533..59128c43 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.4</version>
+  <version>1.0.5-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 7ebd7c93..02e80632 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.4</version>
+        <version>1.0.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.4</version>
+    <version>1.0.5-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 7108f689..d9620dca 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.4</version>
+		<version>1.0.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.4</version>
+	<version>1.0.5-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From ff9a71fe2a2beb94ad7aa52ba2c77a24dd39509e Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 11 Feb 2009 20:04:58 +0000
Subject: removed BKUGUIFactory

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@297 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |  1 +
 .../java/at/gv/egiz/bku/gui/BKUGUIFactory.java     | 34 ----------------------
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   |  4 +--
 .../at/gv/egiz/bku/gui/Messages.properties         |  3 +-
 .../at/gv/egiz/bku/gui/Messages_en.properties      |  3 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUITest.java   |  2 +-
 6 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 51906616..6fd29ba9 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -25,6 +25,7 @@ import java.util.Locale;
 
 public interface BKUGUIFacade {
 
+  public static final String ERR_UNKNOWN_WITH_PARAM = "error.unknown.param";
   public static final String ERR_UNKNOWN = "error.unknown";
   public static final String ERR_SERVICE_UNREACHABLE = "error.ws.unreachable";
   public static final String ERR_NO_PCSC = "error.pcsc";
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
deleted file mode 100644
index 998aaa86..00000000
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* 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.
-*/
-
-package at.gv.egiz.bku.gui;
-
-import java.awt.Container;
-import java.awt.event.ActionListener;
-import java.net.URL;
-import java.util.Locale;
-
-public class BKUGUIFactory {
-  
-  public static BKUGUIFacade createGUI(Container contentPane, 
-          Locale locale, 
-          BKUGUIFacade.Style style, 
-          URL background, 
-          ActionListener helpListener) {
-    return new BKUGUIImpl(contentPane, locale, style, background, helpListener);
-  }
-}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 1e63c8d7..f564c07a 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -19,14 +19,12 @@ package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.stal.HashDataInput;
-import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
 import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionAdapter;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -68,7 +66,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class BKUGUIImpl implements BKUGUIFacade {
     
-    private static final Log log = LogFactory.getLog(BKUGUIImpl.class);
+    protected static final Log log = LogFactory.getLog(BKUGUIImpl.class);
 
     protected enum PinLabelPosition {
       LEFT, ABOVE
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 4562fda5..8436a730 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -68,7 +68,8 @@ error.ws.unreachable=<html>Der Server ist nicht erreichbar</html>
 #error.ws.unreachable=<html>Das Web-Service ist nicht erreichbar: {0}</html>
 error.pcsc=<html>Es konnte keine PC/SC Schnittstelle gefunden werden</html>
 error.cardterminal=<html>Es konnte kein Smartcard-Leser gefunden werden</html>
-error.unknown=<html>Leider trat ein Fehler auf: {0}</html>
+error.unknown.param=<html>Ein Fehler trat auf: {0}</html>
+error.unknown=<html>Ein Fehler trat auf</html>
 error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
 error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
 error.card.notactivated=<html>B\u00FCrgerkartenfunktion ist nicht aktiviert</html>
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index 0faa3dba..4fbccd5b 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -66,7 +66,8 @@ error.ws.unreachable=<html>Server unreachable</html>
 #error.ws.unreachable=<html>Web-service unreachable: {0}</html>
 error.pcsc=<html>No PC/SC interface for smartcard access provided</html>
 error.cardterminal=<html>Could not find smartcard reader</html>
-error.unknown=<html>An error occured: {0}</html>
+error.unknown.param=<html>An error occured: {0}</html>
+error.unknown=<html>An error occured</html>
 error.test=<html>Error1 {0} - Error2 {1}</html>
 error.card.locked=<html>Citizen card is locked</html>
 error.card.notactivated=<html>Citizen card not activated</html>
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index d413f812..c8cff617 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -40,7 +40,7 @@ public class BKUGUITest {
         JFrame testFrame = new JFrame("BKUGUITest");
         Container contentPane = testFrame.getContentPane();
         contentPane.setPreferredSize(new Dimension(170, 150));
-        BKUGUIFacade gui = BKUGUIFactory.createGUI(contentPane, null, BKUGUIFacade.Style.tiny, null, null);
+        BKUGUIFacade gui = new BKUGUIImpl(contentPane, null, BKUGUIFacade.Style.tiny, null, null);
         BKUGUIWorker worker = new BKUGUIWorker();
         worker.init(gui);
         testFrame.pack();
-- 
cgit v1.2.3


From 6576428966f1e3d688269a407b072fb01f9f7647 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 26 Feb 2009 19:39:00 +0000
Subject: 1.1 candidate (activation)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@309 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../gv/egiz/bku/online/applet/AppletBKUWorker.java |    9 +-
 .../java/at/gv/egiz/bku/gui/PINManagementGUI.java  |  519 ++++-
 .../at/gv/egiz/bku/gui/PINManagementGUIFacade.java |   47 +-
 .../java/at/gv/egiz/bku/gui/PINSpecRenderer.java   |   39 +
 .../java/at/gv/egiz/bku/gui/PINStatusProvider.java |   32 -
 .../java/at/gv/egiz/bku/gui/PINStatusRenderer.java |   63 +
 .../at/gv/egiz/bku/gui/PINStatusTableModel.java    |   60 +
 .../bku/online/applet/PINManagementApplet.java     |    3 +-
 .../bku/online/applet/PINManagementBKUWorker.java  |   82 +-
 .../smccstal/ext/PINManagementRequestHandler.java  |  331 ++++
 .../bku/smccstal/ext/PINMgmtRequestHandler.java    |   93 -
 .../gv/egiz/bku/gui/ActivationMessages.properties  |   28 +-
 .../egiz/bku/gui/ActivationMessages_en.properties  |   30 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |    4 +-
 BKUAppletExt/src/test/resources/appletTest.html    |    2 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   |    8 +-
 .../main/java/at/gv/egiz/bku/gui/PinDocument.java  |   28 +-
 .../at/gv/egiz/bku/gui/Messages.properties         |    4 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |    2 +-
 .../at/gv/egiz/stal/ext/ActivatePINRequest.java    |   28 -
 .../java/at/gv/egiz/stal/ext/ChangePINRequest.java |   28 -
 .../at/gv/egiz/stal/ext/PINManagementRequest.java  |   31 +
 .../at/gv/egiz/stal/ext/PINManagementResponse.java |   28 +
 .../at/gv/egiz/stal/ext/UnblockPINRequest.java     |   28 -
 .../egiz/bku/slcommands/impl/xsect/DataObject.java | 2078 ++++++++++----------
 .../egiz/bku/slcommands/impl/xsect/Signature.java  |    5 +-
 .../bku/slcommands/impl/xsect/SignatureTest.java   | 1505 +++++++-------
 .../egiz/bku/slcommands/impl/TransformsInfo_2.xml  |  397 ++++
 smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java   |   25 +-
 .../at/gv/egiz/smcc/AbstractSignatureCard.java     |   10 +
 smcc/src/main/java/at/gv/egiz/smcc/PINSpec.java    |   30 +-
 .../src/main/java/at/gv/egiz/smcc/STARCOSCard.java |   25 +-
 smcc/src/main/java/at/gv/egiz/smcc/SWCard.java     |   14 +-
 .../main/java/at/gv/egiz/smcc/SignatureCard.java   |    5 +-
 .../at/gv/egiz/bku/smccstal/AbstractBKUWorker.java |    3 +
 .../java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java |    9 +-
 .../java/at/gv/egiz/marshal/NamespacePrefix.java   |   34 +
 .../gv/egiz/marshal/NamespacePrefixMapperImpl.java |   16 +-
 .../at/gv/egiz/slbinding/RedirectEventFilter.java  |  389 ++--
 .../gv/egiz/slbinding/impl/TransformsInfoType.java |    1 +
 .../at/gv/egiz/slbinding/impl/XMLContentType.java  |    2 +-
 .../org/w3/_2000/_09/xmldsig_/ObjectFactory.java   |    1 +
 .../org/w3/_2000/_09/xmldsig_/TransformsType.java  |    2 +-
 .../java/at/gv/egiz/slbinding/RedirectTest.java    |   29 +-
 .../CreateXMLSignatureRequest02.xml_redirect.txt   |    5 +-
 45 files changed, 3813 insertions(+), 2299 deletions(-)
 create mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINSpecRenderer.java
 delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusProvider.java
 create mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
 create mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java
 create mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
 delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINMgmtRequestHandler.java
 delete mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/ActivatePINRequest.java
 delete mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/ChangePINRequest.java
 create mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementRequest.java
 create mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementResponse.java
 delete mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/UnblockPINRequest.java
 create mode 100644 bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/TransformsInfo_2.xml
 create mode 100644 utils/src/main/java/at/gv/egiz/marshal/NamespacePrefix.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
index 5a57ef18..8c1bd2bd 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
@@ -195,11 +195,16 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
     }
   }
 
+  /**
+   *
+   * @param err_code
+   * @param ex if not null, the message will be appended as parameter to the error message
+   */
   protected void showErrorDialog(String err_code, Exception ex) {
     actionCommandList.clear();
     actionCommandList.add("ok");
-    gui.showErrorDialog(err_code,
-            new Object[]{ex.getMessage()}, this, "ok");
+    Object[] params = (ex != null) ? new Object[] { ex.getMessage() } : null;
+    gui.showErrorDialog(err_code, params, this, "ok");
     try {
       waitForAction();
     } catch (InterruptedException e) {
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
index 8acf051e..8eef8aea 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
@@ -17,15 +17,28 @@
 
 package at.gv.egiz.bku.gui;
 
+import at.gv.egiz.smcc.PINSpec;
 import java.awt.Container;
+import java.awt.Cursor;
+import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
 import java.net.URL;
+import java.text.MessageFormat;
 import java.util.Locale;
+import java.util.Map;
 import javax.swing.GroupLayout;
 import javax.swing.JButton;
 import javax.swing.JLabel;
+import javax.swing.JPasswordField;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
 import javax.swing.LayoutStyle;
+import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 
 /**
  * TODO pull out ResourceBundle to common superclass for activationGUI and pinMgmtGUI
@@ -33,9 +46,10 @@ import javax.swing.SwingUtilities;
  */
 public class PINManagementGUI extends ActivationGUI implements PINManagementGUIFacade {
 
-  public static final String BUTTON_ACTIVATE = "button.activate";
-  public static final String BUTTON_UNBLOCK = "button.unblock";
-  public static final String BUTTON_CHANGE = "button.change";
+  /** remember the pinfield to return to worker */
+  protected JPasswordField oldPinField;
+  /** remember the pinSpec to return to worker */
+  protected PINSpec pinSpec;
 
   public PINManagementGUI(Container contentPane,
           Locale locale,
@@ -46,12 +60,31 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
   }
 
   @Override
-  public void showPINManagementDialog(final PINStatusProvider pinStatusProvider,
-          final ActionListener activateListener, final String activateCmd,
-          final ActionListener changeListener, final String changeCmd,
-          final ActionListener unblockListener, final String unblockCmd,
-          final ActionListener cancelListener, final String cancelCmd) {
-//    try {
+  public char[] getOldPin() {
+    if (oldPinField != null) {
+      char[] pin = oldPinField.getPassword();
+      oldPinField = null;
+      return pin;
+    }
+    return null;
+  }
+
+  @Override
+  public PINSpec getSelectedPIN() {
+    return pinSpec;
+  }
+
+  @Override
+  public void showPINManagementDialog(final Map<PINSpec, STATUS> pins, 
+          final ActionListener activateListener,
+          final String activateCmd,
+          final String changeCmd,
+          final String unblockCmd,
+          final ActionListener cancelListener,
+          final String cancelCmd) {
+
+      log.debug("scheduling PIN managment dialog");
+    
       SwingUtilities.invokeLater(new Runnable() {
 
         @Override
@@ -68,13 +101,76 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
 
                 if (renderHeaderPanel) {
                   titleLabel.setText(cardmgmtMessages.getString(TITLE_PINMGMT));
-                  mgmtLabel.setText(cardmgmtMessages.getString(MESSAGE_PINMGMT));
+                  String infoPattern = cardmgmtMessages.getString(MESSAGE_PINMGMT);
+                  mgmtLabel.setText(MessageFormat.format(infoPattern, pins.size()));
                 } else {
                   mgmtLabel.setText(cardmgmtMessages.getString(TITLE_PINMGMT));
                 }
 
+                final PINStatusTableModel tableModel = new PINStatusTableModel(pins);
+                final JTable pinStatusTable = new JTable(tableModel);
+                pinStatusTable.setDefaultRenderer(PINSpec.class, new PINSpecRenderer());
+                pinStatusTable.setDefaultRenderer(STATUS.class, new PINStatusRenderer(cardmgmtMessages));
+                pinStatusTable.setTableHeader(null);
 
-                
+                pinStatusTable.addMouseMotionListener(new MouseMotionAdapter() {
+
+                  @Override
+                  public void mouseMoved(MouseEvent e) {
+                    if (pinStatusTable.columnAtPoint(e.getPoint()) == 0) {
+                      pinStatusTable.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                    } else {
+                      pinStatusTable.setCursor(Cursor.getDefaultCursor());
+                    }
+                  }
+                });
+
+                final JButton activateButton = new JButton();
+                activateButton.setFont(activateButton.getFont().deriveFont(activateButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                activateButton.addActionListener(activateListener);
+
+                pinStatusTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+                pinStatusTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+
+                  @Override
+                  public void valueChanged(final ListSelectionEvent e) {
+                    //invoke later to allow thread to paint selection background
+                    SwingUtilities.invokeLater(new Runnable() {
+
+                      @Override
+                      public void run() {
+                        ListSelectionModel lsm = (ListSelectionModel) e.getSource();
+                        int selectionIdx = lsm.getMinSelectionIndex();
+                        if (selectionIdx >= 0) {
+                          pinSpec = (PINSpec) tableModel.getValueAt(selectionIdx, 0);
+                          STATUS status = (STATUS) tableModel.getValueAt(selectionIdx, 1);
+
+                          if (status == STATUS.NOT_ACTIV) {
+                            activateButton.setText(cardmgmtMessages.getString(BUTTON_ACTIVATE));
+                            activateButton.setEnabled(true);
+                            activateButton.setActionCommand(activateCmd);
+                          } else if (status == STATUS.BLOCKED) {
+                            activateButton.setText(cardmgmtMessages.getString(BUTTON_UNBLOCK));
+                            activateButton.setEnabled(true);
+                            activateButton.setActionCommand(unblockCmd);
+                          } else if (status == STATUS.ACTIV) {
+                            activateButton.setText(cardmgmtMessages.getString(BUTTON_CHANGE));
+                            activateButton.setEnabled(true);
+                            activateButton.setActionCommand(changeCmd);
+                          } else {
+                            activateButton.setText(cardmgmtMessages.getString(BUTTON_ACTIVATE));
+                            activateButton.setEnabled(false);
+                          }
+                        }
+                      }
+                    });
+                  }
+                });
+
+                //select first entry
+                pinStatusTable.getSelectionModel().setSelectionInterval(0, 0);
+
+                JScrollPane pinStatusScrollPane = new JScrollPane(pinStatusTable);
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
@@ -91,30 +187,16 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
                           .addComponent(helpLabel);
                 }
 
-                mainPanelLayout.setHorizontalGroup(messageHorizontal);
-                mainPanelLayout.setVerticalGroup(messageVertical);
+                mainPanelLayout.setHorizontalGroup(
+                mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addGroup(messageHorizontal)
+                  .addComponent(pinStatusScrollPane, 0, 0, Short.MAX_VALUE));
 
-
-                JButton activateButton = new JButton();
-                activateButton.setFont(activateButton.getFont().deriveFont(activateButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                activateButton.setText(cardmgmtMessages.getString(BUTTON_ACTIVATE));
-                activateButton.setEnabled(true);//false);
-                activateButton.setActionCommand(activateCmd);
-                activateButton.addActionListener(activateListener);
-
-                JButton changeButton = new JButton();
-                changeButton.setFont(activateButton.getFont().deriveFont(activateButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                changeButton.setText(cardmgmtMessages.getString(BUTTON_CHANGE));
-                changeButton.setEnabled(false);
-                changeButton.setActionCommand(changeCmd);
-                changeButton.addActionListener(changeListener);
-
-                JButton unblockButton = new JButton();
-                unblockButton.setFont(activateButton.getFont().deriveFont(activateButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                unblockButton.setText(cardmgmtMessages.getString(BUTTON_UNBLOCK));
-                unblockButton.setEnabled(false);
-                unblockButton.setActionCommand(unblockCmd);
-                unblockButton.addActionListener(unblockListener);
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createSequentialGroup()
+                    .addGroup(messageVertical)
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addComponent(pinStatusScrollPane, 0, 0, pinStatusTable.getPreferredSize().height+3));
 
                 JButton cancelButton = new JButton();
                 cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -129,30 +211,377 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
                         .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                         .addComponent(activateButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(changeButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(unblockButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
 
                 GroupLayout.Group buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
                           .addComponent(activateButton)
-                          .addComponent(changeButton)
-                          .addComponent(unblockButton)
                           .addComponent(cancelButton);
 
                 buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
                 buttonPanelLayout.setVerticalGroup(buttonVertical);
 
                 contentPanel.validate();
-
         }
       });
+  }
+
+  @Override
+  public void showActivatePINDialog(final PINSpec pin,
+          final ActionListener okListener, final String okCommand,
+          final ActionListener cancelListener, final String cancelCommand) {
+    log.debug("scheduling activate pin dialog");
+    showPINDialog(false, pin, okListener, okCommand, cancelListener, cancelCommand);
+  }
+
+
+  private void showPINDialog(final boolean changePin, final PINSpec pinSpec,
+          final ActionListener okListener, final String okCommand,
+          final ActionListener cancelListener, final String cancelCommand) {
+
+      SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+
+              String HELP_TOPIC, TITLE, MESSAGE_MGMT;
+              if (changePin) {
+                log.debug("show change pin dialog");
+                HELP_TOPIC = HELP_PINMGMT;
+                TITLE = TITLE_CHANGE_PIN;
+                MESSAGE_MGMT = MESSAGE_CHANGE_PIN;
+              } else {
+                log.debug("show activate pin dialog");
+                HELP_TOPIC = HELP_PINMGMT;
+                TITLE = TITLE_ACTIVATE_PIN;
+                MESSAGE_MGMT = MESSAGE_ACTIVATE_PIN;
+                oldPinField = null;
+              }
+
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+                helpListener.setHelpTopic(HELP_TOPIC);
+
+                JLabel mgmtLabel = new JLabel();
+                mgmtLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+
+                if (renderHeaderPanel) {
+                  titleLabel.setText(cardmgmtMessages.getString(TITLE));
+                  String mgmtPattern = cardmgmtMessages.getString(MESSAGE_MGMT);
+                  if (shortText) {
+                    mgmtLabel.setText(MessageFormat.format(mgmtPattern, "PIN"));
+                  } else {
+                    mgmtLabel.setText(MessageFormat.format(mgmtPattern, pinSpec.getLocalizedName()));
+                  }
+                } else {
+                  mgmtLabel.setText(cardmgmtMessages.getString(TITLE));
+                }
+
+                JButton okButton = new JButton();
+                okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                okButton.setText(messages.getString(BUTTON_OK));
+                okButton.setEnabled(false);
+                okButton.setActionCommand(okCommand);
+                okButton.addActionListener(okListener);
+
+                JLabel pinLabel = new JLabel();
+                pinLabel.setFont(pinLabel.getFont().deriveFont(pinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                String pinLabelPattern = (changePin) ? cardmgmtMessages.getString(LABEL_NEW_PIN) : messages.getString(LABEL_PIN);
+                pinLabel.setText(MessageFormat.format(pinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
+
+                final JPasswordField repeatPinField = new JPasswordField();
+                pinField = new JPasswordField();
+                pinField.setText("");
+                pinField.setDocument(new PINDocument(pinSpec, null));
+                pinField.setActionCommand(okCommand);
+                pinField.addActionListener(new ActionListener() {
+
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        if (pinField.getPassword().length >= pinSpec.getMinLength()) {
+                          repeatPinField.requestFocusInWindow();
+                        }
+                    }
+                });
+                JLabel repeatPinLabel = new JLabel();
+                repeatPinLabel.setFont(pinLabel.getFont());
+                String repeatPinLabelPattern = cardmgmtMessages.getString(LABEL_REPEAT_PIN);
+                repeatPinLabel.setText(MessageFormat.format(repeatPinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
+
+                repeatPinField.setText("");
+                repeatPinField.setDocument(new PINDocument(pinSpec, okButton, pinField.getDocument()));
+                repeatPinField.setActionCommand(okCommand);
+                repeatPinField.addActionListener(new ActionListener() {
+
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        if (pinField.getPassword().length >= pinSpec.getMinLength()) {
+                            okListener.actionPerformed(e);
+                        }
+                    }
+                });
+
+                JLabel oldPinLabel = null;
+                if (changePin) {
+                  oldPinLabel = new JLabel();
+                  oldPinLabel.setFont(oldPinLabel.getFont().deriveFont(oldPinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  String oldPinLabelPattern = cardmgmtMessages.getString(LABEL_OLD_PIN);
+                  oldPinLabel.setText(MessageFormat.format(oldPinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
+
+                  oldPinField = new JPasswordField();
+                  oldPinField.setText("");
+                  oldPinField.setDocument(new PINDocument(pinSpec, null));
+                  oldPinField.setActionCommand(okCommand);
+                  oldPinField.addActionListener(new ActionListener() {
+
+                      @Override
+                      public void actionPerformed(ActionEvent e) {
+                          if (oldPinField.getPassword().length >= pinSpec.getMinLength()) {
+                            pinField.requestFocusInWindow();
+                          }
+                      }
+                  });
+                }
+                
+                JLabel pinsizeLabel = new JLabel();
+                pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
+                String pinsizePattern = messages.getString(LABEL_PINSIZE);
+                String pinSize = String.valueOf(pinSpec.getMinLength());
+                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+                    pinSize += "-" + pinSpec.getMaxLength();
+                }
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
+                          .addComponent(mgmtLabel);
+                GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                          .addComponent(mgmtLabel);
+
+                if (!renderHeaderPanel) {
+                  infoHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel);
+                  infoVertical
+                          .addComponent(helpLabel);
+                }
 
-//    } catch (Exception ex) {
-//      log.error(ex.getMessage(), ex);
-//      showErrorDialog(ERR_UNKNOWN_WITH_PARAM, new Object[] {ex.getMessage()});
-//    }
+                GroupLayout.ParallelGroup pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+                GroupLayout.SequentialGroup pinVertical = mainPanelLayout.createSequentialGroup();
+
+                if (pinLabelPos == PinLabelPosition.ABOVE) {
+                  if (changePin) {
+                    pinHorizontal
+                            .addComponent(oldPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addComponent(oldPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE);
+                    pinVertical
+                            .addComponent(oldPinLabel)
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                            .addComponent(oldPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
+                  }
+                  pinHorizontal 
+                          .addComponent(pinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                          .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                          .addComponent(repeatPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                          .addComponent(repeatPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                            .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
+                  pinVertical
+                          .addComponent(pinLabel)
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(repeatPinLabel)
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(repeatPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(pinsizeLabel);
+                } else {
+                  if (changePin) {
+                    pinHorizontal
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                              .addComponent(oldPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                              .addComponent(pinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                              .addComponent(repeatPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                            .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                              .addComponent(oldPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                              .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                              .addComponent(repeatPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
+
+                    pinVertical
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(oldPinLabel)
+                            .addComponent(oldPinField))
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
+                  } else {
+                    pinHorizontal
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                              .addComponent(pinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                              .addComponent(repeatPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                            .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                              .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                              .addComponent(repeatPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
+
+                  }
+                  pinHorizontal
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                            .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
+                  pinVertical
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(pinLabel)
+                            .addComponent(pinField))
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(repeatPinLabel)
+                            .addComponent(repeatPinField))
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(pinsizeLabel);
+                }
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addGroup(infoHorizontal)
+                    .addGroup(pinHorizontal));
+
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createSequentialGroup()
+                    .addGroup(infoVertical)
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addGroup(pinVertical));
+
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
+                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                GroupLayout.Group buttonVertical;
+
+                JButton cancelButton = new JButton();
+                cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                cancelButton.setActionCommand(cancelCommand);
+                cancelButton.addActionListener(cancelListener);
+
+                buttonHorizontal
+                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                        .addComponent(okButton)
+                        .addComponent(cancelButton);
+
+                buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
+                buttonPanelLayout.setVerticalGroup(buttonVertical);
+
+                if (oldPinField != null) {
+                  oldPinField.requestFocusInWindow();
+                } else {
+                  pinField.requestFocusInWindow();
+                }
+                contentPanel.validate();
+
+            }
+        });
+  }
+
+  @Override
+  public void showChangePINDialog(final PINSpec pin,
+          final ActionListener okListener, final String okCommand,
+          final ActionListener cancelListener, final String cancelCommand) {
+    
+      log.debug("scheduling change pin dialog");
+      showPINDialog(true, pin, okListener, okCommand, cancelListener, cancelCommand);
+  }
+
+  @Override
+  public void showUnblockPINDialog(final PINSpec pin,
+          final ActionListener okListener, final String okCommand,
+          final ActionListener cancelListener, final String cancelCommand) {
+
+      log.debug("scheduling unblock PIN dialog");
+
+      SwingUtilities.invokeLater(new Runnable() {
+
+          @Override
+            public void run() {
+
+                log.debug("show unblock PIN dialog");
+
+                log.error("unblock pin not supported");
+
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+                if (renderHeaderPanel) {
+                  titleLabel.setText(messages.getString(TITLE_ERROR));
+                }
+
+                helpListener.setHelpTopic(HELP_PINMGMT);
+
+                String errorMsgPattern = cardmgmtMessages.getString(ERR_UNBLOCK);
+                String errorMsg = MessageFormat.format(errorMsgPattern, pin.getLocalizedName());
+
+                JLabel errorMsgLabel = new JLabel();
+                errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                errorMsgLabel.setText(errorMsg);
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+                GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
+
+                if (!renderHeaderPanel) {
+                  JLabel errorTitleLabel = new JLabel();
+                  errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                  errorTitleLabel.setText(messages.getString(TITLE_ERROR));
+                  errorTitleLabel.setForeground(ERROR_COLOR);
+
+                  mainHorizontal
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addComponent(errorTitleLabel)
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                            .addComponent(helpLabel));
+                  mainVertical
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                            .addComponent(errorTitleLabel)
+                            .addComponent(helpLabel));
+                }
+
+                mainPanelLayout.setHorizontalGroup(mainHorizontal
+                        .addComponent(errorMsgLabel));
+                mainPanelLayout.setVerticalGroup(mainVertical
+                        .addComponent(errorMsgLabel));
+
+                JButton okButton = new JButton();
+                okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                okButton.setText(messages.getString(BUTTON_OK));
+                okButton.setActionCommand(cancelCommand);
+                okButton.addActionListener(cancelListener);
+
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                buttonPanelLayout.setHorizontalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+                buttonPanelLayout.setVerticalGroup(
+                  buttonPanelLayout.createSequentialGroup()
+                    .addComponent(okButton));
+
+                contentPanel.validate();
+            }
+        });
   }
 
 
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
index 3d653fab..2a8f28d2 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
@@ -17,7 +17,9 @@
 
 package at.gv.egiz.bku.gui;
 
+import at.gv.egiz.smcc.PINSpec;
 import java.awt.event.ActionListener;
+import java.util.Map;
 
 /**
  *
@@ -27,8 +29,49 @@ public interface PINManagementGUIFacade extends BKUGUIFacade {
 
   public static final String HELP_PINMGMT = "help.pin.mgmt";
   public static final String TITLE_PINMGMT = "title.pin.mgmt";
+  public static final String TITLE_ACTIVATE_PIN = "title.activate.pin";
+  public static final String TITLE_CHANGE_PIN = "title.change.pin";
+  public static final String TITLE_UNBLOCK_PIN = "title.unblock.pin";
   public static final String MESSAGE_PINMGMT = "message.pin.mgmt";
-  
-  public void showPINManagementDialog(PINStatusProvider pinStatusProvider, ActionListener activateListener, String activateCmd, ActionListener changeListener, String changeCmd, ActionListener unblockListener, String unblockCmd, ActionListener cancelListener, String cancelCmd);
+  public static final String MESSAGE_ACTIVATE_PIN = "message.activate.pin";
+  public static final String MESSAGE_CHANGE_PIN = "message.change.pin";
+  public static final String MESSAGE_UNBLOCK_PIN = "message.unblock.pin";
+  public static final String LABEL_OLD_PIN = "label.old.pin";
+  public static final String LABEL_NEW_PIN = "label.new.pin";
+  public static final String LABEL_REPEAT_PIN = "label.repeat.pin";
 
+  public static final String ERR_ACTIVATE = "err.activate";
+  public static final String ERR_CHANGE = "err.change";
+  public static final String ERR_UNBLOCK = "err.unblock";
+
+  public static final String BUTTON_ACTIVATE = "button.activate";
+  public static final String BUTTON_UNBLOCK = "button.unblock";
+  public static final String BUTTON_CHANGE = "button.change";
+
+  public static final String STATUS_ACTIVE = "status.active";
+  public static final String STATUS_BLOCKED = "status.blocked";
+  public static final String STATUS_NOT_ACTIVE = "status.not.active";
+  public static final String STATUS_UNKNOWN = "status.unknown";
+
+  public enum STATUS { ACTIV, NOT_ACTIV, BLOCKED, UNKNOWN };
+
+  public void showPINManagementDialog(Map<PINSpec, STATUS> pins,
+          ActionListener activateListener, String activateCmd, String changeCmd, String unblockCmd,
+          ActionListener cancelListener, String cancelCmd);
+
+  public void showActivatePINDialog(PINSpec pin,
+          ActionListener okListener, String okCmd,
+          ActionListener cancelListener, String cancelCmd);
+
+  public void showChangePINDialog(PINSpec pin,
+          ActionListener okListener, String okCmd,
+          ActionListener cancelListener, String cancelCmd);
+
+  public void showUnblockPINDialog(PINSpec pin,
+          ActionListener okListener, String okCmd,
+          ActionListener cancelListener, String cancelCmd);
+
+  public char[] getOldPin();
+
+  public PINSpec getSelectedPIN();
 }
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINSpecRenderer.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINSpecRenderer.java
new file mode 100644
index 00000000..e3d73e1f
--- /dev/null
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINSpecRenderer.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.smcc.PINSpec;
+import javax.swing.table.DefaultTableCellRenderer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PINSpecRenderer extends DefaultTableCellRenderer {
+
+  private static final Log log = LogFactory.getLog(PINSpecRenderer.class);
+
+  @Override
+  protected void setValue(Object value) {
+    PINSpec pinSpec = (PINSpec) value;
+    super.setText(pinSpec.getLocalizedName());
+  }
+
+}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusProvider.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusProvider.java
deleted file mode 100644
index 73fa0920..00000000
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusProvider.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.gui;
-
-import at.gv.egiz.smcc.SignatureCardException;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public interface PINStatusProvider {
-
-  public enum STATUS { ACTIV, NOT_ACTIV, BLOCKED };
-
-  public STATUS getPINStatus(int pin) throws SignatureCardException;
-
-}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
new file mode 100644
index 00000000..2f8852ff
--- /dev/null
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.bku.gui.PINManagementGUIFacade.STATUS;
+import java.awt.Color;
+import java.awt.Font;
+import java.util.ResourceBundle;
+import javax.swing.table.DefaultTableCellRenderer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PINStatusRenderer extends DefaultTableCellRenderer {
+  
+  private static final Log log = LogFactory.getLog(PINStatusRenderer.class);
+
+  public static final Color RED = new Color(0.9f, 0.0f, 0.0f);
+  public static final Color GREEN = new Color(0.0f, 0.8f, 0.0f);
+  protected ResourceBundle messages;
+
+  public PINStatusRenderer(ResourceBundle messages) {
+    this.messages = messages;
+  }
+
+  @Override
+  protected void setValue(Object value) {
+    STATUS pinStatus = (STATUS) value;
+    super.setFont(super.getFont().deriveFont(super.getFont().getStyle() | Font.BOLD));
+      
+    if (pinStatus == STATUS.NOT_ACTIV) {
+      super.setForeground(RED);
+      super.setText("<html>" + messages.getString(PINManagementGUIFacade.STATUS_NOT_ACTIVE) + "</html>");
+    } else if (pinStatus == STATUS.ACTIV) {
+      super.setForeground(GREEN);
+      super.setText("<html>" + messages.getString(PINManagementGUIFacade.STATUS_ACTIVE) + "</html>");
+    } else if (pinStatus == STATUS.BLOCKED) {
+      super.setForeground(RED);
+      super.setText("<html>" + messages.getString(PINManagementGUIFacade.STATUS_BLOCKED) + "</html>");
+    } else {
+      super.setForeground(Color.BLACK);
+      super.setText("<html>" + messages.getString(PINManagementGUIFacade.STATUS_UNKNOWN) + "</html>");
+    }
+  }
+}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java
new file mode 100644
index 00000000..feaa5072
--- /dev/null
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.bku.gui.PINManagementGUIFacade.STATUS;
+import at.gv.egiz.smcc.PINSpec;
+import java.util.Map;
+import javax.swing.table.DefaultTableModel;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PINStatusTableModel extends DefaultTableModel {
+
+  protected static final Log log = LogFactory.getLog(PINStatusTableModel.class);
+  protected Class[] types;
+
+  public PINStatusTableModel(Map<PINSpec, STATUS> pinStatuses) {
+    super(0, 2);
+    if (pinStatuses == null) {
+      throw new RuntimeException("pinStatuses must not be null");
+    }
+    log.trace(pinStatuses.size() + " PINs");
+    types = new Class[] { PINSpec.class, STATUS.class };
+    for (PINSpec pinSpec : pinStatuses.keySet()) {
+      addRow(new Object[] { pinSpec, pinStatuses.get(pinSpec) });
+    }
+//    PINSpec activePIN = new PINSpec(0, 1, null, "active-PIN", (byte) 0x01);
+//    PINSpec blockedPIN = new PINSpec(0, 1, null, "blocked-PIN", (byte) 0x01);
+//    addRow(new Object[] { activePIN, PINStatusProvider.STATUS.ACTIV });
+//    addRow(new Object[] { blockedPIN, PINStatusProvider.STATUS.BLOCKED });
+  }
+
+  @Override
+  public Class getColumnClass(int columnIndex) {
+    return types[columnIndex];
+  }
+
+  @Override
+  public boolean isCellEditable(int rowIndex, int columnIndex) {
+    return false;
+  }
+}
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 72d06618..d948ac03 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
@@ -19,6 +19,7 @@ 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.PINManagementGUI;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade;
 import java.awt.Container;
 import java.net.URL;
 import java.util.Locale;
@@ -45,6 +46,6 @@ public class PINManagementApplet extends BKUApplet {
 
   @Override
   protected AppletBKUWorker createBKUWorker(BKUApplet applet, BKUGUIFacade gui) {
-    return new PINManagementBKUWorker(applet, 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 e65d98ca..ffd83e42 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
@@ -18,35 +18,28 @@ package at.gv.egiz.bku.online.applet;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.PINManagementGUIFacade;
-import at.gv.egiz.bku.smccstal.ext.PINMgmtRequestHandler;
+import at.gv.egiz.bku.smccstal.ext.PINManagementRequestHandler;
+import at.gv.egiz.stal.ErrorResponse;
 import at.gv.egiz.stal.STALResponse;
-import at.gv.egiz.stal.ext.ActivatePINRequest;
-import at.gv.egiz.stal.ext.ChangePINRequest;
-import at.gv.egiz.stal.ext.UnblockPINRequest;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Collection;
+import at.gv.egiz.stal.ext.PINManagementRequest;
+import at.gv.egiz.stal.ext.PINManagementResponse;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
- *
+ * This BKU Worker does not connect to STAL webservice
+ * (no Internet connection permitted while activating PINs).
+ * 
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class PINManagementBKUWorker extends AppletBKUWorker {
 
-  protected PINMgmtRequestHandler handler = new PINMgmtRequestHandler();
-  protected PINManagementActionListener listener = new PINManagementActionListener();
-
-  public PINManagementBKUWorker(BKUApplet applet, BKUGUIFacade gui) {
+  public PINManagementBKUWorker(BKUApplet applet, PINManagementGUIFacade gui) {
     super(applet, gui);
     handlerMap.clear();
-//    PINMgmtRequestHandler handler = new PINMgmtRequestHandler();
-//    addRequestHandler(ActivatePINRequest.class, handler);
-//    addRequestHandler(ChangePINRequest.class, handler);
-//    addRequestHandler(UnblockPINRequest.class, handler);
+    addRequestHandler(PINManagementRequest.class, new PINManagementRequestHandler());
   }
 
   @Override
@@ -54,22 +47,24 @@ public class PINManagementBKUWorker extends AppletBKUWorker {
     gui.showWelcomeDialog();
 
     try {
-
-      if (waitForCard()) {
-        gui.showErrorDialog("no card, canceled PIN mgmt dialog", null);
+      List<STALResponse> responses = handleRequest(Collections.singletonList(new PINManagementRequest()));
+
+      if (responses.size() == 1) {
+        STALResponse response = responses.get(0);
+        if (response instanceof PINManagementResponse) {
+          log.debug("PIN management dialog finished");
+        } else if (response instanceof ErrorResponse) {
+          showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, null);
+        } else {
+          throw new RuntimeException("Invalid STAL response: " + response.getClass().getName());
+        }
+      } else {
+        throw new RuntimeException("invalid number of STAL responses: " + responses.size());
       }
 
-      actionCommandList.clear();
-      actionCommandList.add("cancel");
-
-      ((PINManagementGUIFacade) gui).showPINManagementDialog(handler,
-              listener, "activate",
-              listener, "change",
-              listener, "unblock",
-              this, "cancel");
-
-      waitForAction();
-
+    } catch (RuntimeException ex) {
+      log.error("unexpected error: " + ex.getMessage(), ex);
+      showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, null);
     } catch (Exception ex) {
       log.error(ex.getMessage(), ex);
       showErrorDialog(BKUGUIFacade.ERR_UNKNOWN_WITH_PARAM, ex);
@@ -82,31 +77,4 @@ public class PINManagementBKUWorker extends AppletBKUWorker {
     applet.sendRedirect(sessionId);
   }
 
-  protected class PINManagementActionListener implements ActionListener {
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-      try {
-        String cmd = e.getActionCommand();
-        if ("activate".equals(cmd)) {
-          //create STAL request, call handle(req)
-          ActivatePINRequest stalReq = new ActivatePINRequest();
-          STALResponse stalResp = handler.handleRequest(stalReq);
-          gui.showErrorDialog(BKUGUIFacade.ERR_UNKNOWN_WITH_PARAM, new Object[]{"debug"}, this, "back");
-        } else if ("change".equals(cmd)) {
-        } else if ("unblock".equals(cmd)) {
-        } else if ("back".equals(cmd)) {
-
-          ((PINManagementGUIFacade) gui).showPINManagementDialog(handler,
-                  this, "activate",
-                  this, "change",
-                  this, "unblock",
-                  PINManagementBKUWorker.this, "cancel");
-
-        }
-      } catch (InterruptedException ex) {
-        log.fatal(ex);
-      }
-    }
   }
-}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
new file mode 100644
index 00000000..fcef3191
--- /dev/null
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
@@ -0,0 +1,331 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.smccstal.ext;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade.STATUS;
+import at.gv.egiz.bku.smccstal.AbstractRequestHandler;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.SignatureCardException;
+import at.gv.egiz.smcc.util.SMCCHelper;
+import at.gv.egiz.stal.ErrorResponse;
+import at.gv.egiz.stal.STALRequest;
+import at.gv.egiz.stal.STALResponse;
+import at.gv.egiz.stal.ext.PINManagementRequest;
+import at.gv.egiz.stal.ext.PINManagementResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.smartcardio.Card;
+import javax.smartcardio.CardChannel;
+import javax.smartcardio.CardException;
+import javax.smartcardio.CommandAPDU;
+import javax.smartcardio.ResponseAPDU;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PINManagementRequestHandler extends AbstractRequestHandler {
+
+  public static final String ERR_NOPIN_SELECTED = "err.no.pin.selected";
+  protected static final Log log = LogFactory.getLog(PINManagementRequestHandler.class);
+
+//  protected ResourceBundle messages;
+
+//  public PINManagementRequestHandler(ResourceBundle messages) {
+//    this.messages = messages;
+//  }
+  @Override
+  public STALResponse handleRequest(STALRequest request) throws InterruptedException {
+    if (request instanceof PINManagementRequest) {
+
+      PINManagementGUIFacade gui = (PINManagementGUIFacade) this.gui;
+
+      showPINManagementDialog(gui);
+
+      while (true) {
+
+        waitForAction();
+
+        if ("cancel".equals(actionCommand)) {
+          return new PINManagementResponse();
+        } else if ("back".equals(actionCommand)) {
+          showPINManagementDialog(gui);
+        } else {
+          PINSpec selectedPIN = gui.getSelectedPIN();
+
+          if (selectedPIN == null) {
+            throw new RuntimeException("no PIN selected for activation/change");
+          }
+
+          if ("activate_enterpin".equals(actionCommand)) {
+            gui.showActivatePINDialog(selectedPIN, this, "activate", this, "back");
+          } else if ("change_enterpin".equals(actionCommand)) {
+            gui.showChangePINDialog(selectedPIN, this, "change", this, "back");
+          } else if ("unblock_enterpuk".equals(actionCommand)) {
+            gui.showUnblockPINDialog(selectedPIN, this, "unblock", this, "back");
+          } else if ("activate".equals(actionCommand)) {
+            try {
+              byte[] pin = encodePIN(gui.getPin());
+              activatePIN(selectedPIN.getKID(), selectedPIN.getContextAID(), pin);
+              showPINManagementDialog(gui);
+            } catch (SignatureCardException ex) {
+              log.error("failed to activate " + selectedPIN.getLocalizedName() + ": " + ex.getMessage());
+              gui.showErrorDialog(PINManagementGUIFacade.ERR_ACTIVATE, 
+                      new Object[] {selectedPIN.getLocalizedName()},
+                      this, "cancel");
+            }
+          } else if ("change".equals(actionCommand)) {
+            try {
+              byte[] oldPin = encodePIN(gui.getOldPin()); //new byte[]{(byte) 0x25, (byte) 0x40, (byte) 0x01};
+              byte[] pin = encodePIN(gui.getPin()); //new byte[]{(byte) 0x25, (byte) 0x40};
+              changePIN(selectedPIN.getKID(), selectedPIN.getContextAID(), oldPin, pin);
+              showPINManagementDialog(gui);
+            } catch (SignatureCardException ex) {
+              log.error("failed to change " + selectedPIN.getLocalizedName() + ": " + ex.getMessage());
+              gui.showErrorDialog(PINManagementGUIFacade.ERR_CHANGE, 
+                      new Object[] {selectedPIN.getLocalizedName()},
+                      this, "cancel");
+            }
+          } else if ("unblock".equals(actionCommand)) {
+            log.error("unblock PIN not implemented");
+            gui.showErrorDialog(PINManagementGUIFacade.ERR_UNBLOCK, null, this, "cancel");
+          } else {
+            throw new RuntimeException("unsupported action " + actionCommand);
+          }
+        }
+      }
+    } else {
+      log.error("Got unexpected STAL request: " + request);
+      return new ErrorResponse(1000);
+    }
+  }
+
+  @Override
+  public boolean requireCard() {
+    return true;
+  }
+
+  /**
+   * pin.length &lt; 4bit
+   * @param kid
+   * @param contextAID
+   * @param pin
+   * @throws at.gv.egiz.smcc.SignatureCardException
+   */
+  private void activatePIN(byte kid, byte[] contextAID, byte[] pin) throws SignatureCardException {
+    try {
+      Card icc = card.getCard();
+      icc.beginExclusive();
+      CardChannel channel = icc.getBasicChannel();
+
+      if (contextAID != null) {
+        CommandAPDU selectAPDU = new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, contextAID);
+        ResponseAPDU responseAPDU = channel.transmit(selectAPDU);
+        if (responseAPDU.getSW() != 0x9000) {
+          String msg = "Failed to activate PIN " + SMCCHelper.toString(new byte[]{kid}) +
+                  ": Failed to select AID " + SMCCHelper.toString(contextAID) +
+                  ": " + SMCCHelper.toString(responseAPDU.getBytes());
+          log.error(msg);
+          throw new SignatureCardException(msg);
+        }
+      }
+
+      if (pin.length > 7) {
+        log.error("Invalid PIN");
+        throw new SignatureCardException("Invalid PIN");
+      }
+      byte length = (byte) (0x20 | pin.length * 2);
+
+      byte[] apdu = new byte[]{
+        (byte) 0x00, (byte) 0x24, (byte) 0x01, kid, (byte) 0x08,
+        (byte) length, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF};
+      for (int i = 0; i < pin.length; i++) {
+        apdu[i + 6] = pin[i];
+      }
+
+      CommandAPDU verifyAPDU = new CommandAPDU(apdu);
+      ResponseAPDU responseAPDU = channel.transmit(verifyAPDU);
+
+      if (responseAPDU.getSW() != 0x9000) {
+        String msg = "Failed to activate PIN " + SMCCHelper.toString(new byte[]{kid}) + ": " + SMCCHelper.toString(responseAPDU.getBytes());
+        log.error(msg);
+        throw new SignatureCardException(msg);
+      }
+
+
+      icc.endExclusive();
+
+
+    } catch (CardException ex) {
+      log.error("Failed to get PIN status: " + ex.getMessage());
+      throw new SignatureCardException("Failed to get PIN status", ex);
+    }
+  }
+
+  private void changePIN(byte kid, byte[] contextAID, byte[] oldPIN, byte[] newPIN) throws SignatureCardException {
+    try {
+      Card icc = card.getCard();
+      icc.beginExclusive();
+      CardChannel channel = icc.getBasicChannel();
+
+      if (contextAID != null) {
+        CommandAPDU selectAPDU = new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, contextAID);
+        ResponseAPDU responseAPDU = channel.transmit(selectAPDU);
+        if (responseAPDU.getSW() != 0x9000) {
+          String msg = "Failed to change PIN " + SMCCHelper.toString(new byte[]{kid}) +
+                  ": Failed to select AID " + SMCCHelper.toString(contextAID) +
+                  ": " + SMCCHelper.toString(responseAPDU.getBytes());
+          log.error(msg);
+          throw new SignatureCardException(msg);
+        }
+      }
+
+      if (oldPIN.length > 7 || newPIN.length > 7) {
+        log.error("Invalid PIN");
+        throw new SignatureCardException("Invalid PIN");
+      }
+      byte oldLength = (byte) (0x20 | oldPIN.length * 2);
+      byte newLength = (byte) (0x20 | newPIN.length * 2);
+
+      byte[] apdu = new byte[]{
+        (byte) 0x00, (byte) 0x24, (byte) 0x00, kid, (byte) 0x10,
+        oldLength, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+        newLength, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF};
+      for (int i = 0; i < oldPIN.length; i++) {
+        apdu[i + 6] = oldPIN[i];
+      }
+      for (int i = 0; i < newPIN.length; i++) {
+        apdu[i + 14] = newPIN[i];
+      }
+
+      CommandAPDU verifyAPDU = new CommandAPDU(apdu);
+      ResponseAPDU responseAPDU = channel.transmit(verifyAPDU);
+
+      if (responseAPDU.getSW() != 0x9000) {
+        String msg = "Failed to change PIN " + SMCCHelper.toString(new byte[]{kid}) + ": " + SMCCHelper.toString(responseAPDU.getBytes());
+        log.error(msg);
+        throw new SignatureCardException(msg);
+      }
+
+
+      icc.endExclusive();
+
+
+    } catch (CardException ex) {
+      log.error("Failed to get PIN status: " + ex.getMessage());
+      throw new SignatureCardException("Failed to get PIN status", ex);
+    }
+  }
+
+  public Map<PINSpec, STATUS> getPINStatuses() throws SignatureCardException {
+    try {
+      Card icc = card.getCard();
+      icc.beginExclusive();
+      CardChannel channel = icc.getBasicChannel();
+
+      HashMap<PINSpec, STATUS> pinStatuses = new HashMap<PINSpec, STATUS>();
+      List<PINSpec> pins = card.getPINSpecs();
+
+      //select DF_SichereSignatur 00 A4 04 0C 08 D0 40 00 00 17 00 12 01
+//      CommandAPDU selectAPDU = new CommandAPDU(new byte[]{(byte) 0x00, (byte) 0xa4, (byte) 0x04, (byte) 0x0c, (byte) 0x08,
+//                (byte) 0xd0, (byte) 0x40, (byte) 0x00, (byte) 0x00, (byte) 0x17, (byte) 0x00, (byte) 0x12, (byte) 0x01});
+//      ResponseAPDU rAPDU = channel.transmit(selectAPDU);
+//      log.debug("SELECT FILE DF_SichereSignatur: " + SMCCHelper.toString(rAPDU.getBytes()));
+
+      //select DF_SIG DF 70
+//      CommandAPDU selectAPDU = new CommandAPDU(new byte[]{(byte) 0x00, (byte) 0xa4, (byte) 0x00, (byte) 0x0c, (byte) 0x02,
+//                (byte) 0xdf, (byte) 0x70 });
+//      ResponseAPDU rAPDU = channel.transmit(selectAPDU);
+//      log.debug("SELECT FILE DF_SIG: " + SMCCHelper.toString(rAPDU.getBytes()));
+
+      //select DF_DEC DF 71
+//      CommandAPDU selectAPDU = new CommandAPDU(new byte[]{(byte) 0x00, (byte) 0xa4, (byte) 0x04, (byte) 0x0c, (byte) 0x08,
+//                (byte) 0xd0, (byte) 0x40, (byte) 0x00, (byte) 0x00, (byte) 0x17, (byte) 0x00, (byte) 0x12, (byte) 0x01});
+//      ResponseAPDU rAPDU = channel.transmit(selectAPDU);
+//      log.debug("SELECT FILE DF_SichereSignatur: " + SMCCHelper.toString(rAPDU.getBytes()));
+
+      for (PINSpec pinSpec : pins) {
+        byte kid = pinSpec.getKID();
+        byte[] contextAID = pinSpec.getContextAID();
+
+        if (contextAID != null) {
+          CommandAPDU selectAPDU = new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, contextAID);
+          ResponseAPDU responseAPDU = channel.transmit(selectAPDU);
+          if (responseAPDU.getSW() != 0x9000) {
+            String msg = "Failed to activate PIN " + SMCCHelper.toString(new byte[]{kid}) +
+                    ": Failed to select AID " + SMCCHelper.toString(contextAID) +
+                    ": " + SMCCHelper.toString(responseAPDU.getBytes());
+            log.error(msg);
+            throw new SignatureCardException(msg);
+          }
+        }
+
+        CommandAPDU verifyAPDU = new CommandAPDU(new byte[]{(byte) 0x00, (byte) 0x20, (byte) 00, kid});
+        ResponseAPDU responseAPDU = channel.transmit(verifyAPDU);
+
+        STATUS status = STATUS.UNKNOWN;
+        if (responseAPDU.getSW() == 0x6984) {
+          status = STATUS.NOT_ACTIV;
+        } else if (responseAPDU.getSW() == 0x63c0) {
+          status = STATUS.BLOCKED;
+        } else if (responseAPDU.getSW1() == 0x63) {
+          status = STATUS.ACTIV;
+        }
+        if (log.isDebugEnabled()) {
+          log.debug("PIN " + pinSpec.getLocalizedName() + " status: " + SMCCHelper.toString(responseAPDU.getBytes()));
+        }
+
+        pinStatuses.put(pinSpec, status);
+      }
+      icc.endExclusive();
+
+      return pinStatuses;
+
+    } catch (CardException ex) {
+      log.error("Failed to get PIN status: " + ex.getMessage());
+      throw new SignatureCardException("Failed to get PIN status", ex);
+    }
+  }
+
+  private byte[] encodePIN(char[] pinChars) {
+    int length = (int) Math.ceil(pinChars.length/2);
+    byte[] pin = new byte[length];
+    for (int i = 0; i < length; i++) {
+      pin[i] = (byte) (16*Character.digit(pinChars[i*2], 16) + Character.digit(pinChars[i*2+1], 16));
+    }
+    log.trace("***** "  + SMCCHelper.toString(pin) + " ******");
+    return pin;
+  }
+
+  private void showPINManagementDialog(PINManagementGUIFacade gui) {
+    try {
+      Map<PINSpec, STATUS> pins = getPINStatuses();
+      gui.showPINManagementDialog(pins, 
+              this, "activate_enterpin", "change_enterpin", "unblock_enterpuk",
+              this, "cancel");
+    } catch (SignatureCardException ex) {
+      gui.showErrorDialog(BKUGUIFacade.ERR_UNKNOWN_WITH_PARAM, 
+              new Object[]{"FAILED TO GET PIN STATUSES: " + ex.getMessage()},
+              this, "cancel");
+    }
+  }
+}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINMgmtRequestHandler.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINMgmtRequestHandler.java
deleted file mode 100644
index b2d34ff2..00000000
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINMgmtRequestHandler.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.smccstal.ext;
-
-import at.gv.egiz.bku.gui.PINStatusProvider;
-import at.gv.egiz.bku.smccstal.AbstractRequestHandler;
-import at.gv.egiz.smcc.SignatureCardException;
-import at.gv.egiz.stal.ErrorResponse;
-import at.gv.egiz.stal.STALRequest;
-import at.gv.egiz.stal.STALResponse;
-import at.gv.egiz.stal.ext.ActivatePINRequest;
-import at.gv.egiz.stal.ext.ChangePINRequest;
-import at.gv.egiz.stal.ext.UnblockPINRequest;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.smartcardio.Card;
-import javax.smartcardio.CardChannel;
-import javax.smartcardio.CardException;
-import javax.smartcardio.CommandAPDU;
-import javax.smartcardio.ResponseAPDU;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class PINMgmtRequestHandler extends AbstractRequestHandler implements PINStatusProvider {
-
-  protected static final Log log = LogFactory.getLog(PINMgmtRequestHandler.class);
-
-  @Override
-  public STALResponse handleRequest(STALRequest request) throws InterruptedException {
-    if (request instanceof ActivatePINRequest) {
-      log.error("not implemented yet");
-      return new ErrorResponse(1000);
-
-    } else if (request instanceof ChangePINRequest) {
-      log.error("not implemented yet");
-      return new ErrorResponse(1000);
-
-    } else if (request instanceof UnblockPINRequest) {
-      log.error("not implemented yet");
-      return new ErrorResponse(1000);
-
-    } else {
-      log.error("Got unexpected STAL request: " + request);
-      return new ErrorResponse(1000);
-    }
-  }
-
-  @Override
-  public boolean requireCard() {
-    return true;
-  }
-
-  @Override
-  public STATUS getPINStatus(int pin) throws SignatureCardException {
-    try {
-      Card icc = card.getCard();
-      icc.beginExclusive();
-      CardChannel channel = icc.getBasicChannel();
-      CommandAPDU verifyAPDU = new CommandAPDU(new byte[] {(byte) 0x00} );
-      ResponseAPDU responseAPDU = channel.transmit(verifyAPDU);
-      byte sw1 = (byte) responseAPDU.getSW1();
-      byte[] sw = new byte[] {
-                (byte) (0xFF & responseAPDU.getSW1()),
-                (byte) (0xFF & responseAPDU.getSW2()) };
-
-      icc.endExclusive();
-      return STATUS.ACTIV;
-    } catch (CardException ex) {
-      log.error("Failed to get PIN status: " + ex.getMessage());
-      throw new SignatureCardException("Failed to get PIN status", ex);
-    }
-  }
-
-}
diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
index 469af15f..e51044af 100644
--- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
+++ b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
@@ -15,10 +15,34 @@
 
 title.activation=<html>Aktivierung</html>
 title.pin.mgmt=<html>PIN Verwaltung</html>
-message.pin.mgmt=<html>under construction</html>
+title.activate.pin=<html>PIN Aktivieren</html>
+title.change.pin=<html>PIN \u00C4ndern</html>
+title.unblock.pin=<html>PIN Entsperren</html>
+
+message.pin.mgmt=<html>Die Karte verf\u00FCgt \u00FCber {0} PINs</html>
+message.activate.pin=<html>{0} eingeben und best\u00E4tigen</html>
+message.change.pin=<html>{0} eingeben und best\u00E4tigen</html>
+message.unblock.pin=<html>PUK zu {0} eingeben</html>
+
 label.activation=<html>e-card Aktivierungsprozess</html>
 label.activation.step=<html>Schritt {0}</html>
 label.activation.idle=<html>Warte auf Server...</html>
+label.old.pin=<html>Alte {0}:</html>
+label.new.pin=<html>Neue {0}:</html>
+label.repeat.pin=<html>Best\u00E4tigung:</html>
+
 button.activate=Aktivieren
 button.change=\u00C4ndern
-button.unblock=Entsperren
\ No newline at end of file
+button.unblock=Entsperren
+
+help.activation=help.activation
+help.pin.mgmt=help.pin.mgmt
+
+err.activate=<html>Beim Aktivieren der {0} trat ein Fehler auf.</html>
+err.change=<html>Beim \u00C4ndern der {0} trat ein Fehler auf.</html>
+err.unblock=<html>Das Entsperren der {0} wird nicht unterst\u00FCtzt.</html>
+
+status.not.active=NICHT AKTIV
+status.active=AKTIV
+status.blocked=GESPERRT
+status.unknown=UNBEKANNT
diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
index 16ac7d0b..1cf4a102 100644
--- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
+++ b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
@@ -13,12 +13,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-title.activation=<html>Aktivation</html>
+title.activation=<html>Activation</html>
 title.pin.mgmt=<html>PIN Management</html>
-message.pin.mgmt=<html>under construction</html>
+title.activate.pin=<html>Activate PIN</html>
+title.change.pin=<html>Change PIN</html>
+title.unblock.pin=<html>Unblock PIN</html>
+
+message.pin.mgmt=<html>The smartcard has {0} PINs</html>
+message.activate.pin=<html>Enter and confirm {0}</html>
+message.change.pin=<html>Enter and confirm {0}</html>
+message.unblock.pin=<html>Enter PUK for {0}</html>
+
 label.activation=<html>e-card activation process</html>
 label.activation.step=<html>Step {0}</html>
 label.activation.idle=<html>Wait for server...</html>
+label.old.pin=<html>Old {0}:</html>
+label.new.pin=<html>New {0}:</html>
+label.repeat.pin=<html>Confirmation:</html>
+
 button.activate=Activate
 button.change=Change
-button.unblock=Unblock
\ No newline at end of file
+button.unblock=Unblock
+
+help.activation=help.activation
+help.pin.mgmt=help.pin.mgmt
+
+err.activate=<html>An error occured during activation of {0}.</html>
+err.change=<html>An error occured during changing of {0}.</html>
+err.unblock=<html>Unblocking of {0} is not supported.</html>
+
+status.not.active=Not active
+status.active=Active
+status.blocked=Blocked
+status.unknown=Unknown
diff --git a/BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java b/BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
index 669a63fc..ef8c87e4 100644
--- a/BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
+++ b/BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
@@ -25,8 +25,6 @@ import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -46,7 +44,7 @@ public class BKUGUIWorker implements Runnable {
   public void run() {
         try {
 
-    final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Signatur-PIN");
+    final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Signatur-PIN", (byte)0x00, null);
 
 
     final ActionListener cancelListener = new ActionListener() {
diff --git a/BKUAppletExt/src/test/resources/appletTest.html b/BKUAppletExt/src/test/resources/appletTest.html
index 9add4309..813ee1f0 100644
--- a/BKUAppletExt/src/test/resources/appletTest.html
+++ b/BKUAppletExt/src/test/resources/appletTest.html
@@ -19,7 +19,7 @@
     <center>
       <applet code="at.gv.egiz.bku.online.applet.PINManagementApplet.class"
               archive="../BKUAppletExt-1.0.2-SNAPSHOT.jar, commons-logging.jar , iaik_jce_me4se.jar"
-              width=152 height=145>
+              width=270 height=180>
               <param name="GuiStyle" value="simple"/>
               <param name="Locale" value="ja_JA"/>
               <!--param name="Background" value="jar:file:/home/clemens/workspace/mocca/BKUApplet/target/BKUApplet-1.0-SNAPSHOT.jar!/images/help.png"/-->
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index f564c07a..1d5a2cf4 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -38,9 +38,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.CellRendererPane;
 import javax.swing.GroupLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -51,7 +48,6 @@ import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
-import javax.swing.JTextField;
 import javax.swing.LayoutStyle;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
@@ -1064,7 +1060,9 @@ public class BKUGUIImpl implements BKUGUIFacade {
     @Override
     public char[] getPin() {
         if (pinField != null) {
-            return pinField.getPassword();
+          char[] pin = pinField.getPassword();
+          pinField = null;
+          return pin;
         }
         return null;
     }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
index 2054ae86..87b636f0 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
 import javax.swing.JButton;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
 import javax.swing.text.PlainDocument;
 
 /**
@@ -30,9 +31,10 @@ import javax.swing.text.PlainDocument;
  */
 class PINDocument extends PlainDocument {
 
-        private PINSpec pinSpec;
-        private Pattern pinPattern;
-        private JButton enterButton;
+        protected PINSpec pinSpec;
+        protected Pattern pinPattern;
+        protected JButton enterButton;
+        protected Document compareTo;
 
         public PINDocument(PINSpec pinSpec, JButton enterButton) {
             this.pinSpec = pinSpec;
@@ -44,6 +46,11 @@ class PINDocument extends PlainDocument {
             this.enterButton = enterButton;
         }
 
+        public PINDocument(PINSpec pinSpec, JButton enterButton, Document compareTo) {
+          this(pinSpec, enterButton);
+          this.compareTo = compareTo;
+        }
+
         @Override
         public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
             if (pinSpec.getMaxLength() < 0 || pinSpec.getMaxLength() >= (getLength() + str.length())) {
@@ -58,12 +65,23 @@ class PINDocument extends PlainDocument {
                     super.insertString(offs, str, a);
                 }
             }
-            enterButton.setEnabled(getLength() >= pinSpec.getMinLength());
+            if (enterButton != null) {
+              enterButton.setEnabled(getLength() >= pinSpec.getMinLength() && compare());
+            }
         }
 
         @Override
         public void remove(int offs, int len) throws BadLocationException {
             super.remove(offs, len);
-            enterButton.setEnabled(getLength() >= pinSpec.getMinLength());
+            if (enterButton != null) {
+              enterButton.setEnabled(getLength() >= pinSpec.getMinLength() && compare());
+            }
+        }
+
+        private boolean compare() throws BadLocationException {
+          if (compareTo == null) {
+            return true;
+          }
+          return compareTo.getText(0, compareTo.getLength()).equals(getText(0, getLength()));
         }
     }
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 8436a730..1e0bc9f5 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -20,7 +20,7 @@ title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
 title.cardpin=<html>Karte wird gelesen</html>
 title.sign=<html>Signatur erstellen</html>
 title.error=<html>Fehler</html>
-title.retry=<html>Falscher PIN</html>
+title.retry=<html>Falsche PIN</html>
 title.wait=<html>Bitte warten</html>
 title.hashdata=<html>Signaturdaten</html>
 windowtitle.save=Signaturdaten speichern
@@ -84,7 +84,7 @@ help.cardnotsupported=Nicht unterst\u00FCtzte B\u00FCrgerkarte
 help.insertcard=Keine B\u00FCrgerkarte im Kartenleser
 help.cardpin=Pineingabe
 help.signpin=Signatur-Pineingabe
-help.retry=Falscher Pin
+help.retry=Falsche Pin
 help.hashdata=Signierte Inhalte
 help.hashdatalist=Signierte Inhalte
 help.hashdataviewer=Anzeige signierter Inhalte
\ No newline at end of file
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 73aaab46..08ecaa7f 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
@@ -46,7 +46,7 @@ public class BKUGUIWorker implements Runnable {
   public void run() {
 //        try {
 
-    final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Signatur-PIN");
+    final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Signatur-PIN", (byte) 0x81, null);
 
 
     final ActionListener cancelListener = new ActionListener() {
diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/ActivatePINRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/ActivatePINRequest.java
deleted file mode 100644
index f2039388..00000000
--- a/STALExt/src/main/java/at/gv/egiz/stal/ext/ActivatePINRequest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.stal.ext;
-
-import at.gv.egiz.stal.STALRequest;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class ActivatePINRequest extends STALRequest {
-
-}
diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/ChangePINRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/ChangePINRequest.java
deleted file mode 100644
index ea508146..00000000
--- a/STALExt/src/main/java/at/gv/egiz/stal/ext/ChangePINRequest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.stal.ext;
-
-import at.gv.egiz.stal.STALRequest;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class ChangePINRequest extends STALRequest {
-
-}
diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementRequest.java
new file mode 100644
index 00000000..87c53e24
--- /dev/null
+++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementRequest.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.stal.ext;
+
+import at.gv.egiz.stal.STALRequest;
+
+/**
+ * Dummy STAL request to trigger PIN Management. (no proper STAL requests
+ * for PIN activation, unblocking)
+ *
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PINManagementRequest extends STALRequest {
+
+}
diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementResponse.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementResponse.java
new file mode 100644
index 00000000..b8b90604
--- /dev/null
+++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementResponse.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.stal.ext;
+
+import at.gv.egiz.stal.STALResponse;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PINManagementResponse extends STALResponse {
+
+}
diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/UnblockPINRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/UnblockPINRequest.java
deleted file mode 100644
index 543de31c..00000000
--- a/STALExt/src/main/java/at/gv/egiz/stal/ext/UnblockPINRequest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.stal.ext;
-
-import at.gv.egiz.stal.STALRequest;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class UnblockPINRequest extends STALRequest {
-
-}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
index ae4918ce..b64306aa 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
@@ -14,98 +14,105 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package at.gv.egiz.bku.slcommands.impl.xsect;
-
-import iaik.xml.crypto.dom.DOMCryptoContext;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.SequenceInputStream;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
+package at.gv.egiz.bku.slcommands.impl.xsect;
+
+import iaik.xml.crypto.dom.DOMCryptoContext;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.SequenceInputStream;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.crypto.MarshalException;
-import javax.xml.crypto.dom.DOMStructure;
-import javax.xml.crypto.dsig.CanonicalizationMethod;
-import javax.xml.crypto.dsig.DigestMethod;
-import javax.xml.crypto.dsig.Reference;
-import javax.xml.crypto.dsig.Transform;
-import javax.xml.crypto.dsig.XMLObject;
-import javax.xml.crypto.dsig.spec.TransformParameterSpec;
-import javax.xml.crypto.dsig.spec.XPathFilter2ParameterSpec;
-import javax.xml.crypto.dsig.spec.XPathType;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.DOMConfiguration;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-import org.w3c.dom.bootstrap.DOMImplementationRegistry;
-import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.LSException;
-import org.w3c.dom.ls.LSInput;
-import org.w3c.dom.ls.LSOutput;
-import org.w3c.dom.ls.LSParser;
-import org.w3c.dom.ls.LSSerializer;
-
-import at.buergerkarte.namespaces.securitylayer._1.Base64XMLLocRefOptRefContentType;
-import at.buergerkarte.namespaces.securitylayer._1.DataObjectInfoType;
-import at.buergerkarte.namespaces.securitylayer._1.MetaInfoType;
-import at.buergerkarte.namespaces.securitylayer._1.TransformsInfoType;
-import at.gv.egiz.bku.binding.HttpUtil;
-import at.gv.egiz.bku.slexceptions.SLCommandException;
-import at.gv.egiz.bku.slexceptions.SLRequestException;
-import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.dom.DOMStructure;
+import javax.xml.crypto.dsig.CanonicalizationMethod;
+import javax.xml.crypto.dsig.DigestMethod;
+import javax.xml.crypto.dsig.Reference;
+import javax.xml.crypto.dsig.Transform;
+import javax.xml.crypto.dsig.XMLObject;
+import javax.xml.crypto.dsig.spec.TransformParameterSpec;
+import javax.xml.crypto.dsig.spec.XPathFilter2ParameterSpec;
+import javax.xml.crypto.dsig.spec.XPathType;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.w3._2000._09.xmldsig_.TransformType;
+import org.w3._2000._09.xmldsig_.TransformsType;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+import org.w3c.dom.bootstrap.DOMImplementationRegistry;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSException;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSOutput;
+import org.w3c.dom.ls.LSParser;
+import org.w3c.dom.ls.LSSerializer;
+
+import at.buergerkarte.namespaces.securitylayer._1.Base64XMLLocRefOptRefContentType;
+import at.buergerkarte.namespaces.securitylayer._1.DataObjectInfoType;
+import at.buergerkarte.namespaces.securitylayer._1.MetaInfoType;
+import at.buergerkarte.namespaces.securitylayer._1.TransformsInfoType;
+import at.gv.egiz.bku.binding.HttpUtil;
+import at.gv.egiz.bku.slexceptions.SLCommandException;
+import at.gv.egiz.bku.slexceptions.SLRequestException;
+import at.gv.egiz.bku.slexceptions.SLRuntimeException;
 import at.gv.egiz.bku.slexceptions.SLViewerException;
-import at.gv.egiz.bku.utils.urldereferencer.StreamData;
-import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
+import at.gv.egiz.bku.utils.urldereferencer.StreamData;
+import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
 import at.gv.egiz.bku.viewer.ValidationException;
 import at.gv.egiz.bku.viewer.Validator;
 import at.gv.egiz.bku.viewer.ValidatorFactory;
-import at.gv.egiz.dom.DOMUtils;
-import at.gv.egiz.slbinding.impl.XMLContentType;
-
-/**
- * This class represents a <code>DataObject</code> of an XML-Signature
- * created by the security layer command <code>CreateXMLSignature</code>.
- * 
- * @author mcentner
- */
-public class DataObject {
-
-  /**
-   * Logging facility.
-   */
-  private static Log log = LogFactory.getLog(DataObject.class);
-  
-  /**
-   * DOM Implementation.
-   */
-  private static final String DOM_LS_3_0 = "LS 3.0";
-
-  /**
-   * The array of the default preferred MIME type order.
-   */
-  private static final String[] DEFAULT_PREFFERED_MIME_TYPES = 
-    new String[] {
+import at.gv.egiz.dom.DOMUtils;
+import at.gv.egiz.marshal.NamespacePrefix;
+import at.gv.egiz.marshal.NamespacePrefixMapperImpl;
+import at.gv.egiz.slbinding.impl.XMLContentType;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+/**
+ * This class represents a <code>DataObject</code> of an XML-Signature
+ * created by the security layer command <code>CreateXMLSignature</code>.
+ * 
+ * @author mcentner
+ */
+public class DataObject {
+
+  /**
+   * Logging facility.
+   */
+  private static Log log = LogFactory.getLog(DataObject.class);
+  
+  /**
+   * DOM Implementation.
+   */
+  private static final String DOM_LS_3_0 = "LS 3.0";
+
+  /**
+   * The array of the default preferred MIME type order.
+   */
+  private static final String[] DEFAULT_PREFFERED_MIME_TYPES = 
+    new String[] {
       "text/plain",
-      "application/xhtml+xml" 
+      "application/xhtml+xml" 
     };
   
   /**
@@ -149,87 +156,87 @@ public class DataObject {
     validMimeTypes = mediaTypes;
   }
   
-  /**
-   * The DOM implementation used.
-   */
-  private DOMImplementationLS domImplLS;
-
-  /**
-   * The signature context.
-   */
-  private SignatureContext ctx;
-  
-  /**
-   * The Reference for this DataObject.
-   */
-  private XSECTReference reference;
-  
-  /**
-   * The XMLObject for this DataObject.
-   */
-  private XMLObject xmlObject;
-  
-  /**
-   * The MIME-Type of the digest input.
-   */
-  private String mimeType;
-  
-  /**
-   * An optional description of the digest input.
-   */
-  private String description;
-  
-  /**
-   * Creates a new instance.
-   * 
-   * @param document the document of the target signature
-   */
-  public DataObject(SignatureContext signatureContext) {
-    this.ctx = signatureContext;
-    
-    DOMImplementationRegistry registry;
-    try {
-      registry = DOMImplementationRegistry.newInstance();
-    } catch (Exception e) {
-      log.error("Failed to get DOMImplementationRegistry.", e);
-      throw new SLRuntimeException("Failed to get DOMImplementationRegistry.");
-    }
-
-    domImplLS = (DOMImplementationLS) registry.getDOMImplementation(DOM_LS_3_0);
-    if (domImplLS == null) {
-      log.error("Failed to get DOMImplementation " + DOM_LS_3_0);
-      throw new SLRuntimeException("Failed to get DOMImplementation " + DOM_LS_3_0);
-    }
-
-  }
-
-  /**
-   * @return the reference
-   */
-  public Reference getReference() {
-    return reference;
-  }
-
-  /**
-   * @return the xmlObject
-   */
-  public XMLObject getXmlObject() {
-    return xmlObject;
-  }
-
-  /**
-   * @return the mimeType
-   */
-  public String getMimeType() {
-    return mimeType;
-  }
-
-  /**
-   * @return the description
-   */
-  public String getDescription() {
-    return description;
-  }
+  /**
+   * The DOM implementation used.
+   */
+  private DOMImplementationLS domImplLS;
+
+  /**
+   * The signature context.
+   */
+  private SignatureContext ctx;
+  
+  /**
+   * The Reference for this DataObject.
+   */
+  private XSECTReference reference;
+  
+  /**
+   * The XMLObject for this DataObject.
+   */
+  private XMLObject xmlObject;
+  
+  /**
+   * The MIME-Type of the digest input.
+   */
+  private String mimeType;
+  
+  /**
+   * An optional description of the digest input.
+   */
+  private String description;
+  
+  /**
+   * Creates a new instance.
+   * 
+   * @param document the document of the target signature
+   */
+  public DataObject(SignatureContext signatureContext) {
+    this.ctx = signatureContext;
+    
+    DOMImplementationRegistry registry;
+    try {
+      registry = DOMImplementationRegistry.newInstance();
+    } catch (Exception e) {
+      log.error("Failed to get DOMImplementationRegistry.", e);
+      throw new SLRuntimeException("Failed to get DOMImplementationRegistry.");
+    }
+
+    domImplLS = (DOMImplementationLS) registry.getDOMImplementation(DOM_LS_3_0);
+    if (domImplLS == null) {
+      log.error("Failed to get DOMImplementation " + DOM_LS_3_0);
+      throw new SLRuntimeException("Failed to get DOMImplementation " + DOM_LS_3_0);
+    }
+
+  }
+
+  /**
+   * @return the reference
+   */
+  public Reference getReference() {
+    return reference;
+  }
+
+  /**
+   * @return the xmlObject
+   */
+  public XMLObject getXmlObject() {
+    return xmlObject;
+  }
+
+  /**
+   * @return the mimeType
+   */
+  public String getMimeType() {
+    return mimeType;
+  }
+
+  /**
+   * @return the description
+   */
+  public String getDescription() {
+    return description;
+  }
 
   public void validateHashDataInput() throws SLViewerException {
     
@@ -293,823 +300,920 @@ public class DataObject {
     }
     
   }
-  
-  /**
-   * Configures this DataObject with the information provided within the given
-   * <code>sl:DataObjectInfo</code>.
-   * 
-   * @param dataObjectInfo
-   *          the <code>sl:DataObjectInfo</code>
-   * 
-   * @throws SLCommandException
-   *           if configuring this DataObject with the information provided in
-   *           the <code>sl:DataObjectInfo</code> fails.
-   * @throws SLRequestException
-   *           if the information provided in the <code>sl:DataObjectInfo</code>
-   *           does not conform to the security layer specification.
-   * @throws NullPointerException
-   *           if <code>dataObjectInfo</code> is <code>null</code>
-   */
-  public void setDataObjectInfo(DataObjectInfoType dataObjectInfo) throws SLCommandException, SLRequestException {
-  
-    Base64XMLLocRefOptRefContentType dataObject = dataObjectInfo.getDataObject();
-    String structure = dataObjectInfo.getStructure();
-    
-    // select and unmarshal an appropriate transformation path if provided
-    // and set the final data meta information
-    XSECTTransforms transforms = createTransformsAndSetFinalDataMetaInfo(dataObjectInfo.getTransformsInfo());
-  
-    if ("enveloping".equals(structure)) {
-      
-      // configure this DataObject as an enveloped DataObject
-      setEnvelopedDataObject(dataObject, transforms);
-      
-    } else if ("detached".equals(structure)) {
-      
-      // configure this DataObject as an detached DataObject
-      setDetachedDataObject(dataObject, transforms);
-      
-    } 
-    // other values are not allowed by the schema and are therefore ignored
-    
-  }
-
-  /**
-   * Configures this DataObject as an enveloped DataObject with the information
-   * provided within the given <code>sl:DataObject</code>.
-   * 
-   * @param dataObject
-   *          the <code>sl:DataObject</code>
-   * @param transforms
-   *          an optional <code>Transforms</code> element (may be
-   *          <code>null</code>)
-   * 
-   * @throws SLCommandException
-   *           if configuring this DataObject with the information provided in
-   *           the <code>sl:DataObject</code> fails.
-   * @throws SLRequestException
-   *           if the information provided in the <code>sl:DataObject</code>
-   *           does not conform to the security layer specification.
-   * @throws NullPointerException
-   *           if <code>dataObject</code> is <code>null</code>
-   */
-  private void setEnvelopedDataObject(
-      Base64XMLLocRefOptRefContentType dataObject, XSECTTransforms transforms)
-      throws SLCommandException, SLRequestException {
-    
-    String reference = dataObject.getReference();
-    if (reference == null) {
-      //
-      // case A
-      //
-      // The Reference attribute is not used; the content of sl:DataObject represents the data object. 
-      // If the data object is XML-coded (the sl:XMLContent element is used in sl:DataObject), then it 
-      // must be incorporated in the signature structure as parsed XML.
-      //
-
-      if (dataObject.getBase64Content() != null) {
-
-        log.debug("Adding DataObject (Base64Content) without a reference URI.");
-
-        // create XMLObject
-        XMLObject xmlObject = createXMLObject(new ByteArrayInputStream(dataObject.getBase64Content()));
-
-        setXMLObjectAndReferenceBase64(xmlObject, transforms);
-        
-      } else if (dataObject.getXMLContent() != null) {
-        
-        log.debug("Adding DataObject (XMLContent) without a reference URI.");
-
-        // create XMLObject
-        DocumentFragment content = parseDataObject((XMLContentType) dataObject.getXMLContent());
-        XMLObject xmlObject = createXMLObject(content);
-        
-        setXMLObjectAndReferenceXML(xmlObject, transforms);
-        
-      } else if (dataObject.getLocRefContent() != null) {
-        
-        log.debug("Adding DataObject (LocRefContent) without a reference URI.");
-        
-        setEnvelopedDataObject(dataObject.getLocRefContent(), transforms);
-        
-      } else {
-        
-        // not allowed
-        log.info("XML structure of the command request contains an " +
-                "invalid combination of optional elements or attributes. " +
-            "DataObject of structure='enveloped' without a reference must contain content.");
-        throw new SLRequestException(3003);
-        
-      }
-      
-    } else {
-      
-      if (dataObject.getBase64Content() == null &&
-          dataObject.getXMLContent() == null &&
-          dataObject.getLocRefContent() == null) {
-
-        //
-        // case B
-        //
-        // The Reference attribute contains a URI that must be resolved by the 
-        // Citizen Card Environment to obtain the data object. 
-        // The content of sl:DataObject remains empty
-        //
-        
-        log.debug("Adding DataObject from reference URI '" + reference + "'.");
-        
-        setEnvelopedDataObject(reference, transforms);
-        
-      } else {
-        
-        // not allowed
-        log.info("XML structure of the command request contains an " +
-            "invalid combination of optional elements or attributes. " +
-        "DataObject of structure='enveloped' with reference must not contain content.");
-        throw new SLRequestException(3003);
-        
-      }
-      
-      
-    }
-    
-  }
-
-  /**
-   * Configures this DataObject as an enveloped DataObject with the content to
-   * be dereferenced from the given <code>reference</code>.
-   * 
-   * @param reference
-   *          the <code>reference</code> URI
-   * @param transforms
-   *          an optional <code>Transforms</code> element (may be
-   *          <code>null</code>)
-   * 
-   * @throws SLCommandException
-   *           if dereferencing the given <code>reference</code> fails, or if
-   *           configuring this DataObject with the data dereferenced from the
-   *           given <code>reference</code> fails.
-   * @throws NullPointerException
-   *           if <code>reference</code> is <code>null</code>
-   */
-  private void setEnvelopedDataObject(String reference, XSECTTransforms transforms) throws SLCommandException {
-
-    if (reference == null) {
-      throw new NullPointerException("Argument 'reference' must not be null.");
-    }
-    
-    // dereference URL
-    URLDereferencer dereferencer = URLDereferencer.getInstance();
-    
-    StreamData streamData;
-    try {
-      streamData = dereferencer.dereference(reference, ctx.getDereferencerContext());
-    } catch (IOException e) {
-      log.info("Failed to dereference XMLObject from '" + reference + "'.", e);
-      throw new SLCommandException(4110);
-    }
-
-    Node childNode;
-    
-    String contentType = streamData.getContentType();
-    if (contentType.startsWith("text/xml")) {
-  
-      // If content type is text/xml parse content.
-      String charset = HttpUtil.getCharset(contentType, true);
-      
-      Document doc = parseDataObject(streamData.getStream(), charset);
-      
-      childNode = doc.getDocumentElement();
-      
-      if (childNode == null) {
-        log.info("Failed to parse XMLObject from '" + reference + "'.");
-        throw new SLCommandException(4111);
-      }
-      
-      XMLObject xmlObject = createXMLObject(childNode);
-      
-      setXMLObjectAndReferenceXML(xmlObject, transforms);
-      
-    } else {
-  
-      // Include content Base64 encoded.
-      XMLObject xmlObject = createXMLObject(streamData.getStream());
-      
-      setXMLObjectAndReferenceBase64(xmlObject, transforms);
-      
-    }
-    
-  }
-
-  /**
-   * Configures this DataObject as an detached DataObject with the information
-   * provided in the given <code>sl:DataObject</code> and optionally
-   * <code>transforms</code>.
-   * 
-   * @param dataObject
-   *          the <code>sl:DataObject</code>
-   * @param transforms
-   *          an optional Transforms object, may be <code>null</code>
-   * 
-   * @throws SLCommandException
-   *           if configuring this DataObject with the information provided in
-   *           the <code>sl:DataObject</code> fails.
-   * @throws SLRequestException
-   *           if the information provided in the <code>sl:DataObject</code>
-   *           does not conform to the security layer specification.
-   * @throws NullPointerException
-   *           if <code>dataObject</code> is <code>null</code>
-   */
-  private void setDetachedDataObject(
-      Base64XMLLocRefOptRefContentType dataObject, XSECTTransforms transforms)
-      throws SLCommandException, SLRequestException {
-    
-    String referenceURI = dataObject.getReference();
-    
-    if (referenceURI == null) {
-      
-      // not allowed
-      log.info("XML structure of the command request contains an " +
-          "invalid combination of optional elements or attributes. " +
-      "DataObject of structure='detached' must contain a reference.");
-      throw new SLRequestException(3003);
-
-    } else {
-      
-      DigestMethod dm;
-      try {
-        dm = ctx.getAlgorithmMethodFactory().createDigestMethod(ctx);
-      } catch (NoSuchAlgorithmException e) {
-        log.error("Failed to get DigestMethod.", e);
-        throw new SLCommandException(4006);
-      } catch (InvalidAlgorithmParameterException e) {
-        log.error("Failed to get DigestMethod.", e);
-        throw new SLCommandException(4006);
-      }
-      
-      String idValue = ctx.getIdValueFactory().createIdValue("Reference");
-      
-      reference = new XSECTReference(referenceURI, dm, transforms, null, idValue);
-      
-      // case D:
-      //
-      // The Reference attribute contains a URI that is used by the Citizen Card
-      // Environment to code the reference to the data object as part of the XML
-      // signature (attribute URI in the dsig:Reference) element. The content of
-      // sl:DataObject represents the data object.
-      
-      if (dataObject.getLocRefContent() != null) {
-        String locRef = dataObject.getLocRefContent();
-        try {
-          this.reference.setDereferencer(new LocRefDereferencer(ctx.getDereferencerContext(), locRef));
-        } catch (URISyntaxException e) {
-          log.info("Invalid URI '" + locRef + "' in DataObject.", e);
-          throw new SLCommandException(4003);
-        } catch (IllegalArgumentException e) {
-          log.info("LocRef URI of '" + locRef + "' not supported in DataObject. ", e);
-          throw new SLCommandException(4003);
-        }
-      } else if (dataObject.getBase64Content() != null) {
-        byte[] base64Content = dataObject.getBase64Content();
-        this.reference.setDereferencer(new ByteArrayDereferencer(base64Content));
-      } else if (dataObject.getXMLContent() != null) {
-        XMLContentType xmlContent = (XMLContentType) dataObject.getXMLContent();
-        byte[] bytes = xmlContent.getRedirectedStream().toByteArray();
-        this.reference.setDereferencer(new ByteArrayDereferencer(bytes));
-      } else {
-        
-        // case C:
-        //
-        // The Reference attribute contains a URI that must be resolved by the
-        // Citizen Card Environment to obtain the data object. The Reference
-        // attribute contains a URI that is used by the Citizen Card Environment
-        // to code the reference to the data object as part of the XML signature
-        // (attribute URI in the dsig:Reference) element. The content of
-        // sl:DataObject remains empty.
-
-      }
-      
-    }     
-  }
-
-  /**
-   * Returns the preferred <code>sl:TransformInfo</code> from the given list of
-   * <code>transformInfos</code>, or <code>null</code> if none of the given
-   * <code>transformInfos</code> is preferred over the others.
-   * 
-   * @param transformsInfos
-   *          a list of <code>sl:TransformInfo</code>s
-   * 
-   * @return the selected <code>sl:TransformInfo</code> or <code>null</code>, if
-   *         none is preferred over the others
-   */
-  private TransformsInfoType selectPreferredTransformsInfo(List<TransformsInfoType> transformsInfos) {
-    
-    Map<String, TransformsInfoType> mimeTypes = new HashMap<String, TransformsInfoType>();
-    
-    StringBuilder debugString = null;
-    if (log.isDebugEnabled()) {
-      debugString = new StringBuilder();
-      debugString.append("Got " + transformsInfos.size() + " TransformsInfo(s):");
-    }
-    
-    for (TransformsInfoType transformsInfoType : transformsInfos) {
-      MetaInfoType finalDataMetaInfo = transformsInfoType.getFinalDataMetaInfo();
-      String mimeType = finalDataMetaInfo.getMimeType();
-      String description = finalDataMetaInfo.getDescription();
-      mimeTypes.put(mimeType, transformsInfoType);
-      if (debugString != null) {
-        debugString.append("\n FinalDataMetaInfo: MIME-Type=");
-        debugString.append(mimeType);
-        if (description != null) {
-          debugString.append(" ");
-          debugString.append(description);
-        }
-      }
-    }
-
-    if (debugString != null) {
-      log.debug(debugString);
-    }
-
-    // look for preferred transform
-    for (String mimeType : DEFAULT_PREFFERED_MIME_TYPES) {
-      if (mimeTypes.containsKey(mimeType)) {
-        return mimeTypes.get(mimeType);
-      }
-    }
-    
-    // no preferred transform
-    return null;
-    
-  }
-
-  /**
-   * Create an instance of <code>ds:Transforms</code> from the given
-   * <code>sl:TransformsInfo</code>.
-   * 
-   * @param transformsInfo
-   *          the <code>sl:TransformsInfo</code>
-   * 
-   * @return a corresponding unmarshalled <code>ds:Transforms</code>, or
-   *         <code>null</code> if the given <code>sl:TransformsInfo</code> does
-   *         not contain a <code>dsig:Transforms</code> element
-   * 
-   * @throws SLRequestException
-   *           if the <code>ds:Transforms</code> in the given
-   *           <code>transformsInfo</code> are not valid or cannot be parsed.
-   * 
-   * @throws MarshalException
-   *           if the <code>ds:Transforms</code> in the given
-   *           <code>transformsInfo</code> cannot be unmarshalled.
-   */
-  private XSECTTransforms createTransforms(TransformsInfoType transformsInfo) throws SLRequestException, MarshalException {
-    
-    ByteArrayOutputStream redirectedStream = ((at.gv.egiz.slbinding.impl.TransformsInfoType) transformsInfo).getRedirectedStream();
-    byte[] transformBytes = (redirectedStream != null) ? redirectedStream.toByteArray() : null;
-    
-    if (transformBytes != null && transformBytes.length > 0) {
-
-      // debug
-      if (log.isTraceEnabled()) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Trying to parse transforms:\n");
-        sb.append(new String(transformBytes, Charset.forName("UTF-8")));
-        log.trace(sb);
-      }
-      
-      DOMImplementationLS domImplLS = DOMUtils.getDOMImplementationLS();
-      LSInput input = domImplLS.createLSInput();
-      input.setByteStream(new ByteArrayInputStream(transformBytes));
-
-      LSParser parser = domImplLS.createLSParser(
-          DOMImplementationLS.MODE_SYNCHRONOUS, null);
-      DOMConfiguration domConfig = parser.getDomConfig();
-      SimpleDOMErrorHandler errorHandler = new SimpleDOMErrorHandler();
-      domConfig.setParameter("error-handler", errorHandler);
-      domConfig.setParameter("validate", Boolean.FALSE);
-
-      Document document;
-      try {
-        document = parser.parse(input);
-      } catch (DOMException e) {
-        log.info("Failed to parse dsig:Transforms.", e);
-        throw new SLRequestException(3002);
-      } catch (LSException e) {
-        log.info("Failed to parse dsig:Transforms.", e);
-        throw new SLRequestException(3002);
-      }
-
-      // adopt ds:Transforms
-      Element documentElement = document.getDocumentElement();
-      Node adoptedTransforms = ctx.getDocument().adoptNode(documentElement);
-
-      DOMCryptoContext context = new DOMCryptoContext();
-
-      // unmarshall ds:Transforms
-      return new XSECTTransforms(context, adoptedTransforms);
-
-    } else {
-      return null;
-    }
-    
-  }
-  
-  /**
-   * Sets the <code>mimeType</code> and the <code>description</code> value
-   * for this DataObject.
-   * 
-   * @param metaInfoType the <code>sl:FinalMetaDataInfo</code>
-   * 
-   * @throws NullPointerException if <code>metaInfoType</code> is <code>null</code>
-   */
-  private void setFinalDataMetaInfo(MetaInfoType metaInfoType) {
-    
-    this.mimeType = metaInfoType.getMimeType();
-    this.description = metaInfoType.getDescription();
-    
-  }
-  
-  /**
-   * Selects an appropriate transformation path (if present) from the given list
-   * of <code>sl:TransformInfos</code>, sets the corresponding final data meta info and
-   * returns the corresponding unmarshalled <code>ds:Transforms</code>.
-   * 
-   * @param transformsInfos the <code>sl:TransformInfos</code>
-   * 
-   * @return the unmarshalled <code>ds:Transforms</code>, or <code>null</code> if
-   * no transformation path has been selected.
-   * 
-   * @throws SLRequestException if the given list <code>ds:TransformsInfo</code> contains
-   * an invalid <code>ds:Transforms</code> element, or no suitable transformation path
-   * can be found. 
-   */
-  private XSECTTransforms createTransformsAndSetFinalDataMetaInfo(
-      List<TransformsInfoType> transformsInfos) throws SLRequestException {
-
-    TransformsInfoType preferredTransformsInfo = selectPreferredTransformsInfo(transformsInfos);
-    // try preferred transform
-    if (preferredTransformsInfo != null) {
-
-      try {
-        XSECTTransforms transforms = createTransforms(preferredTransformsInfo);
-        setFinalDataMetaInfo(preferredTransformsInfo.getFinalDataMetaInfo());
-        return transforms;
-      } catch (MarshalException e) {
-      
-        String mimeType = preferredTransformsInfo.getFinalDataMetaInfo().getMimeType();
-        log.info("Failed to unmarshal preferred transformation path (MIME-Type="
-            + mimeType + ").", e);
-      
-      }
-
-    }
-
-    // look for another suitable transformation path
-    for (TransformsInfoType transformsInfoType : transformsInfos) {
-      
-      try {
-        XSECTTransforms transforms = createTransforms(transformsInfoType);
-        setFinalDataMetaInfo(transformsInfoType.getFinalDataMetaInfo());
-        return transforms;
-      } catch (MarshalException e) {
-
-        String mimeType = transformsInfoType.getFinalDataMetaInfo().getMimeType();
-        log.info("Failed to unmarshal transformation path (MIME-Type="
-            + mimeType + ").", e);
-      }
-      
-    }
-
-    // no suitable transformation path found
-    throw new SLRequestException(3003);
-    
-  }
-
-  /**
-   * Create an XMLObject with the Base64 encoding of the given
-   * <code>content</code>.
-   * 
-   * @param content
-   *          the to-be Base64 encoded content
-   * @return an XMLObject with the Base64 encoded <code>content</code>
-   */
-  private XMLObject createXMLObject(InputStream content) {
-    
-    Text textNode;
-    try {
-      textNode = at.gv.egiz.dom.DOMUtils.createBase64Text(content, ctx.getDocument());
-    } catch (IOException e) {
-      log.error(e);
-      throw new SLRuntimeException(e);
-    }
-
-    DOMStructure structure = new DOMStructure(textNode);
-    
-    String idValue = ctx.getIdValueFactory().createIdValue("Object");
-
-    return ctx.getSignatureFactory().newXMLObject(Collections.singletonList(structure), idValue, null, null);
-    
-  }
-  
-  /**
-   * Create an XMLObject with the given <code>content</code> node.
-   * 
-   * @param content the content node
-   * 
-   * @return an XMLObject with the given <code>content</code>
-   */
-  private XMLObject createXMLObject(Node content) {
-    
-    String idValue = ctx.getIdValueFactory().createIdValue("Object");
-    
-    List<DOMStructure> structures = Collections.singletonList(new DOMStructure(content));
-    
-    return ctx.getSignatureFactory().newXMLObject(structures, idValue, null, null);
-    
-  }
-
-  /**
-   * Sets the given <code>xmlObject</code> and creates and sets a corresponding
-   * <code>Reference</code>.
-   * <p>
-   * A transform to Base64-decode the xmlObject's content is inserted at the top
-   * of to the optional <code>transforms</code> if given, or to a newly created
-   * <code>Transforms</code> element if <code>transforms</code> is
-   * <code>null</code>.
-   * 
-   * @param xmlObject
-   *          the XMLObject
-   * @param transforms
-   *          an optional <code>Transforms</code> element (may be
-   *          <code>null</code>)
-   * 
-   * @throws SLCommandException
-   *           if creating the Reference fails
-   * @throws NullPointerException
-   *           if <code>xmlObject</code> is <code>null</code>
-   */
-  private void setXMLObjectAndReferenceBase64(XMLObject xmlObject, XSECTTransforms transforms) throws SLCommandException {
-    
-    // create reference URI
-    //
-    // NOTE: the ds:Object can be referenced directly, as the Base64 transform
-    // operates on the text() of the input nodelist.
-    //
-    String referenceURI = "#" + xmlObject.getId();
-  
-    // create Base64 Transform
-    Transform transform;
-    try {
-      transform = ctx.getSignatureFactory().newTransform(Transform.BASE64, (TransformParameterSpec) null);
-    } catch (NoSuchAlgorithmException e) {
-      // algorithm must be present
-      throw new SLRuntimeException(e);
-    } catch (InvalidAlgorithmParameterException e) {
-      // algorithm does not take parameters
-      throw new SLRuntimeException(e);
-    }
-    
-    if (transforms == null) {
-      transforms = new XSECTTransforms(Collections.singletonList(transform)); 
-    } else {
-      transforms.insertTransform(transform);
-    }
-  
-    DigestMethod dm;
-    try {
-      dm = ctx.getAlgorithmMethodFactory().createDigestMethod(ctx);
-    } catch (NoSuchAlgorithmException e) {
-      log.error("Failed to get DigestMethod.", e);
-      throw new SLCommandException(4006);
-    } catch (InvalidAlgorithmParameterException e) {
-      log.error("Failed to get DigestMethod.", e);
-      throw new SLCommandException(4006);
-    }
-    String id = ctx.getIdValueFactory().createIdValue("Reference");
-    
-    this.xmlObject = xmlObject;
-    this.reference = new XSECTReference(referenceURI, dm, transforms, null, id);
-    
-  }
-
-  /**
-   * Sets the given <code>xmlObject</code> and creates and sets a corresponding
-   * <code>Reference</code>.
-   * <p>
-   * A transform to select the xmlObject's content is inserted at the top of to
-   * the optional <code>transforms</code> if given, or to a newly created
-   * <code>Transforms</code> element if <code>transforms</code> is
-   * <code>null</code>.
-   * </p>
-   * 
-   * @param xmlObject
-   *          the XMLObject
-   * @param transforms
-   *          an optional <code>Transforms</code> element (may be
-   *          <code>null</code>)
-   * 
-   * @throws SLCommandException
-   *           if creating the Reference fails
-   * @throws NullPointerException
-   *           if <code>xmlObject</code> is <code>null</code>
-   */
-  private void setXMLObjectAndReferenceXML(XMLObject xmlObject, XSECTTransforms transforms) throws SLCommandException {
-    
-    // create reference URI
-    String referenceURI = "#" + xmlObject.getId();
-    
-    // create Transform to select ds:Object's children
-    Transform xpathTransform;
-    Transform c14nTransform;
-    try {
-
-      XPathType xpath = new XPathType("id(\"" + xmlObject.getId() + "\")/node()", XPathType.Filter.INTERSECT);
-      List<XPathType> xpaths = Collections.singletonList(xpath);
-      XPathFilter2ParameterSpec params = new XPathFilter2ParameterSpec(xpaths);
-
-      xpathTransform = ctx.getSignatureFactory().newTransform(Transform.XPATH2, params);
-
-      // add exclusive canonicalization to avoid signing the namespace context of the ds:Object
-      c14nTransform = ctx.getSignatureFactory().newTransform(CanonicalizationMethod.EXCLUSIVE, (TransformParameterSpec) null);
-      
-    } catch (NoSuchAlgorithmException e) {
-      // algorithm must be present
-      throw new SLRuntimeException(e);
-    } catch (InvalidAlgorithmParameterException e) {
-      // params must be appropriate
-      throw new SLRuntimeException(e);
-    }
-  
-    if (transforms == null) {
-      List<Transform> newTransfroms = new ArrayList<Transform>();
-      newTransfroms.add(xpathTransform);
-      newTransfroms.add(c14nTransform);
-      transforms = new XSECTTransforms(newTransfroms);
-    } else {
-      transforms.insertTransform(xpathTransform);
-    }
-    
-    DigestMethod dm;
-    try {
-      dm = ctx.getAlgorithmMethodFactory().createDigestMethod(ctx);
-    } catch (NoSuchAlgorithmException e) {
-      log.error("Failed to get DigestMethod.", e);
-      throw new SLCommandException(4006);
-    } catch (InvalidAlgorithmParameterException e) {
-      log.error("Failed to get DigestMethod.", e);
-      throw new SLCommandException(4006);
-    }
-    String id = ctx.getIdValueFactory().createIdValue("Reference");
-
-    this.xmlObject = xmlObject;
-    this.reference = new XSECTReference(referenceURI, dm, transforms, null, id);
-    
-  }
-
-  /**
-   * Parses the given <code>xmlContent</code> and returns a corresponding
-   * document fragment.
-   * 
-   * <p>
-   * The to-be parsed content is surrounded by <dummy> ... </dummy> elements to
-   * allow for mixed (e.g. Text and Element) content in XMLContent.
-   * </p>
-   * 
-   * @param xmlContent
-   *          the XMLContent to-be parsed
-   * 
-   * @return a document fragment containing the parsed nodes
-   * 
-   * @throws SLCommandException
-   *           if parsing the given <code>xmlContent</code> fails
-   * 
-   * @throws NullPointerException
-   *           if <code>xmlContent</code> is <code>null</code>
-   */
-  private DocumentFragment parseDataObject(XMLContentType xmlContent) throws SLCommandException {
-    
-    ByteArrayOutputStream redirectedStream =  xmlContent.getRedirectedStream();
-  
-    // Note: We can assume a fixed character encoding of UTF-8 for the
-    // content of the redirect stream as the content has already been parsed
-    // and serialized again to the redirect stream.
-    
-    List<InputStream> inputStreams = new ArrayList<InputStream>();
-    try {
-      // dummy start element
-      inputStreams.add(new ByteArrayInputStream("<dummy>".getBytes("UTF-8")));
-  
-      // content
-      inputStreams.add(new ByteArrayInputStream(redirectedStream.toByteArray()));
-      
-      // dummy end element
-      inputStreams.add(new ByteArrayInputStream("</dummy>".getBytes("UTF-8")));
-    } catch (UnsupportedEncodingException e) {
-      throw new SLRuntimeException(e);
-    }
-    
-    SequenceInputStream inputStream = new SequenceInputStream(Collections.enumeration(inputStreams));
-  
-    // parse DataObject
-    Document doc = parseDataObject(inputStream, "UTF-8");
-    
-    Element documentElement = doc.getDocumentElement();
-  
-    if (documentElement == null ||
-        !"dummy".equals(documentElement.getLocalName())) {
-      log.info("Failed to parse DataObject XMLContent.");
-      throw new SLCommandException(4111);
-    }
-    
-    DocumentFragment fragment = doc.createDocumentFragment();
-    while (documentElement.getFirstChild() != null) {
-      fragment.appendChild(documentElement.getFirstChild());
-    }
-    
-    // log parsed document
-    if (log.isTraceEnabled()) {
-      
-      StringWriter writer = new StringWriter();
-      
-      writer.write("DataObject:\n");
-      
-      LSOutput output = domImplLS.createLSOutput();
-      output.setCharacterStream(writer);
-      output.setEncoding("UTF-8");
-      LSSerializer serializer = domImplLS.createLSSerializer();
-      serializer.getDomConfig().setParameter("xml-declaration", Boolean.FALSE);
-      serializer.write(fragment, output);
-      
-      log.trace(writer.toString());
-    }
-    
-    return fragment;
-    
-  }
-
-  /**
-   * Parses the given <code>inputStream</code> using the given
-   * <code>encoding</code> and returns the parsed document.
-   * 
-   * @param inputStream
-   *          the to-be parsed input
-   * 
-   * @param encoding
-   *          the encoding to be used for parsing the given
-   *          <code>inputStream</code>
-   * 
-   * @return the parsed document
-   * 
-   * @throws SLCommandException
-   *           if parsing the <code>inputStream</code> fails.
-   * 
-   * @throws NullPointerException
-   *           if <code>inputStram</code> is <code>null</code>
-   */
-  private Document parseDataObject(InputStream inputStream, String encoding) throws SLCommandException {
-
-    LSInput input = domImplLS.createLSInput();
-    input.setByteStream(inputStream);
-
-    if (encoding != null) {
-      input.setEncoding(encoding);
-    }
-    
-    LSParser parser = domImplLS.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, null);
-    DOMConfiguration domConfig = parser.getDomConfig();
-    SimpleDOMErrorHandler errorHandler = new SimpleDOMErrorHandler();
-    domConfig.setParameter("error-handler", errorHandler);
-    domConfig.setParameter("validate", Boolean.FALSE);
-
-    Document doc;
-    try {
-      doc = parser.parse(input);
-    } catch (DOMException e) {
-      log.info("Existing XML document cannot be parsed.", e);
-      throw new SLCommandException(4111);
-    } catch (LSException e) {
-      log.info("Existing XML document cannot be parsed. ", e);
-      throw new SLCommandException(4111);
-    }
-    
-    if (errorHandler.hasErrors()) {
-      // log errors
-      if (log.isInfoEnabled()) {
-        List<String> errorMessages = errorHandler.getErrorMessages();
-        StringBuffer sb = new StringBuffer();
-        for (String errorMessage : errorMessages) {
-          sb.append(" ");
-          sb.append(errorMessage);
-        }
-        log.info("Existing XML document cannot be parsed. " + sb.toString());
-      }
-      throw new SLCommandException(4111);
-    }
-
-    return doc;
-    
-  }
-
-
-}
+  
+  /**
+   * Configures this DataObject with the information provided within the given
+   * <code>sl:DataObjectInfo</code>.
+   * 
+   * @param dataObjectInfo
+   *          the <code>sl:DataObjectInfo</code>
+   * 
+   * @throws SLCommandException
+   *           if configuring this DataObject with the information provided in
+   *           the <code>sl:DataObjectInfo</code> fails.
+   * @throws SLRequestException
+   *           if the information provided in the <code>sl:DataObjectInfo</code>
+   *           does not conform to the security layer specification.
+   * @throws NullPointerException
+   *           if <code>dataObjectInfo</code> is <code>null</code>
+   */
+  public void setDataObjectInfo(DataObjectInfoType dataObjectInfo) throws SLCommandException, SLRequestException {
+  
+    Base64XMLLocRefOptRefContentType dataObject = dataObjectInfo.getDataObject();
+    String structure = dataObjectInfo.getStructure();
+    
+    // select and unmarshal an appropriate transformation path if provided
+    // and set the final data meta information
+    XSECTTransforms transforms = createTransformsAndSetFinalDataMetaInfo(dataObjectInfo.getTransformsInfo());
+  
+    if ("enveloping".equals(structure)) {
+      
+      // configure this DataObject as an enveloped DataObject
+      setEnvelopedDataObject(dataObject, transforms);
+      
+    } else if ("detached".equals(structure)) {
+      
+      // configure this DataObject as an detached DataObject
+      setDetachedDataObject(dataObject, transforms);
+      
+    } 
+    // other values are not allowed by the schema and are therefore ignored
+    
+  }
+
+  private byte[] getTransformsBytes(at.gv.egiz.slbinding.impl.TransformsInfoType ti) {
+    return ti.getRedirectedStream().toByteArray();
+//    byte[] transformsBytes = ti.getRedirectedStream().toByteArray();
+//
+//    if (transformsBytes == null || transformsBytes.length == 0) {
+//      return null;
+//    }
+//
+//    String dsigPrefix = ti.getNamespaceContext().getNamespaceURI("http://www.w3.org/2000/09/xmldsig#");
+//    byte[] pre, post;
+//    if (dsigPrefix == null) {
+//      log.trace("XMLDSig not declared in outside dsig:Transforms");
+//      pre = "<AssureDSigNS>".getBytes();
+//      post = "</AssureDSigNS>".getBytes();
+//    } else {
+//      log.trace("XMLDSig bound to prefix " + dsigPrefix);
+//       pre = ("<AssureDSigNS xmlns:" + dsigPrefix + "=\"http://www.w3.org/2000/09/xmldsig#\">").getBytes();
+//       post = "</AssureDSigNS>".getBytes();
+//    }
+//
+//    byte[] workaround = new byte[pre.length + transformsBytes.length + post.length];
+//    System.arraycopy(pre, 0, workaround, 0, pre.length);
+//    System.arraycopy(transformsBytes, 0, workaround, pre.length, transformsBytes.length);
+//    System.arraycopy(post, 0, workaround, pre.length + transformsBytes.length, post.length);
+//    return workaround;
+  }
+
+  /**
+   * Configures this DataObject as an enveloped DataObject with the information
+   * provided within the given <code>sl:DataObject</code>.
+   * 
+   * @param dataObject
+   *          the <code>sl:DataObject</code>
+   * @param transforms
+   *          an optional <code>Transforms</code> element (may be
+   *          <code>null</code>)
+   * 
+   * @throws SLCommandException
+   *           if configuring this DataObject with the information provided in
+   *           the <code>sl:DataObject</code> fails.
+   * @throws SLRequestException
+   *           if the information provided in the <code>sl:DataObject</code>
+   *           does not conform to the security layer specification.
+   * @throws NullPointerException
+   *           if <code>dataObject</code> is <code>null</code>
+   */
+  private void setEnvelopedDataObject(
+      Base64XMLLocRefOptRefContentType dataObject, XSECTTransforms transforms)
+      throws SLCommandException, SLRequestException {
+    
+    String reference = dataObject.getReference();
+    if (reference == null) {
+      //
+      // case A
+      //
+      // The Reference attribute is not used; the content of sl:DataObject represents the data object. 
+      // If the data object is XML-coded (the sl:XMLContent element is used in sl:DataObject), then it 
+      // must be incorporated in the signature structure as parsed XML.
+      //
+
+      if (dataObject.getBase64Content() != null) {
+
+        log.debug("Adding DataObject (Base64Content) without a reference URI.");
+
+        // create XMLObject
+        XMLObject xmlObject = createXMLObject(new ByteArrayInputStream(dataObject.getBase64Content()));
+
+        setXMLObjectAndReferenceBase64(xmlObject, transforms);
+        
+      } else if (dataObject.getXMLContent() != null) {
+        
+        log.debug("Adding DataObject (XMLContent) without a reference URI.");
+
+        // create XMLObject
+        DocumentFragment content = parseDataObject((XMLContentType) dataObject.getXMLContent());
+        XMLObject xmlObject = createXMLObject(content);
+        
+        setXMLObjectAndReferenceXML(xmlObject, transforms);
+        
+      } else if (dataObject.getLocRefContent() != null) {
+        
+        log.debug("Adding DataObject (LocRefContent) without a reference URI.");
+        
+        setEnvelopedDataObject(dataObject.getLocRefContent(), transforms);
+        
+      } else {
+        
+        // not allowed
+        log.info("XML structure of the command request contains an " +
+                "invalid combination of optional elements or attributes. " +
+            "DataObject of structure='enveloped' without a reference must contain content.");
+        throw new SLRequestException(3003);
+        
+      }
+      
+    } else {
+      
+      if (dataObject.getBase64Content() == null &&
+          dataObject.getXMLContent() == null &&
+          dataObject.getLocRefContent() == null) {
+
+        //
+        // case B
+        //
+        // The Reference attribute contains a URI that must be resolved by the 
+        // Citizen Card Environment to obtain the data object. 
+        // The content of sl:DataObject remains empty
+        //
+        
+        log.debug("Adding DataObject from reference URI '" + reference + "'.");
+        
+        setEnvelopedDataObject(reference, transforms);
+        
+      } else {
+        
+        // not allowed
+        log.info("XML structure of the command request contains an " +
+            "invalid combination of optional elements or attributes. " +
+        "DataObject of structure='enveloped' with reference must not contain content.");
+        throw new SLRequestException(3003);
+        
+      }
+      
+      
+    }
+    
+  }
+
+  /**
+   * Configures this DataObject as an enveloped DataObject with the content to
+   * be dereferenced from the given <code>reference</code>.
+   * 
+   * @param reference
+   *          the <code>reference</code> URI
+   * @param transforms
+   *          an optional <code>Transforms</code> element (may be
+   *          <code>null</code>)
+   * 
+   * @throws SLCommandException
+   *           if dereferencing the given <code>reference</code> fails, or if
+   *           configuring this DataObject with the data dereferenced from the
+   *           given <code>reference</code> fails.
+   * @throws NullPointerException
+   *           if <code>reference</code> is <code>null</code>
+   */
+  private void setEnvelopedDataObject(String reference, XSECTTransforms transforms) throws SLCommandException {
+
+    if (reference == null) {
+      throw new NullPointerException("Argument 'reference' must not be null.");
+    }
+    
+    // dereference URL
+    URLDereferencer dereferencer = URLDereferencer.getInstance();
+    
+    StreamData streamData;
+    try {
+      streamData = dereferencer.dereference(reference, ctx.getDereferencerContext());
+    } catch (IOException e) {
+      log.info("Failed to dereference XMLObject from '" + reference + "'.", e);
+      throw new SLCommandException(4110);
+    }
+
+    Node childNode;
+    
+    String contentType = streamData.getContentType();
+    if (contentType.startsWith("text/xml")) {
+  
+      // If content type is text/xml parse content.
+      String charset = HttpUtil.getCharset(contentType, true);
+      
+      Document doc = parseDataObject(streamData.getStream(), charset);
+      
+      childNode = doc.getDocumentElement();
+      
+      if (childNode == null) {
+        log.info("Failed to parse XMLObject from '" + reference + "'.");
+        throw new SLCommandException(4111);
+      }
+      
+      XMLObject xmlObject = createXMLObject(childNode);
+      
+      setXMLObjectAndReferenceXML(xmlObject, transforms);
+      
+    } else {
+  
+      // Include content Base64 encoded.
+      XMLObject xmlObject = createXMLObject(streamData.getStream());
+      
+      setXMLObjectAndReferenceBase64(xmlObject, transforms);
+      
+    }
+    
+  }
+
+  /**
+   * Configures this DataObject as an detached DataObject with the information
+   * provided in the given <code>sl:DataObject</code> and optionally
+   * <code>transforms</code>.
+   * 
+   * @param dataObject
+   *          the <code>sl:DataObject</code>
+   * @param transforms
+   *          an optional Transforms object, may be <code>null</code>
+   * 
+   * @throws SLCommandException
+   *           if configuring this DataObject with the information provided in
+   *           the <code>sl:DataObject</code> fails.
+   * @throws SLRequestException
+   *           if the information provided in the <code>sl:DataObject</code>
+   *           does not conform to the security layer specification.
+   * @throws NullPointerException
+   *           if <code>dataObject</code> is <code>null</code>
+   */
+  private void setDetachedDataObject(
+      Base64XMLLocRefOptRefContentType dataObject, XSECTTransforms transforms)
+      throws SLCommandException, SLRequestException {
+    
+    String referenceURI = dataObject.getReference();
+    
+    if (referenceURI == null) {
+      
+      // not allowed
+      log.info("XML structure of the command request contains an " +
+          "invalid combination of optional elements or attributes. " +
+      "DataObject of structure='detached' must contain a reference.");
+      throw new SLRequestException(3003);
+
+    } else {
+      
+      DigestMethod dm;
+      try {
+        dm = ctx.getAlgorithmMethodFactory().createDigestMethod(ctx);
+      } catch (NoSuchAlgorithmException e) {
+        log.error("Failed to get DigestMethod.", e);
+        throw new SLCommandException(4006);
+      } catch (InvalidAlgorithmParameterException e) {
+        log.error("Failed to get DigestMethod.", e);
+        throw new SLCommandException(4006);
+      }
+      
+      String idValue = ctx.getIdValueFactory().createIdValue("Reference");
+      
+      reference = new XSECTReference(referenceURI, dm, transforms, null, idValue);
+      
+      // case D:
+      //
+      // The Reference attribute contains a URI that is used by the Citizen Card
+      // Environment to code the reference to the data object as part of the XML
+      // signature (attribute URI in the dsig:Reference) element. The content of
+      // sl:DataObject represents the data object.
+      
+      if (dataObject.getLocRefContent() != null) {
+        String locRef = dataObject.getLocRefContent();
+        try {
+          this.reference.setDereferencer(new LocRefDereferencer(ctx.getDereferencerContext(), locRef));
+        } catch (URISyntaxException e) {
+          log.info("Invalid URI '" + locRef + "' in DataObject.", e);
+          throw new SLCommandException(4003);
+        } catch (IllegalArgumentException e) {
+          log.info("LocRef URI of '" + locRef + "' not supported in DataObject. ", e);
+          throw new SLCommandException(4003);
+        }
+      } else if (dataObject.getBase64Content() != null) {
+        byte[] base64Content = dataObject.getBase64Content();
+        this.reference.setDereferencer(new ByteArrayDereferencer(base64Content));
+      } else if (dataObject.getXMLContent() != null) {
+        XMLContentType xmlContent = (XMLContentType) dataObject.getXMLContent();
+        byte[] bytes = xmlContent.getRedirectedStream().toByteArray();
+        this.reference.setDereferencer(new ByteArrayDereferencer(bytes));
+      } else {
+        
+        // case C:
+        //
+        // The Reference attribute contains a URI that must be resolved by the
+        // Citizen Card Environment to obtain the data object. The Reference
+        // attribute contains a URI that is used by the Citizen Card Environment
+        // to code the reference to the data object as part of the XML signature
+        // (attribute URI in the dsig:Reference) element. The content of
+        // sl:DataObject remains empty.
+
+      }
+      
+    }     
+  }
+
+  /**
+   * Returns the preferred <code>sl:TransformInfo</code> from the given list of
+   * <code>transformInfos</code>, or <code>null</code> if none of the given
+   * <code>transformInfos</code> is preferred over the others.
+   * 
+   * @param transformsInfos
+   *          a list of <code>sl:TransformInfo</code>s
+   * 
+   * @return the selected <code>sl:TransformInfo</code> or <code>null</code>, if
+   *         none is preferred over the others
+   */
+  private TransformsInfoType selectPreferredTransformsInfo(List<TransformsInfoType> transformsInfos) {
+    
+    Map<String, TransformsInfoType> mimeTypes = new HashMap<String, TransformsInfoType>();
+    
+    StringBuilder debugString = null;
+    if (log.isDebugEnabled()) {
+      debugString = new StringBuilder();
+      debugString.append("Got " + transformsInfos.size() + " TransformsInfo(s):");
+    }
+    
+    for (TransformsInfoType transformsInfoType : transformsInfos) {
+      MetaInfoType finalDataMetaInfo = transformsInfoType.getFinalDataMetaInfo();
+      String mimeType = finalDataMetaInfo.getMimeType();
+      String description = finalDataMetaInfo.getDescription();
+      mimeTypes.put(mimeType, transformsInfoType);
+      if (debugString != null) {
+        debugString.append("\n FinalDataMetaInfo: MIME-Type=");
+        debugString.append(mimeType);
+        if (description != null) {
+          debugString.append(" ");
+          debugString.append(description);
+        }
+      }
+    }
+
+    if (debugString != null) {
+      log.debug(debugString);
+    }
+
+    // look for preferred transform
+    for (String mimeType : DEFAULT_PREFFERED_MIME_TYPES) {
+      if (mimeTypes.containsKey(mimeType)) {
+        return mimeTypes.get(mimeType);
+      }
+    }
+    
+    // no preferred transform
+    return null;
+    
+  }
+
+  /**
+   * Create an instance of <code>ds:Transforms</code> from the given
+   * <code>sl:TransformsInfo</code>.
+   * 
+   * @param transformsInfo
+   *          the <code>sl:TransformsInfo</code>
+   * 
+   * @return a corresponding unmarshalled <code>ds:Transforms</code>, or
+   *         <code>null</code> if the given <code>sl:TransformsInfo</code> does
+   *         not contain a <code>dsig:Transforms</code> element
+   * 
+   * @throws SLRequestException
+   *           if the <code>ds:Transforms</code> in the given
+   *           <code>transformsInfo</code> are not valid or cannot be parsed.
+   * 
+   * @throws MarshalException
+   *           if the <code>ds:Transforms</code> in the given
+   *           <code>transformsInfo</code> cannot be unmarshalled.
+   */
+  private XSECTTransforms createTransforms(TransformsInfoType transformsInfo) throws SLRequestException, MarshalException {
+
+    byte[] transforms = getTransformsBytes((at.gv.egiz.slbinding.impl.TransformsInfoType) transformsInfo);
+
+    if (transforms != null && transforms.length > 0) {
+      // debug
+      if (log.isTraceEnabled()) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Trying to parse transforms:\n");
+        sb.append(new String(transforms, Charset.forName("UTF-8")));
+        log.trace(sb);
+      }
+
+      DOMImplementationLS domImplLS = DOMUtils.getDOMImplementationLS();
+      LSInput input = domImplLS.createLSInput();
+      input.setByteStream(new ByteArrayInputStream(transforms));
+
+      LSParser parser = domImplLS.createLSParser(
+          DOMImplementationLS.MODE_SYNCHRONOUS, null);
+      DOMConfiguration domConfig = parser.getDomConfig();
+      SimpleDOMErrorHandler errorHandler = new SimpleDOMErrorHandler();
+      domConfig.setParameter("error-handler", errorHandler);
+      domConfig.setParameter("validate", Boolean.FALSE);
+
+      Document document;
+      try {
+        document = parser.parse(input);
+      } catch (DOMException e) {
+        log.info("Failed to parse dsig:Transforms.", e);
+        throw new SLRequestException(3002);
+      } catch (LSException e) {
+        log.info("Failed to parse dsig:Transforms.", e);
+        throw new SLRequestException(3002);
+      }
+
+      // adopt ds:Transforms
+      Element transformsElt = document.getDocumentElement();
+      Node adoptedTransforms = ctx.getDocument().adoptNode(transformsElt);
+
+      DOMCryptoContext context = new DOMCryptoContext();
+
+      // unmarshall ds:Transforms
+      return new XSECTTransforms(context, adoptedTransforms);
+
+    } else {
+      return null;
+    }
+
+
+//    TransformsType transformsType = transformsInfo.getTransforms();
+//    if (transformsType == null) {
+//      return null;
+//    }
+//    List<TransformType> transformList = transformsType.getTransform();
+//
+//    DOMImplementationLS domImplLS = DOMUtils.getDOMImplementationLS();
+////    Document transformsDoc = ((DOMImplementation) domImplLS).createDocument("http://www.w3.org/2000/09/xmldsig#", "Transforms", null);
+////    Element transforms = transformsDoc.getDocumentElement();
+//    Document transformsDoc = DOMUtils.createDocument();
+//    Element transforms = transformsDoc.createElementNS(
+//            "http://www.w3.org/2000/09/xmldsig#",
+//            Signature.XMLDSIG_PREFIX + ":Transforms");
+//    transformsDoc.appendChild(transforms);
+//
+//    for (TransformType transformType : transformList) {
+//      log.trace("found " + transformType.getClass().getName());
+//      Element transform = transformsDoc.createElementNS(
+//              "http://www.w3.org/2000/09/xmldsig#",
+//              Signature.XMLDSIG_PREFIX + ":Transform");
+//      String algorithm = transformType.getAlgorithm();
+//      if (algorithm != null) {
+//        log.trace("found algorithm " + algorithm);
+//        transform.setAttribute("Algorithm", algorithm);
+//      }
+//
+//      at.gv.egiz.slbinding.impl.TransformType t = (at.gv.egiz.slbinding.impl.TransformType) transformType;
+//      byte[] redirectedBytes = t.getRedirectedStream().toByteArray();
+//      if (redirectedBytes != null && redirectedBytes.length > 0) {
+//        if (log.isTraceEnabled()) {
+//          StringBuilder sb = new StringBuilder();
+//          sb.append("Trying to parse dsig:Transform:\n");
+//          sb.append(new String(redirectedBytes, Charset.forName("UTF-8")));
+//          log.trace(sb);
+//        }
+//        LSInput input = domImplLS.createLSInput();
+//        input.setByteStream(new ByteArrayInputStream(redirectedBytes));
+//
+//        LSParser parser = domImplLS.createLSParser(
+//            DOMImplementationLS.MODE_SYNCHRONOUS, null);
+//        DOMConfiguration domConfig = parser.getDomConfig();
+//        SimpleDOMErrorHandler errorHandler = new SimpleDOMErrorHandler();
+//        domConfig.setParameter("error-handler", errorHandler);
+//        domConfig.setParameter("validate", Boolean.FALSE);
+//
+//        try {
+//          Document redirectedDoc = parser.parse(input);
+//          Node redirected = transformsDoc.adoptNode(redirectedDoc.getDocumentElement());
+//          transform.appendChild(redirected);
+//
+//          //not supported by Xerces2.9.1
+////          Node redirected = parser.parseWithContext(input, transform, LSParser.ACTION_APPEND_AS_CHILDREN);
+//
+//        } catch (DOMException e) {
+//          log.info("Failed to parse dsig:Transform.", e);
+//          throw new SLRequestException(3002);
+//        } catch (LSException e) {
+//          log.info("Failed to parse dsig:Transform.", e);
+//          throw new SLRequestException(3002);
+//        }
+//      }
+//      transforms.appendChild(transform);
+//    }
+//
+//    //adopt ds:Transforms
+//    Node adoptedTransforms = ctx.getDocument().adoptNode(transforms);
+//    DOMCryptoContext context = new DOMCryptoContext();
+//
+//    // unmarshall ds:Transforms
+//    return new XSECTTransforms(context, adoptedTransforms);
+
+  }
+  
+  /**
+   * Sets the <code>mimeType</code> and the <code>description</code> value
+   * for this DataObject.
+   * 
+   * @param metaInfoType the <code>sl:FinalMetaDataInfo</code>
+   * 
+   * @throws NullPointerException if <code>metaInfoType</code> is <code>null</code>
+   */
+  private void setFinalDataMetaInfo(MetaInfoType metaInfoType) {
+    
+    this.mimeType = metaInfoType.getMimeType();
+    this.description = metaInfoType.getDescription();
+    
+  }
+  
+  /**
+   * Selects an appropriate transformation path (if present) from the given list
+   * of <code>sl:TransformInfos</code>, sets the corresponding final data meta info and
+   * returns the corresponding unmarshalled <code>ds:Transforms</code>.
+   * 
+   * @param transformsInfos the <code>sl:TransformInfos</code>
+   * 
+   * @return the unmarshalled <code>ds:Transforms</code>, or <code>null</code> if
+   * no transformation path has been selected.
+   * 
+   * @throws SLRequestException if the given list <code>ds:TransformsInfo</code> contains
+   * an invalid <code>ds:Transforms</code> element, or no suitable transformation path
+   * can be found. 
+   */
+  private XSECTTransforms createTransformsAndSetFinalDataMetaInfo(
+      List<TransformsInfoType> transformsInfos) throws SLRequestException {
+
+    TransformsInfoType preferredTransformsInfo = selectPreferredTransformsInfo(transformsInfos);
+    // try preferred transform
+    if (preferredTransformsInfo != null) {
+
+      try {
+        XSECTTransforms transforms = createTransforms(preferredTransformsInfo);
+        setFinalDataMetaInfo(preferredTransformsInfo.getFinalDataMetaInfo());
+        return transforms;
+      } catch (MarshalException e) {
+      
+        String mimeType = preferredTransformsInfo.getFinalDataMetaInfo().getMimeType();
+        log.info("Failed to unmarshal preferred transformation path (MIME-Type="
+            + mimeType + ").", e);
+      
+      }
+
+    }
+
+    // look for another suitable transformation path
+    for (TransformsInfoType transformsInfoType : transformsInfos) {
+      
+      try {
+        XSECTTransforms transforms = createTransforms(transformsInfoType);
+        setFinalDataMetaInfo(transformsInfoType.getFinalDataMetaInfo());
+        return transforms;
+      } catch (MarshalException e) {
+
+        String mimeType = transformsInfoType.getFinalDataMetaInfo().getMimeType();
+        log.info("Failed to unmarshal transformation path (MIME-Type="
+            + mimeType + ").", e);
+      }
+      
+    }
+
+    // no suitable transformation path found
+    throw new SLRequestException(3003);
+    
+  }
+
+  /**
+   * Create an XMLObject with the Base64 encoding of the given
+   * <code>content</code>.
+   * 
+   * @param content
+   *          the to-be Base64 encoded content
+   * @return an XMLObject with the Base64 encoded <code>content</code>
+   */
+  private XMLObject createXMLObject(InputStream content) {
+    
+    Text textNode;
+    try {
+      textNode = at.gv.egiz.dom.DOMUtils.createBase64Text(content, ctx.getDocument());
+    } catch (IOException e) {
+      log.error(e);
+      throw new SLRuntimeException(e);
+    }
+
+    DOMStructure structure = new DOMStructure(textNode);
+    
+    String idValue = ctx.getIdValueFactory().createIdValue("Object");
+
+    return ctx.getSignatureFactory().newXMLObject(Collections.singletonList(structure), idValue, null, null);
+    
+  }
+  
+  /**
+   * Create an XMLObject with the given <code>content</code> node.
+   * 
+   * @param content the content node
+   * 
+   * @return an XMLObject with the given <code>content</code>
+   */
+  private XMLObject createXMLObject(Node content) {
+    
+    String idValue = ctx.getIdValueFactory().createIdValue("Object");
+    
+    List<DOMStructure> structures = Collections.singletonList(new DOMStructure(content));
+    
+    return ctx.getSignatureFactory().newXMLObject(structures, idValue, null, null);
+    
+  }
+
+  /**
+   * Sets the given <code>xmlObject</code> and creates and sets a corresponding
+   * <code>Reference</code>.
+   * <p>
+   * A transform to Base64-decode the xmlObject's content is inserted at the top
+   * of to the optional <code>transforms</code> if given, or to a newly created
+   * <code>Transforms</code> element if <code>transforms</code> is
+   * <code>null</code>.
+   * 
+   * @param xmlObject
+   *          the XMLObject
+   * @param transforms
+   *          an optional <code>Transforms</code> element (may be
+   *          <code>null</code>)
+   * 
+   * @throws SLCommandException
+   *           if creating the Reference fails
+   * @throws NullPointerException
+   *           if <code>xmlObject</code> is <code>null</code>
+   */
+  private void setXMLObjectAndReferenceBase64(XMLObject xmlObject, XSECTTransforms transforms) throws SLCommandException {
+    
+    // create reference URI
+    //
+    // NOTE: the ds:Object can be referenced directly, as the Base64 transform
+    // operates on the text() of the input nodelist.
+    //
+    String referenceURI = "#" + xmlObject.getId();
+  
+    // create Base64 Transform
+    Transform transform;
+    try {
+      transform = ctx.getSignatureFactory().newTransform(Transform.BASE64, (TransformParameterSpec) null);
+    } catch (NoSuchAlgorithmException e) {
+      // algorithm must be present
+      throw new SLRuntimeException(e);
+    } catch (InvalidAlgorithmParameterException e) {
+      // algorithm does not take parameters
+      throw new SLRuntimeException(e);
+    }
+    
+    if (transforms == null) {
+      transforms = new XSECTTransforms(Collections.singletonList(transform)); 
+    } else {
+      transforms.insertTransform(transform);
+    }
+  
+    DigestMethod dm;
+    try {
+      dm = ctx.getAlgorithmMethodFactory().createDigestMethod(ctx);
+    } catch (NoSuchAlgorithmException e) {
+      log.error("Failed to get DigestMethod.", e);
+      throw new SLCommandException(4006);
+    } catch (InvalidAlgorithmParameterException e) {
+      log.error("Failed to get DigestMethod.", e);
+      throw new SLCommandException(4006);
+    }
+    String id = ctx.getIdValueFactory().createIdValue("Reference");
+    
+    this.xmlObject = xmlObject;
+    this.reference = new XSECTReference(referenceURI, dm, transforms, null, id);
+    
+  }
+
+  /**
+   * Sets the given <code>xmlObject</code> and creates and sets a corresponding
+   * <code>Reference</code>.
+   * <p>
+   * A transform to select the xmlObject's content is inserted at the top of to
+   * the optional <code>transforms</code> if given, or to a newly created
+   * <code>Transforms</code> element if <code>transforms</code> is
+   * <code>null</code>.
+   * </p>
+   * 
+   * @param xmlObject
+   *          the XMLObject
+   * @param transforms
+   *          an optional <code>Transforms</code> element (may be
+   *          <code>null</code>)
+   * 
+   * @throws SLCommandException
+   *           if creating the Reference fails
+   * @throws NullPointerException
+   *           if <code>xmlObject</code> is <code>null</code>
+   */
+  private void setXMLObjectAndReferenceXML(XMLObject xmlObject, XSECTTransforms transforms) throws SLCommandException {
+    
+    // create reference URI
+    String referenceURI = "#" + xmlObject.getId();
+    
+    // create Transform to select ds:Object's children
+    Transform xpathTransform;
+    Transform c14nTransform;
+    try {
+
+      XPathType xpath = new XPathType("id(\"" + xmlObject.getId() + "\")/node()", XPathType.Filter.INTERSECT);
+      List<XPathType> xpaths = Collections.singletonList(xpath);
+      XPathFilter2ParameterSpec params = new XPathFilter2ParameterSpec(xpaths);
+
+      xpathTransform = ctx.getSignatureFactory().newTransform(Transform.XPATH2, params);
+
+      // add exclusive canonicalization to avoid signing the namespace context of the ds:Object
+      c14nTransform = ctx.getSignatureFactory().newTransform(CanonicalizationMethod.EXCLUSIVE, (TransformParameterSpec) null);
+      
+    } catch (NoSuchAlgorithmException e) {
+      // algorithm must be present
+      throw new SLRuntimeException(e);
+    } catch (InvalidAlgorithmParameterException e) {
+      // params must be appropriate
+      throw new SLRuntimeException(e);
+    }
+  
+    if (transforms == null) {
+      List<Transform> newTransfroms = new ArrayList<Transform>();
+      newTransfroms.add(xpathTransform);
+      newTransfroms.add(c14nTransform);
+      transforms = new XSECTTransforms(newTransfroms);
+    } else {
+      transforms.insertTransform(xpathTransform);
+    }
+    
+    DigestMethod dm;
+    try {
+      dm = ctx.getAlgorithmMethodFactory().createDigestMethod(ctx);
+    } catch (NoSuchAlgorithmException e) {
+      log.error("Failed to get DigestMethod.", e);
+      throw new SLCommandException(4006);
+    } catch (InvalidAlgorithmParameterException e) {
+      log.error("Failed to get DigestMethod.", e);
+      throw new SLCommandException(4006);
+    }
+    String id = ctx.getIdValueFactory().createIdValue("Reference");
+
+    this.xmlObject = xmlObject;
+    this.reference = new XSECTReference(referenceURI, dm, transforms, null, id);
+    
+  }
+
+  /**
+   * Parses the given <code>xmlContent</code> and returns a corresponding
+   * document fragment.
+   * 
+   * <p>
+   * The to-be parsed content is surrounded by <dummy> ... </dummy> elements to
+   * allow for mixed (e.g. Text and Element) content in XMLContent.
+   * </p>
+   * 
+   * @param xmlContent
+   *          the XMLContent to-be parsed
+   * 
+   * @return a document fragment containing the parsed nodes
+   * 
+   * @throws SLCommandException
+   *           if parsing the given <code>xmlContent</code> fails
+   * 
+   * @throws NullPointerException
+   *           if <code>xmlContent</code> is <code>null</code>
+   */
+  private DocumentFragment parseDataObject(XMLContentType xmlContent) throws SLCommandException {
+    
+    ByteArrayOutputStream redirectedStream =  xmlContent.getRedirectedStream();
+  
+    // Note: We can assume a fixed character encoding of UTF-8 for the
+    // content of the redirect stream as the content has already been parsed
+    // and serialized again to the redirect stream.
+    
+    List<InputStream> inputStreams = new ArrayList<InputStream>();
+    try {
+      // dummy start element
+      inputStreams.add(new ByteArrayInputStream("<dummy>".getBytes("UTF-8")));
+  
+      // content
+      inputStreams.add(new ByteArrayInputStream(redirectedStream.toByteArray()));
+      
+      // dummy end element
+      inputStreams.add(new ByteArrayInputStream("</dummy>".getBytes("UTF-8")));
+    } catch (UnsupportedEncodingException e) {
+      throw new SLRuntimeException(e);
+    }
+    
+    SequenceInputStream inputStream = new SequenceInputStream(Collections.enumeration(inputStreams));
+  
+    // parse DataObject
+    Document doc = parseDataObject(inputStream, "UTF-8");
+    
+    Element documentElement = doc.getDocumentElement();
+  
+    if (documentElement == null ||
+        !"dummy".equals(documentElement.getLocalName())) {
+      log.info("Failed to parse DataObject XMLContent.");
+      throw new SLCommandException(4111);
+    }
+    
+    DocumentFragment fragment = doc.createDocumentFragment();
+    while (documentElement.getFirstChild() != null) {
+      fragment.appendChild(documentElement.getFirstChild());
+    }
+    
+    // log parsed document
+    if (log.isTraceEnabled()) {
+      
+      StringWriter writer = new StringWriter();
+      
+      writer.write("DataObject:\n");
+      
+      LSOutput output = domImplLS.createLSOutput();
+      output.setCharacterStream(writer);
+      output.setEncoding("UTF-8");
+      LSSerializer serializer = domImplLS.createLSSerializer();
+      serializer.getDomConfig().setParameter("xml-declaration", Boolean.FALSE);
+      serializer.write(fragment, output);
+      
+      log.trace(writer.toString());
+    }
+    
+    return fragment;
+    
+  }
+
+  /**
+   * Parses the given <code>inputStream</code> using the given
+   * <code>encoding</code> and returns the parsed document.
+   * 
+   * @param inputStream
+   *          the to-be parsed input
+   * 
+   * @param encoding
+   *          the encoding to be used for parsing the given
+   *          <code>inputStream</code>
+   * 
+   * @return the parsed document
+   * 
+   * @throws SLCommandException
+   *           if parsing the <code>inputStream</code> fails.
+   * 
+   * @throws NullPointerException
+   *           if <code>inputStram</code> is <code>null</code>
+   */
+  private Document parseDataObject(InputStream inputStream, String encoding) throws SLCommandException {
+
+    LSInput input = domImplLS.createLSInput();
+    input.setByteStream(inputStream);
+
+    if (encoding != null) {
+      input.setEncoding(encoding);
+    }
+    
+    LSParser parser = domImplLS.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, null);
+    DOMConfiguration domConfig = parser.getDomConfig();
+    SimpleDOMErrorHandler errorHandler = new SimpleDOMErrorHandler();
+    domConfig.setParameter("error-handler", errorHandler);
+    domConfig.setParameter("validate", Boolean.FALSE);
+
+    Document doc;
+    try {
+      doc = parser.parse(input);
+    } catch (DOMException e) {
+      log.info("Existing XML document cannot be parsed.", e);
+      throw new SLCommandException(4111);
+    } catch (LSException e) {
+      log.info("Existing XML document cannot be parsed. ", e);
+      throw new SLCommandException(4111);
+    }
+    
+    if (errorHandler.hasErrors()) {
+      // log errors
+      if (log.isInfoEnabled()) {
+        List<String> errorMessages = errorHandler.getErrorMessages();
+        StringBuffer sb = new StringBuffer();
+        for (String errorMessage : errorMessages) {
+          sb.append(" ");
+          sb.append(errorMessage);
+        }
+        log.info("Existing XML document cannot be parsed. " + sb.toString());
+      }
+      throw new SLCommandException(4111);
+    }
+
+    return doc;
+    
+  }
+
+
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/Signature.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/Signature.java
index 8baa0137..9182e824 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/Signature.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/Signature.java
@@ -87,6 +87,8 @@ import at.gv.egiz.bku.utils.urldereferencer.StreamData;
 import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
 import at.gv.egiz.bku.utils.urldereferencer.URLDereferencerContext;
 import at.gv.egiz.dom.DOMUtils;
+import at.gv.egiz.marshal.NamespacePrefix;
+import at.gv.egiz.marshal.NamespacePrefixMapperImpl;
 import at.gv.egiz.slbinding.impl.XMLContentType;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.xades.QualifyingPropertiesException;
@@ -99,6 +101,7 @@ import at.gv.egiz.xades.QualifyingPropertiesFactory;
  * @author mcentner
  */
 public class Signature {
+  public static final String XMLDSIG_PREFIX = "dsig";
   
   /**
    * Logging facility.
@@ -407,7 +410,7 @@ public class Signature {
     
     signContext.setProperty("javax.xml.crypto.dsig.cacheReference", Boolean.TRUE);
     
-    signContext.putNamespacePrefix(XMLSignature.XMLNS, "dsig");
+    signContext.putNamespacePrefix(XMLSignature.XMLNS,XMLDSIG_PREFIX); 
     
     signContext.setURIDereferencer(new URIDereferncerAdapter(ctx.getDereferencerContext()));
     
diff --git a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
index 78172dcb..7ce7b42d 100644
--- a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
+++ b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
@@ -14,185 +14,186 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package at.gv.egiz.bku.slcommands.impl.xsect;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import iaik.xml.crypto.XSecProvider;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.List;
-
+package at.gv.egiz.bku.slcommands.impl.xsect;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import iaik.xml.crypto.XSecProvider;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.List;
+
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLSocketFactory;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.crypto.MarshalException;
-import javax.xml.crypto.dsig.CanonicalizationMethod;
-import javax.xml.crypto.dsig.DigestMethod;
-import javax.xml.crypto.dsig.Reference;
-import javax.xml.crypto.dsig.SignatureMethod;
-import javax.xml.crypto.dsig.Transform;
-import javax.xml.crypto.dsig.XMLObject;
-import javax.xml.crypto.dsig.XMLSignatureException;
-import javax.xml.crypto.dsig.XMLSignatureFactory;
-import javax.xml.crypto.dsig.dom.DOMSignContext;
-import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
-import javax.xml.crypto.dsig.spec.DigestMethodParameterSpec;
-import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec;
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.LSOutput;
-import org.w3c.dom.ls.LSSerializer;
-
-import at.buergerkarte.namespaces.securitylayer._1.CreateXMLSignatureRequestType;
-import at.buergerkarte.namespaces.securitylayer._1.DataObjectInfoType;
-import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
-import at.buergerkarte.namespaces.securitylayer._1.SignatureInfoCreationType;
-import at.gv.egiz.bku.slexceptions.SLCommandException;
-import at.gv.egiz.bku.slexceptions.SLRequestException;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.dsig.CanonicalizationMethod;
+import javax.xml.crypto.dsig.DigestMethod;
+import javax.xml.crypto.dsig.Reference;
+import javax.xml.crypto.dsig.SignatureMethod;
+import javax.xml.crypto.dsig.Transform;
+import javax.xml.crypto.dsig.XMLObject;
+import javax.xml.crypto.dsig.XMLSignatureException;
+import javax.xml.crypto.dsig.XMLSignatureFactory;
+import javax.xml.crypto.dsig.dom.DOMSignContext;
+import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
+import javax.xml.crypto.dsig.spec.DigestMethodParameterSpec;
+import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSOutput;
+import org.w3c.dom.ls.LSSerializer;
+
+import at.buergerkarte.namespaces.securitylayer._1.CreateXMLSignatureRequestType;
+import at.buergerkarte.namespaces.securitylayer._1.DataObjectInfoType;
+import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
+import at.buergerkarte.namespaces.securitylayer._1.SignatureInfoCreationType;
+import at.gv.egiz.bku.slexceptions.SLCommandException;
+import at.gv.egiz.bku.slexceptions.SLRequestException;
 import at.gv.egiz.bku.slexceptions.SLViewerException;
-import at.gv.egiz.bku.utils.urldereferencer.StreamData;
-import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
-import at.gv.egiz.bku.utils.urldereferencer.URLDereferencerContext;
-import at.gv.egiz.bku.utils.urldereferencer.URLProtocolHandler;
-import at.gv.egiz.dom.DOMUtils;
-import at.gv.egiz.slbinding.RedirectEventFilter;
-import at.gv.egiz.slbinding.RedirectUnmarshallerListener;
-
-public class SignatureTest {
-
-  private class AlgorithmMethodFactoryImpl implements AlgorithmMethodFactory {
-  
-    @Override
-    public CanonicalizationMethod createCanonicalizationMethod(
-        SignatureContext signatureContext) {
-      
-      XMLSignatureFactory signatureFactory = signatureContext.getSignatureFactory();
-      
-      try {
-        return signatureFactory.newCanonicalizationMethod(CanonicalizationMethod.EXCLUSIVE, (C14NMethodParameterSpec) null);
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      } 
-    }
-  
-    @Override
-    public DigestMethod createDigestMethod(SignatureContext signatureContext) {
-  
-      XMLSignatureFactory signatureFactory = signatureContext.getSignatureFactory();
-  
-      try {
-        return signatureFactory.newDigestMethod(DigestMethod.SHA1, (DigestMethodParameterSpec) null);
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      } 
-    }
-  
-    @Override
-    public SignatureMethod createSignatureMethod(
-        SignatureContext signatureContext) {
-  
-      XMLSignatureFactory signatureFactory = signatureContext.getSignatureFactory();
-  
-      try {
-        return signatureFactory.newSignatureMethod(SignatureMethod.RSA_SHA1, (SignatureMethodParameterSpec) null);
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      } 
-  
-    }
-    
-  }
-
-  private static final String RESOURCE_PREFIX = "at/gv/egiz/bku/slcommands/impl/";
-  
-  private static Unmarshaller unmarshaller;
-  
-  private static PrivateKey privateKey;
-
-  private static X509Certificate certificate;
-  
-  @BeforeClass
-  public static void setUpClass() throws JAXBException, NoSuchAlgorithmException, KeyStoreException, CertificateException, IOException, UnrecoverableKeyException {
-    
-    XSecProvider.addAsProvider(true);
-    
-    String packageName = ObjectFactory.class.getPackage().getName();
-    packageName += ":"
-        + org.w3._2000._09.xmldsig_.ObjectFactory.class.getPackage().getName();
-    JAXBContext jaxbContext = JAXBContext.newInstance(packageName);
-
-    unmarshaller = jaxbContext.createUnmarshaller();
-    
-    initURLDereferencer();
-    
-    ClassLoader classLoader = SignatureTest.class.getClassLoader();
-    InputStream certStream = classLoader.getResourceAsStream(RESOURCE_PREFIX + "Cert.p12");
-    assertNotNull("Certificate not found.", certStream);
-        
-    char[] passwd = "1622".toCharArray();
-    
-    KeyStore keystore = KeyStore.getInstance("PKCS12");
-    keystore.load(certStream, passwd);
-    String firstAlias = keystore.aliases().nextElement();
-    certificate = (X509Certificate) keystore.getCertificate(firstAlias);
-    privateKey = (PrivateKey) keystore.getKey(firstAlias, passwd);
-    
-  }
-
-  private static void initURLDereferencer() {
-    
-    URLDereferencer.getInstance().registerHandler("testlocal", new URLProtocolHandler() {
-      
-      @Override
-      public StreamData dereference(String url, URLDereferencerContext context)
-          throws IOException {
-
-        ClassLoader classLoader = SignatureTest.class.getClassLoader();
-        
-        String filename = url.split(":", 2)[1];
-
-        InputStream stream = classLoader.getResourceAsStream(RESOURCE_PREFIX + filename);
-        
-        if (stream == null) {
-
-          throw new IOException("Failed to resolve resource '" + url + "'.");
-
-        } else {
-
-          String contentType;
-          if (filename.endsWith(".xml")) {
-            contentType = "text/xml";
-          } else if (filename.endsWith(".txt")) {
-            contentType = "text/plain";
-          } else {
-            contentType = "";
-          }
-          
-          return new StreamData(url, contentType, stream);
-          
-        }
-        
+import at.gv.egiz.bku.utils.urldereferencer.StreamData;
+import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
+import at.gv.egiz.bku.utils.urldereferencer.URLDereferencerContext;
+import at.gv.egiz.bku.utils.urldereferencer.URLProtocolHandler;
+import at.gv.egiz.dom.DOMUtils;
+import at.gv.egiz.slbinding.RedirectEventFilter;
+import at.gv.egiz.slbinding.RedirectUnmarshallerListener;
+import org.junit.Ignore;
+
+public class SignatureTest {
+
+  private class AlgorithmMethodFactoryImpl implements AlgorithmMethodFactory {
+  
+    @Override
+    public CanonicalizationMethod createCanonicalizationMethod(
+        SignatureContext signatureContext) {
+      
+      XMLSignatureFactory signatureFactory = signatureContext.getSignatureFactory();
+      
+      try {
+        return signatureFactory.newCanonicalizationMethod(CanonicalizationMethod.EXCLUSIVE, (C14NMethodParameterSpec) null);
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      } 
+    }
+  
+    @Override
+    public DigestMethod createDigestMethod(SignatureContext signatureContext) {
+  
+      XMLSignatureFactory signatureFactory = signatureContext.getSignatureFactory();
+  
+      try {
+        return signatureFactory.newDigestMethod(DigestMethod.SHA1, (DigestMethodParameterSpec) null);
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      } 
+    }
+  
+    @Override
+    public SignatureMethod createSignatureMethod(
+        SignatureContext signatureContext) {
+  
+      XMLSignatureFactory signatureFactory = signatureContext.getSignatureFactory();
+  
+      try {
+        return signatureFactory.newSignatureMethod(SignatureMethod.RSA_SHA1, (SignatureMethodParameterSpec) null);
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      } 
+  
+    }
+    
+  }
+
+  private static final String RESOURCE_PREFIX = "at/gv/egiz/bku/slcommands/impl/";
+  
+  private static Unmarshaller unmarshaller;
+  
+  private static PrivateKey privateKey;
+
+  private static X509Certificate certificate;
+  
+  @BeforeClass
+  public static void setUpClass() throws JAXBException, NoSuchAlgorithmException, KeyStoreException, CertificateException, IOException, UnrecoverableKeyException {
+    
+    XSecProvider.addAsProvider(true);
+    
+    String packageName = ObjectFactory.class.getPackage().getName();
+    packageName += ":"
+        + org.w3._2000._09.xmldsig_.ObjectFactory.class.getPackage().getName();
+    JAXBContext jaxbContext = JAXBContext.newInstance(packageName);
+
+    unmarshaller = jaxbContext.createUnmarshaller();
+    
+    initURLDereferencer();
+    
+    ClassLoader classLoader = SignatureTest.class.getClassLoader();
+    InputStream certStream = classLoader.getResourceAsStream(RESOURCE_PREFIX + "Cert.p12");
+    assertNotNull("Certificate not found.", certStream);
+        
+    char[] passwd = "1622".toCharArray();
+    
+    KeyStore keystore = KeyStore.getInstance("PKCS12");
+    keystore.load(certStream, passwd);
+    String firstAlias = keystore.aliases().nextElement();
+    certificate = (X509Certificate) keystore.getCertificate(firstAlias);
+    privateKey = (PrivateKey) keystore.getKey(firstAlias, passwd);
+    
+  }
+
+  private static void initURLDereferencer() {
+    
+    URLDereferencer.getInstance().registerHandler("testlocal", new URLProtocolHandler() {
+      
+      @Override
+      public StreamData dereference(String url, URLDereferencerContext context)
+          throws IOException {
+
+        ClassLoader classLoader = SignatureTest.class.getClassLoader();
+        
+        String filename = url.split(":", 2)[1];
+
+        InputStream stream = classLoader.getResourceAsStream(RESOURCE_PREFIX + filename);
+        
+        if (stream == null) {
+
+          throw new IOException("Failed to resolve resource '" + url + "'.");
+
+        } else {
+
+          String contentType;
+          if (filename.endsWith(".xml")) {
+            contentType = "text/xml";
+          } else if (filename.endsWith(".txt")) {
+            contentType = "text/plain";
+          } else {
+            contentType = "";
+          }
+          
+          return new StreamData(url, contentType, stream);
+          
+        }
+        
       }
 
       @Override
@@ -205,558 +206,600 @@ public class SignatureTest {
       public void setSSLSocketFactory(SSLSocketFactory socketFactory) {
         // TODO Auto-generated method stub
         
-      }
-      
-    });
-    
-  }
-  
-  private Object unmarshal(String file) throws XMLStreamException, JAXBException {
-
-    ClassLoader classLoader = SignatureTest.class.getClassLoader();
-    InputStream resourceStream = classLoader.getResourceAsStream(RESOURCE_PREFIX + file);
-    assertNotNull(resourceStream);
-
-    XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-    XMLEventReader eventReader = inputFactory.createXMLEventReader(resourceStream);
-    RedirectEventFilter redirectEventFilter = new RedirectEventFilter();
-    XMLEventReader filteredReader = inputFactory.createFilteredReader(eventReader, redirectEventFilter);
-
-    unmarshaller.setListener(new RedirectUnmarshallerListener(redirectEventFilter));
-
-    return unmarshaller.unmarshal(filteredReader);
-    
-  }
-  
-  //
-  //
-  // SignatureInfo
-  //
-  //
-  
-  @SuppressWarnings("unchecked")
-  private SignatureInfoCreationType unmarshalSignatureInfo(String file) throws JAXBException, XMLStreamException {
-
-    Object object = unmarshal(file);
-
-    Object requestType = ((JAXBElement) object).getValue();
-    
-    assertTrue(requestType instanceof CreateXMLSignatureRequestType);
-    
-    SignatureInfoCreationType signatureInfo = ((CreateXMLSignatureRequestType) requestType).getSignatureInfo(); 
-    
-    assertNotNull(signatureInfo);
-    
-    return signatureInfo;
-    
-  }
-
-  @Test
-  public void testSetSignatureInfo_Base64_1() throws JAXBException, SLCommandException, XMLStreamException {
-
-    SignatureInfoCreationType signatureInfo = unmarshalSignatureInfo("SignatureInfo_Base64_1.xml");
-    
-    Signature signature = new Signature(null, new IdValueFactoryImpl(), null);
-    
-    signature.setSignatureInfo(signatureInfo);
-    
-    Node parent = signature.getParent();
-    Node nextSibling = signature.getNextSibling();
-
-    assertNotNull(parent);
-    assertTrue("urn:document".equals(parent.getNamespaceURI()));
-    assertTrue("XMLDocument".equals(parent.getLocalName()));
-    
-    assertNotNull(nextSibling);
-    assertTrue("urn:document".equals(nextSibling.getNamespaceURI()));
-    assertTrue("Paragraph".equals(nextSibling.getLocalName()));
-    
-  }
-
-  @Test
-  public void testSetSignature_Base64_2() throws JAXBException, SLCommandException, XMLStreamException {
-
-    SignatureInfoCreationType signatureInfo = unmarshalSignatureInfo("SignatureInfo_Base64_2.xml");
-    
-    Signature signature = new Signature(null, new IdValueFactoryImpl(), null);
-    
-    signature.setSignatureInfo(signatureInfo);
-    
-    Node parent = signature.getParent();
-    Node nextSibling = signature.getNextSibling();
-
-    assertNotNull(parent);
-    assertTrue("XMLDocument".equals(parent.getLocalName()));
-    
-    assertNotNull(nextSibling);
-    assertTrue("Paragraph".equals(nextSibling.getLocalName()));
-    
-  }
-
-  @Test
-  public void testSetSignature_Base64_3() throws JAXBException, SLCommandException, XMLStreamException {
-
-    SignatureInfoCreationType signatureInfo = unmarshalSignatureInfo("SignatureInfo_Base64_3.xml");
-    
-    Signature signature = new Signature(null, new IdValueFactoryImpl(), null);
-    
-    signature.setSignatureInfo(signatureInfo);
-    
-    Node parent = signature.getParent();
-    Node nextSibling = signature.getNextSibling();
-
-    assertNotNull(parent);
-    assertTrue("XMLDocument".equals(parent.getLocalName()));
-    
-    assertNotNull(nextSibling);
-    assertTrue("Paragraph".equals(nextSibling.getLocalName()));
-    
-  }
-
-  @Test
-  public void testSetSignatureInfo_XMLContent_1() throws JAXBException, SLCommandException, XMLStreamException {
-
-    SignatureInfoCreationType signatureInfo = unmarshalSignatureInfo("SignatureInfo_XMLContent_1.xml");
-    
-    Signature signature = new Signature(null, new IdValueFactoryImpl(), null);
-    
-    signature.setSignatureInfo(signatureInfo);
-    
-    Node parent = signature.getParent();
-    Node nextSibling = signature.getNextSibling();
-    
-    assertNotNull(parent);
-    assertTrue("urn:document".equals(parent.getNamespaceURI()));
-    assertTrue("Whole".equals(parent.getLocalName()));
-    
-    assertNull(nextSibling);
-    
-  }
-
-  @Test
-  public void testSetSignature_Reference_1() throws JAXBException, SLCommandException, XMLStreamException {
-
-    SignatureInfoCreationType signatureInfo = unmarshalSignatureInfo("SignatureInfo_Reference_1.xml");
-    
-    Signature signature = new Signature(null, new IdValueFactoryImpl(), null);
-    
-    signature.setSignatureInfo(signatureInfo);
-    
-    Node parent = signature.getParent();
-    Node nextSibling = signature.getNextSibling();
-    
-    assertNotNull(parent);
-    assertTrue("urn:document".equals(parent.getNamespaceURI()));
-    assertTrue("Paragraph".equals(parent.getLocalName()));
-    
-    assertNull(nextSibling);
-    
-  }
-
-  //
-  //
-  // DataObject
-  //
-  //
-
-  @SuppressWarnings("unchecked")
-  private List<DataObjectInfoType> unmarshalDataObjectInfo(String file) throws JAXBException, XMLStreamException {
-
-    Object object = unmarshal(file);
-
-    Object requestType = ((JAXBElement) object).getValue();
-    
-    assertTrue(requestType instanceof CreateXMLSignatureRequestType);
-    
-    List<DataObjectInfoType> dataObjectInfos = ((CreateXMLSignatureRequestType) requestType).getDataObjectInfo();
-    
-    assertNotNull(dataObjectInfos);
-    
-    return dataObjectInfos;
-    
-  }
-
-  private void signAndMarshalSignature(Signature signature) throws MarshalException, XMLSignatureException, SLCommandException, SLViewerException {
-
-    Node parent = signature.getParent();
-    Node nextSibling = signature.getNextSibling();
-    
-    DOMSignContext signContext = (nextSibling == null) 
-      ? new DOMSignContext(privateKey, parent)
-      : new DOMSignContext(privateKey, parent, nextSibling);
-      
-    signature.sign(signContext);
-    
-    Document document = signature.getDocument();
-    
-    DOMImplementationLS domImplLS = DOMUtils.getDOMImplementationLS();
-    LSOutput output = domImplLS.createLSOutput();
-    output.setByteStream(System.out);
-    
-    LSSerializer serializer = domImplLS.createLSSerializer();
-//    serializer.getDomConfig().setParameter("format-pretty-print", Boolean.TRUE);
-    serializer.getDomConfig().setParameter("namespaces", Boolean.FALSE);
-    serializer.write(document, output);
-    
-  }
-
-  @SuppressWarnings("unchecked")
-  @Test
-  public void testDataObject_Base64Content_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
-
-    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Base64Content_1.xml");
-    
-    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
-    
-    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
-      signature.addDataObject(dataObjectInfo);
-    }
-    
-    signature.setSignerCeritifcate(certificate);
-    
-    signature.buildXMLSignature();
-    
-    signAndMarshalSignature(signature);
-    
-    List<Reference> references = signature.getReferences();
-    assertTrue(references.size() == 2);
-
-    Reference reference = references.get(0);
-    assertNotNull(reference.getId());
-    
-    List<Transform> transforms = reference.getTransforms();
-    assertTrue(transforms.size() == 1);
-    
-    Transform transform = transforms.get(0);
-    assertTrue(Transform.BASE64.equals(transform.getAlgorithm()));
-  
-    List<XMLObject> objects = signature.getXMLObjects();
-    assertNotNull(objects);
-    assertTrue("Size " + objects.size() + " but should be 2.", objects.size() == 2);
-    
-    XMLObject object = objects.get(0);
-    
-    assertTrue(("#" + object.getId()).equals(reference.getURI()));
-    
-  }
-
-  @SuppressWarnings("unchecked")
-  @Test
-  public void testDataObject_XMLContent_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
-
-    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_XMLContent_1.xml");
-    
-    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
-    
-    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
-      signature.addDataObject(dataObjectInfo);
-    }
-    
-    signature.setSignerCeritifcate(certificate);
-    
-    signature.buildXMLSignature();
-    
-    signAndMarshalSignature(signature);
-
-    List<Reference> references = signature.getReferences();
-    assertTrue(references.size() == 2);
-
-    Reference reference = references.get(0);
-    assertNotNull(reference.getId());
-    
-    List<Transform> transforms = reference.getTransforms();
-    assertTrue(transforms.size() == 2);
-    
-    Transform transform = transforms.get(0);
-    assertTrue(Transform.XPATH2.equals(transform.getAlgorithm()));
-  
-    List<XMLObject> objects = signature.getXMLObjects();
-    assertNotNull(objects);
-    assertTrue("Size " + objects.size() + " but should be 2.", objects.size() == 2);
-    
-    XMLObject object = objects.get(0);
-    
-    assertTrue(("#" + object.getId()).equals(reference.getURI()));
-    
-  }
-
-  @SuppressWarnings("unchecked")
-  @Test
-  public void testDataObject_XMLContent_2() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
-
-    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_XMLContent_2.xml");
-    
-    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
-    
-    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
-      signature.addDataObject(dataObjectInfo);
-    }
-    
-    signature.setSignerCeritifcate(certificate);
-    
-    signature.buildXMLSignature();
-    
-    signAndMarshalSignature(signature);
-
-    List<Reference> references = signature.getReferences();
-    assertTrue(references.size() == 2);
-
-    Reference reference = references.get(0);
-    assertNotNull(reference.getId());
-    
-    List<Transform> transforms = reference.getTransforms();
-    assertTrue(transforms.size() == 2);
-    
-    Transform transform = transforms.get(0);
-    assertTrue(Transform.XPATH2.equals(transform.getAlgorithm()));
-  
-    List<XMLObject> objects = signature.getXMLObjects();
-    assertNotNull(objects);
-    assertTrue("Size " + objects.size() + " but should be 2.", objects.size() == 2);
-    
-    XMLObject object = objects.get(0);
-    
-    assertTrue(("#" + object.getId()).equals(reference.getURI()));
-    
-  }
-
-  
-  @SuppressWarnings("unchecked")
-  @Test
-  public void testDataObject_LocRefContent_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
-
-    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_LocRefContent_1.xml");
-    
-    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
-    
-    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
-      signature.addDataObject(dataObjectInfo);
-    }
-    
-    signature.buildXMLSignature();
-    
-    signAndMarshalSignature(signature);
-
-    List<Reference> references = signature.getReferences();
-    assertTrue(references.size() == 2);
-
-    Reference reference = references.get(0);
-    assertNotNull(reference.getId());
-    
-    List<Transform> transforms = reference.getTransforms();
-    assertTrue(transforms.size() == 2);
-    
-    Transform transform = transforms.get(0);
-    assertTrue(Transform.XPATH2.equals(transform.getAlgorithm()));
-  
-    List<XMLObject> objects = signature.getXMLObjects();
-    assertNotNull(objects);
-    assertTrue("Size " + objects.size() + " but should be 2.", objects.size() == 2);
-    
-    XMLObject object = objects.get(0);
-    
-    assertTrue(("#" + object.getId()).equals(reference.getURI()));
-    
-  }
-
-  @SuppressWarnings("unchecked")
-  @Test
-  public void testDataObject_LocRefContent_2() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
-
-    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_LocRefContent_2.xml");
-    
-    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
-    
-    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
-      signature.addDataObject(dataObjectInfo);
-    }
-    
-    signature.buildXMLSignature();
-    
-    signAndMarshalSignature(signature);
-    
-    List<Reference> references = signature.getReferences();
-    assertTrue(references.size() == 2);
-
-    Reference reference = references.get(0);
-    assertNotNull(reference.getId());
-    
-    List<Transform> transforms = reference.getTransforms();
-    assertTrue(transforms.size() == 1);
-    
-    Transform transform = transforms.get(0);
-    assertTrue(Transform.BASE64.equals(transform.getAlgorithm()));
-  
-    List<XMLObject> objects = signature.getXMLObjects();
-    assertNotNull(objects);
-    assertTrue("Size " + objects.size() + " but should be 2.", objects.size() == 2);
-    
-    XMLObject object = objects.get(0);
-    
-    assertTrue(("#" + object.getId()).equals(reference.getURI()));
-    
-  }
-
-  @SuppressWarnings("unchecked")
-  @Test
-  public void testDataObject_Reference_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
-
-    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Reference_1.xml");
-    
-    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
-    
-    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
-      signature.addDataObject(dataObjectInfo);
-    }
-    
-    signature.buildXMLSignature();
-    
-    signAndMarshalSignature(signature);
-    
-    List<Reference> references = signature.getReferences();
-    assertTrue(references.size() == 2);
-
-    Reference reference = references.get(0);
-    assertNotNull(reference.getId());
-    
-    List<Transform> transforms = reference.getTransforms();
-    assertTrue(transforms.size() == 1);
-    
-    Transform transform = transforms.get(0);
-    assertTrue(Transform.BASE64.equals(transform.getAlgorithm()));
-  
-    List<XMLObject> objects = signature.getXMLObjects();
-    assertNotNull(objects);
-    assertTrue("Size " + objects.size() + " but should be 2.", objects.size() == 2);
-    
-    XMLObject object = objects.get(0);
-    
-    assertTrue(("#" + object.getId()).equals(reference.getURI()));
-    
-  }
-
-  @SuppressWarnings("unchecked")
-  @Test
-  public void testDataObject_Detached_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
-
-    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Detached_1.xml");
-    
-    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
-    
-    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
-      signature.addDataObject(dataObjectInfo);
-    }
-    
-    signature.buildXMLSignature();
-    
-    signAndMarshalSignature(signature);
-    
-    List<Reference> references = signature.getReferences();
-    assertTrue(references.size() == 2);
-
-    Reference reference = references.get(0);
-    assertNotNull(reference.getId());
-    
-    List<Transform> transforms = reference.getTransforms();
-    assertTrue(transforms.size() == 0);
-    
-    List<XMLObject> objects = signature.getXMLObjects();
-    assertNotNull(objects);
-    assertTrue(objects.size() == 1);
-    
-  }
-  
-  @SuppressWarnings("unchecked")
-  @Test
-  public void testDataObject_Detached_Base64Content() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
-
-    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Detached_Base64Content.xml");
-    
-    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
-    
-    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
-      signature.addDataObject(dataObjectInfo);
-    }
-    
-    signature.buildXMLSignature();
-    
-    signAndMarshalSignature(signature);
-    
-    List<Reference> references = signature.getReferences();
-    assertTrue(references.size() == 2);
-
-    Reference reference = references.get(0);
-    assertNotNull(reference.getId());
-    
-    List<Transform> transforms = reference.getTransforms();
-    assertTrue(transforms.size() == 0);
-    
-    List<XMLObject> objects = signature.getXMLObjects();
-    assertNotNull(objects);
-    assertTrue(objects.size() == 1);
-    
-  }
-  
-  //
-  //
-  // TransformsInfo
-  //
-  //
-  
-  @SuppressWarnings("unchecked")
-  private CreateXMLSignatureRequestType unmarshalCreateXMLSignatureRequest(String file) throws JAXBException, XMLStreamException {
-
-    Object object = unmarshal(file);
-
-    Object requestType = ((JAXBElement) object).getValue();
-    
-    assertTrue(requestType instanceof CreateXMLSignatureRequestType);
-    
-    return (CreateXMLSignatureRequestType) requestType;
-    
-  }
-
-  
-  @SuppressWarnings("unchecked")
-  @Test
-  public void testTransformsInfo_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
-
-    CreateXMLSignatureRequestType requestType = unmarshalCreateXMLSignatureRequest("TransformsInfo_1.xml");
-    
-    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
-
-
-    signature.setSignatureInfo(requestType.getSignatureInfo());
-    
-    List<DataObjectInfoType> dataObjectInfos = requestType.getDataObjectInfo();
-    
-    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
-      signature.addDataObject(dataObjectInfo);
-    }
-    
-    signature.setSignerCeritifcate(certificate);
-    
-    signature.buildXMLSignature();
-    
-    signAndMarshalSignature(signature);
-    
-    List<Reference> references = signature.getReferences();
-    assertTrue(references.size() == 2);
-
-    Reference reference = references.get(0);
-    assertNotNull(reference.getId());
-    
-    List<Transform> transforms = reference.getTransforms();
-    assertTrue("Size " + transforms.size() + "", transforms.size() == 3);
-    
-    Transform transform = transforms.get(0);
-    assertTrue(Transform.ENVELOPED.equals(transform.getAlgorithm()));
-  
-    List<XMLObject> objects = signature.getXMLObjects();
-    assertNotNull(objects);
-    assertTrue("Size " + objects.size() + " but should be 1.", objects.size() == 1);
-    
-  }
-
-  
-}
+      }
+      
+    });
+    
+  }
+  
+  private Object unmarshal(String file) throws XMLStreamException, JAXBException {
+
+    ClassLoader classLoader = SignatureTest.class.getClassLoader();
+    InputStream resourceStream = classLoader.getResourceAsStream(RESOURCE_PREFIX + file);
+    assertNotNull(resourceStream);
+
+    XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+    XMLEventReader eventReader = inputFactory.createXMLEventReader(resourceStream);
+    RedirectEventFilter redirectEventFilter = new RedirectEventFilter();
+    XMLEventReader filteredReader = inputFactory.createFilteredReader(eventReader, redirectEventFilter);
+
+    unmarshaller.setListener(new RedirectUnmarshallerListener(redirectEventFilter));
+
+    return unmarshaller.unmarshal(filteredReader);
+    
+  }
+  
+  //
+  //
+  // SignatureInfo
+  //
+  //
+  
+  @SuppressWarnings("unchecked")
+  private SignatureInfoCreationType unmarshalSignatureInfo(String file) throws JAXBException, XMLStreamException {
+
+    Object object = unmarshal(file);
+
+    Object requestType = ((JAXBElement) object).getValue();
+    
+    assertTrue(requestType instanceof CreateXMLSignatureRequestType);
+    
+    SignatureInfoCreationType signatureInfo = ((CreateXMLSignatureRequestType) requestType).getSignatureInfo(); 
+    
+    assertNotNull(signatureInfo);
+    
+    return signatureInfo;
+    
+  }
+
+  @Test
+  public void testSetSignatureInfo_Base64_1() throws JAXBException, SLCommandException, XMLStreamException {
+
+    SignatureInfoCreationType signatureInfo = unmarshalSignatureInfo("SignatureInfo_Base64_1.xml");
+    
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), null);
+    
+    signature.setSignatureInfo(signatureInfo);
+    
+    Node parent = signature.getParent();
+    Node nextSibling = signature.getNextSibling();
+
+    assertNotNull(parent);
+    assertTrue("urn:document".equals(parent.getNamespaceURI()));
+    assertTrue("XMLDocument".equals(parent.getLocalName()));
+    
+    assertNotNull(nextSibling);
+    assertTrue("urn:document".equals(nextSibling.getNamespaceURI()));
+    assertTrue("Paragraph".equals(nextSibling.getLocalName()));
+    
+  }
+
+  @Test
+  public void testSetSignature_Base64_2() throws JAXBException, SLCommandException, XMLStreamException {
+
+    SignatureInfoCreationType signatureInfo = unmarshalSignatureInfo("SignatureInfo_Base64_2.xml");
+    
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), null);
+    
+    signature.setSignatureInfo(signatureInfo);
+    
+    Node parent = signature.getParent();
+    Node nextSibling = signature.getNextSibling();
+
+    assertNotNull(parent);
+    assertTrue("XMLDocument".equals(parent.getLocalName()));
+    
+    assertNotNull(nextSibling);
+    assertTrue("Paragraph".equals(nextSibling.getLocalName()));
+    
+  }
+
+  @Test
+  public void testSetSignature_Base64_3() throws JAXBException, SLCommandException, XMLStreamException {
+
+    SignatureInfoCreationType signatureInfo = unmarshalSignatureInfo("SignatureInfo_Base64_3.xml");
+    
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), null);
+    
+    signature.setSignatureInfo(signatureInfo);
+    
+    Node parent = signature.getParent();
+    Node nextSibling = signature.getNextSibling();
+
+    assertNotNull(parent);
+    assertTrue("XMLDocument".equals(parent.getLocalName()));
+    
+    assertNotNull(nextSibling);
+    assertTrue("Paragraph".equals(nextSibling.getLocalName()));
+    
+  }
+
+  @Test
+  public void testSetSignatureInfo_XMLContent_1() throws JAXBException, SLCommandException, XMLStreamException {
+
+    SignatureInfoCreationType signatureInfo = unmarshalSignatureInfo("SignatureInfo_XMLContent_1.xml");
+    
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), null);
+    
+    signature.setSignatureInfo(signatureInfo);
+    
+    Node parent = signature.getParent();
+    Node nextSibling = signature.getNextSibling();
+    
+    assertNotNull(parent);
+    assertTrue("urn:document".equals(parent.getNamespaceURI()));
+    assertTrue("Whole".equals(parent.getLocalName()));
+    
+    assertNull(nextSibling);
+    
+  }
+
+  @Test
+  public void testSetSignature_Reference_1() throws JAXBException, SLCommandException, XMLStreamException {
+
+    SignatureInfoCreationType signatureInfo = unmarshalSignatureInfo("SignatureInfo_Reference_1.xml");
+    
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), null);
+    
+    signature.setSignatureInfo(signatureInfo);
+    
+    Node parent = signature.getParent();
+    Node nextSibling = signature.getNextSibling();
+    
+    assertNotNull(parent);
+    assertTrue("urn:document".equals(parent.getNamespaceURI()));
+    assertTrue("Paragraph".equals(parent.getLocalName()));
+    
+    assertNull(nextSibling);
+    
+  }
+
+  //
+  //
+  // DataObject
+  //
+  //
+
+  @SuppressWarnings("unchecked")
+  private List<DataObjectInfoType> unmarshalDataObjectInfo(String file) throws JAXBException, XMLStreamException {
+
+    Object object = unmarshal(file);
+
+    Object requestType = ((JAXBElement) object).getValue();
+    
+    assertTrue(requestType instanceof CreateXMLSignatureRequestType);
+    
+    List<DataObjectInfoType> dataObjectInfos = ((CreateXMLSignatureRequestType) requestType).getDataObjectInfo();
+    
+    assertNotNull(dataObjectInfos);
+    
+    return dataObjectInfos;
+    
+  }
+
+  private void signAndMarshalSignature(Signature signature) throws MarshalException, XMLSignatureException, SLCommandException, SLViewerException {
+
+    Node parent = signature.getParent();
+    Node nextSibling = signature.getNextSibling();
+    
+    DOMSignContext signContext = (nextSibling == null) 
+      ? new DOMSignContext(privateKey, parent)
+      : new DOMSignContext(privateKey, parent, nextSibling);
+      
+    signature.sign(signContext);
+    
+    Document document = signature.getDocument();
+    
+    DOMImplementationLS domImplLS = DOMUtils.getDOMImplementationLS();
+    LSOutput output = domImplLS.createLSOutput();
+    output.setByteStream(System.out);
+    
+    LSSerializer serializer = domImplLS.createLSSerializer();
+//    serializer.getDomConfig().setParameter("format-pretty-print", Boolean.TRUE);
+    serializer.getDomConfig().setParameter("namespaces", Boolean.FALSE);
+    serializer.write(document, output);
+    
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  public void testDataObject_Base64Content_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
+
+    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Base64Content_1.xml");
+    
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
+    
+    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
+      signature.addDataObject(dataObjectInfo);
+    }
+    
+    signature.setSignerCeritifcate(certificate);
+    
+    signature.buildXMLSignature();
+    
+    signAndMarshalSignature(signature);
+    
+    List<Reference> references = signature.getReferences();
+    assertTrue(references.size() == 2);
+
+    Reference reference = references.get(0);
+    assertNotNull(reference.getId());
+    
+    List<Transform> transforms = reference.getTransforms();
+    assertTrue(transforms.size() == 1);
+    
+    Transform transform = transforms.get(0);
+    assertTrue(Transform.BASE64.equals(transform.getAlgorithm()));
+  
+    List<XMLObject> objects = signature.getXMLObjects();
+    assertNotNull(objects);
+    assertTrue("Size " + objects.size() + " but should be 2.", objects.size() == 2);
+    
+    XMLObject object = objects.get(0);
+    
+    assertTrue(("#" + object.getId()).equals(reference.getURI()));
+    
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  public void testDataObject_XMLContent_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
+
+    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_XMLContent_1.xml");
+    
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
+    
+    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
+      signature.addDataObject(dataObjectInfo);
+    }
+    
+    signature.setSignerCeritifcate(certificate);
+    
+    signature.buildXMLSignature();
+    
+    signAndMarshalSignature(signature);
+
+    List<Reference> references = signature.getReferences();
+    assertTrue(references.size() == 2);
+
+    Reference reference = references.get(0);
+    assertNotNull(reference.getId());
+    
+    List<Transform> transforms = reference.getTransforms();
+    assertTrue(transforms.size() == 2);
+    
+    Transform transform = transforms.get(0);
+    assertTrue(Transform.XPATH2.equals(transform.getAlgorithm()));
+  
+    List<XMLObject> objects = signature.getXMLObjects();
+    assertNotNull(objects);
+    assertTrue("Size " + objects.size() + " but should be 2.", objects.size() == 2);
+    
+    XMLObject object = objects.get(0);
+    
+    assertTrue(("#" + object.getId()).equals(reference.getURI()));
+    
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  public void testDataObject_XMLContent_2() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
+
+    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_XMLContent_2.xml");
+    
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
+    
+    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
+      signature.addDataObject(dataObjectInfo);
+    }
+    
+    signature.setSignerCeritifcate(certificate);
+    
+    signature.buildXMLSignature();
+    
+    signAndMarshalSignature(signature);
+
+    List<Reference> references = signature.getReferences();
+    assertTrue(references.size() == 2);
+
+    Reference reference = references.get(0);
+    assertNotNull(reference.getId());
+    
+    List<Transform> transforms = reference.getTransforms();
+    assertTrue(transforms.size() == 2);
+    
+    Transform transform = transforms.get(0);
+    assertTrue(Transform.XPATH2.equals(transform.getAlgorithm()));
+  
+    List<XMLObject> objects = signature.getXMLObjects();
+    assertNotNull(objects);
+    assertTrue("Size " + objects.size() + " but should be 2.", objects.size() == 2);
+    
+    XMLObject object = objects.get(0);
+    
+    assertTrue(("#" + object.getId()).equals(reference.getURI()));
+    
+  }
+
+  
+  @SuppressWarnings("unchecked")
+  @Test
+  public void testDataObject_LocRefContent_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
+
+    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_LocRefContent_1.xml");
+    
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
+    
+    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
+      signature.addDataObject(dataObjectInfo);
+    }
+    
+    signature.buildXMLSignature();
+    
+    signAndMarshalSignature(signature);
+
+    List<Reference> references = signature.getReferences();
+    assertTrue(references.size() == 2);
+
+    Reference reference = references.get(0);
+    assertNotNull(reference.getId());
+    
+    List<Transform> transforms = reference.getTransforms();
+    assertTrue(transforms.size() == 2);
+    
+    Transform transform = transforms.get(0);
+    assertTrue(Transform.XPATH2.equals(transform.getAlgorithm()));
+  
+    List<XMLObject> objects = signature.getXMLObjects();
+    assertNotNull(objects);
+    assertTrue("Size " + objects.size() + " but should be 2.", objects.size() == 2);
+    
+    XMLObject object = objects.get(0);
+    
+    assertTrue(("#" + object.getId()).equals(reference.getURI()));
+    
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  public void testDataObject_LocRefContent_2() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
+
+    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_LocRefContent_2.xml");
+    
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
+    
+    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
+      signature.addDataObject(dataObjectInfo);
+    }
+    
+    signature.buildXMLSignature();
+    
+    signAndMarshalSignature(signature);
+    
+    List<Reference> references = signature.getReferences();
+    assertTrue(references.size() == 2);
+
+    Reference reference = references.get(0);
+    assertNotNull(reference.getId());
+    
+    List<Transform> transforms = reference.getTransforms();
+    assertTrue(transforms.size() == 1);
+    
+    Transform transform = transforms.get(0);
+    assertTrue(Transform.BASE64.equals(transform.getAlgorithm()));
+  
+    List<XMLObject> objects = signature.getXMLObjects();
+    assertNotNull(objects);
+    assertTrue("Size " + objects.size() + " but should be 2.", objects.size() == 2);
+    
+    XMLObject object = objects.get(0);
+    
+    assertTrue(("#" + object.getId()).equals(reference.getURI()));
+    
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  public void testDataObject_Reference_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
+
+    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Reference_1.xml");
+    
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
+    
+    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
+      signature.addDataObject(dataObjectInfo);
+    }
+    
+    signature.buildXMLSignature();
+    
+    signAndMarshalSignature(signature);
+    
+    List<Reference> references = signature.getReferences();
+    assertTrue(references.size() == 2);
+
+    Reference reference = references.get(0);
+    assertNotNull(reference.getId());
+    
+    List<Transform> transforms = reference.getTransforms();
+    assertTrue(transforms.size() == 1);
+    
+    Transform transform = transforms.get(0);
+    assertTrue(Transform.BASE64.equals(transform.getAlgorithm()));
+  
+    List<XMLObject> objects = signature.getXMLObjects();
+    assertNotNull(objects);
+    assertTrue("Size " + objects.size() + " but should be 2.", objects.size() == 2);
+    
+    XMLObject object = objects.get(0);
+    
+    assertTrue(("#" + object.getId()).equals(reference.getURI()));
+    
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  public void testDataObject_Detached_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
+
+    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Detached_1.xml");
+    
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
+    
+    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
+      signature.addDataObject(dataObjectInfo);
+    }
+    
+    signature.buildXMLSignature();
+    
+    signAndMarshalSignature(signature);
+    
+    List<Reference> references = signature.getReferences();
+    assertTrue(references.size() == 2);
+
+    Reference reference = references.get(0);
+    assertNotNull(reference.getId());
+    
+    List<Transform> transforms = reference.getTransforms();
+    assertTrue(transforms.size() == 0);
+    
+    List<XMLObject> objects = signature.getXMLObjects();
+    assertNotNull(objects);
+    assertTrue(objects.size() == 1);
+    
+  }
+  
+  @SuppressWarnings("unchecked")
+  @Test
+  public void testDataObject_Detached_Base64Content() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
+
+    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Detached_Base64Content.xml");
+    
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
+    
+    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
+      signature.addDataObject(dataObjectInfo);
+    }
+    
+    signature.buildXMLSignature();
+    
+    signAndMarshalSignature(signature);
+    
+    List<Reference> references = signature.getReferences();
+    assertTrue(references.size() == 2);
+
+    Reference reference = references.get(0);
+    assertNotNull(reference.getId());
+    
+    List<Transform> transforms = reference.getTransforms();
+    assertTrue(transforms.size() == 0);
+    
+    List<XMLObject> objects = signature.getXMLObjects();
+    assertNotNull(objects);
+    assertTrue(objects.size() == 1);
+    
+  }
+  
+  //
+  //
+  // TransformsInfo
+  //
+  //
+  
+  @SuppressWarnings("unchecked")
+  private CreateXMLSignatureRequestType unmarshalCreateXMLSignatureRequest(String file) throws JAXBException, XMLStreamException {
+
+    Object object = unmarshal(file);
+
+    Object requestType = ((JAXBElement) object).getValue();
+    
+    assertTrue(requestType instanceof CreateXMLSignatureRequestType);
+    
+    return (CreateXMLSignatureRequestType) requestType;
+    
+  }
+
+  
+  @SuppressWarnings("unchecked")
+  @Test
+  public void testTransformsInfo_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
+
+    CreateXMLSignatureRequestType requestType = unmarshalCreateXMLSignatureRequest("TransformsInfo_1.xml");
+    
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
+
+
+    signature.setSignatureInfo(requestType.getSignatureInfo());
+    
+    List<DataObjectInfoType> dataObjectInfos = requestType.getDataObjectInfo();
+    
+    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
+      signature.addDataObject(dataObjectInfo);
+    }
+    
+    signature.setSignerCeritifcate(certificate);
+    
+    signature.buildXMLSignature();
+    
+    signAndMarshalSignature(signature);
+    
+    List<Reference> references = signature.getReferences();
+    assertTrue(references.size() == 2);
+
+    Reference reference = references.get(0);
+    assertNotNull(reference.getId());
+    
+    List<Transform> transforms = reference.getTransforms();
+    assertTrue("Size " + transforms.size() + "", transforms.size() == 3);
+    
+    Transform transform = transforms.get(0);
+    assertTrue(Transform.ENVELOPED.equals(transform.getAlgorithm()));
+  
+    List<XMLObject> objects = signature.getXMLObjects();
+    assertNotNull(objects);
+    assertTrue("Size " + objects.size() + " but should be 1.", objects.size() == 1);
+    
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  @Ignore
+  public void testTransformsInfo_2() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
+
+    CreateXMLSignatureRequestType requestType = unmarshalCreateXMLSignatureRequest("TransformsInfo_2.xml");
+
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
+
+
+    signature.setSignatureInfo(requestType.getSignatureInfo());
+
+    List<DataObjectInfoType> dataObjectInfos = requestType.getDataObjectInfo();
+
+    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
+      signature.addDataObject(dataObjectInfo);
+    }
+
+    signature.setSignerCeritifcate(certificate);
+
+    signature.buildXMLSignature();
+
+    signAndMarshalSignature(signature);
+
+    List<Reference> references = signature.getReferences();
+    assertTrue(references.size() == 2);
+
+    Reference reference = references.get(0);
+    assertNotNull(reference.getId());
+
+    List<Transform> transforms = reference.getTransforms();
+    assertTrue("Size " + transforms.size() + "", transforms.size() == 2);
+
+    Transform transform = transforms.get(0);
+    assertTrue(Transform.XSLT.equals(transform.getAlgorithm()));
+
+    List<XMLObject> objects = signature.getXMLObjects();
+    assertNotNull(objects);
+    assertTrue("Size " + objects.size() + " but should be 1.", objects.size() == 1);
+
+  }
+
+  
+}
diff --git a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/TransformsInfo_2.xml b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/TransformsInfo_2.xml
new file mode 100644
index 00000000..f43dc61a
--- /dev/null
+++ b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/TransformsInfo_2.xml
@@ -0,0 +1,397 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<sl:CreateXMLSignatureRequest xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"
+	xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
+	<sl:KeyboxIdentifier>SecureSignatureKeypair</sl:KeyboxIdentifier>
+	<sl:DataObjectInfo Structure="detached">
+		<sl:DataObject Reference=""/>
+		<sl:TransformsInfo>
+			<dsig:Transforms xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+				<dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+				<dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
+					<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+						xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
+						xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#">
+						<xsl:template match="/" xmlns="http://www.w3.org/1999/xhtml">
+							<html>
+								<head>
+									<title>Signatur der Anmeldedaten</title>
+									<style type="text/css" media="screen">
+							.boldstyle { font-weight: bold; }
+							.italicstyle { font-style: italic; }
+							.annotationstyle { font-size: 0.8em; }
+							</style>
+								</head>
+								<body>
+									<h1>Signatur der Anmeldedaten</h1>
+									<p/>
+									<h4>Mit meiner elektronischen Signatur beantrage ich, <span
+											class="boldstyle">
+											<xsl:value-of select="//@Issuer"/>
+										</span>, geboren am <xsl:value-of
+											select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,9,2)"
+										/>. <xsl:value-of
+											select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,6,2)"
+										/>. <xsl:value-of
+											select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,1,4)"
+										/>, <xsl:if
+											test="//saml:Attribute[@AttributeName='OIDTextualDescription']"
+											> in der Rolle als <xsl:value-of
+												select="//saml:Attribute[@AttributeName='OIDTextualDescription']/saml:AttributeValue"
+											/> (OID***= <xsl:value-of
+												select="//saml:Attribute[@AttributeName='OID']/saml:AttributeValue"
+											/>), </xsl:if> den Zugang zur gesicherten Anwendung. </h4>
+									<p/>
+									<h4>Datum und Uhrzeit: <xsl:value-of
+											select="substring(//@IssueInstant,9,2)"/>. <xsl:value-of
+											select="substring(//@IssueInstant,6,2)"/>. <xsl:value-of
+											select="substring(//@IssueInstant,1,4)"/>, <xsl:value-of
+											select="substring(//@IssueInstant,12,2)"/>:
+											<xsl:value-of select="substring(//@IssueInstant,15,2)"
+										/>: <xsl:value-of select="substring(//@IssueInstant,18,2)"/>
+									</h4>
+									<xsl:if test="//saml:Attribute[@AttributeName='HPI']">
+										<h4>HPI(**): <xsl:value-of
+												select="//saml:Attribute[@AttributeName='HPI']/saml:AttributeValue"
+											/></h4>
+									</xsl:if>
+									<xsl:if test="//saml:Attribute[@AttributeName='wbPK']">
+										<h4>wbPK(*): <xsl:value-of
+												select="//saml:Attribute[@AttributeName='wbPK']/saml:AttributeValue/pr:Identification/pr:Value"
+											/></h4>
+									</xsl:if>
+									<xsl:if test="//saml:Attribute[@AttributeName='MandatorName']">
+										<hr/>
+										<h4>Ich bin weiters ermächtigt als <xsl:value-of
+												select="//saml:Attribute[@AttributeName='RepresentationType']/saml:AttributeValue/text()"
+											/> von <xsl:value-of
+												select="//saml:Attribute[@AttributeName='MandatorName']/saml:AttributeValue/text()"/>
+											<xsl:if
+												test="//saml:Attribute[@AttributeName='MandatorDateOfBirth']"
+												>, geboren am <xsl:value-of
+												select="substring(//saml:Attribute[@AttributeName='MandatorDateOfBirth']/saml:AttributeValue,9,2)"
+												/>. <xsl:value-of
+												select="substring(//saml:Attribute[@AttributeName='MandatorDateOfBirth']/saml:AttributeValue,6,2)"
+												/>. <xsl:value-of
+												select="substring(//saml:Attribute[@AttributeName='MandatorDateOfBirth']/saml:AttributeValue,1,4)"
+												/>
+											</xsl:if>
+											<xsl:if
+												test="//saml:Attribute[@AttributeName='MandatorDomainIdentifier']"
+												>, <xsl:value-of
+												select="//saml:Attribute[@AttributeName='MandatorDomainIdentifier']/saml:AttributeValue/text()"
+												/>
+											</xsl:if>, in deren Auftrag zu handeln. <xsl:if
+												test="//saml:Attribute[@AttributeName='MandatorWbpk']">
+												<h4>wbPK(*) des Vollmachtgebers: <xsl:value-of
+												select="//saml:Attribute[@AttributeName='MandatorWbpk']/saml:AttributeValue/text()"
+												/></h4>
+											</xsl:if>
+										</h4>
+										<p/>
+									</xsl:if>
+									<xsl:choose>
+										<xsl:when test="//saml:Attribute[@AttributeName='OID']">
+											<p/>
+											<hr/>
+										</xsl:when>
+										<xsl:when test="//saml:Attribute[@AttributeName='HPI']">
+											<p/>
+											<hr/>
+										</xsl:when>
+										<xsl:when test="//saml:Attribute[@AttributeName='wbPK']">
+											<p/>
+											<hr/>
+										</xsl:when>
+									</xsl:choose>
+									<xsl:if test="//saml:Attribute[@AttributeName='wbPK']">
+										<div class="annotationstyle">(*) wbPK: Das <span
+												class="italicstyle">wirtschaftsbereichsspezifische
+												Personenkennzeichen</span> wird aus den jeweiligen
+											Stammzahlen des Bürgers und des Wirtschaftsunternehmens
+											berechnet und ermöglicht eine eindeutige Zuordnung des
+											Bürgers zum Wirtschaftsunternehmen.</div>
+									</xsl:if>
+									<xsl:if test="//saml:Attribute[@AttributeName='HPI']">
+										<div class="annotationstyle">(**) HPI: Der <span
+												class="italicstyle">eHealth Professional
+											Identifier</span> wird aus den jeweiligen Stammzahlen
+											der Gesundheitsdiensteanbieterinnen /
+											Gesundheitsdiensteanbieter berechnet und ermöglicht eine
+											eindeutige Zuordnung der Gesundheitsdiensteanbieterin /
+											des Gesundheitsdiensteanbieters im
+										Gesundheitsbereich.</div>
+									</xsl:if>
+									<xsl:if test="//saml:Attribute[@AttributeName='OID']">
+										<div class="annotationstyle">(***) OID: <span
+												class="italicstyle">Object Identifier</span> sind
+											standardisierte Objekt-Bezeichner und beschreiben
+											eindeutig die Rollen des GDA-Token Inhabers.</div>
+									</xsl:if>
+								</body>
+							</html>
+						</xsl:template>
+					</xsl:stylesheet>
+				</dsig:Transform>
+				<dsig:Transform
+					Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/>
+			</dsig:Transforms>
+			<sl:FinalDataMetaInfo>
+				<sl:MimeType>application/xhtml+xml</sl:MimeType>
+			</sl:FinalDataMetaInfo>
+		</sl:TransformsInfo>
+		<sl:TransformsInfo>
+			<dsig:Transforms xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+				<dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+				<dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
+					<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+						xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
+						xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#">
+						<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+						<xsl:template match="/" xmlns="http://www.w3.org/1999/xhtml">
+							<html>
+								<head>
+									<title>Signatur der Anmeldedaten</title>
+								</head>
+								<body>
+									<h1>Signatur der Anmeldedaten</h1>
+									<p/>
+									<h4>Mit meiner elektronischen Signatur beantrage ich, <b>
+											<xsl:value-of select="//@Issuer"/>
+										</b>, geboren am <xsl:value-of
+											select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,9,2)"
+										/>. <xsl:value-of
+											select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,6,2)"
+										/>. <xsl:value-of
+											select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,1,4)"
+										/>, <xsl:if
+											test="//saml:Attribute[@AttributeName='OIDTextualDescription']"
+											> in der Rolle als <xsl:value-of
+												select="//saml:Attribute[@AttributeName='OIDTextualDescription']/saml:AttributeValue"
+											/> (OID***= <xsl:value-of
+												select="//saml:Attribute[@AttributeName='OID']/saml:AttributeValue"
+											/>), </xsl:if> den Zugang zur gesicherten Anwendung. </h4>
+									<p/>
+									<h4>Datum und Uhrzeit: <xsl:value-of
+											select="substring(//@IssueInstant,9,2)"/>. <xsl:value-of
+											select="substring(//@IssueInstant,6,2)"/>. <xsl:value-of
+											select="substring(//@IssueInstant,1,4)"/>, <xsl:value-of
+											select="substring(//@IssueInstant,12,2)"/>:
+											<xsl:value-of select="substring(//@IssueInstant,15,2)"
+										/>: <xsl:value-of select="substring(//@IssueInstant,18,2)"/>
+									</h4>
+									<xsl:if test="//saml:Attribute[@AttributeName='HPI']">
+										<h4>HPI(**): <xsl:value-of
+												select="//saml:Attribute[@AttributeName='HPI']/saml:AttributeValue"
+											/></h4>
+									</xsl:if>
+									<xsl:if test="//saml:Attribute[@AttributeName='wbPK']">
+										<h4>wbPK(*): <xsl:value-of
+												select="//saml:Attribute[@AttributeName='wbPK']/saml:AttributeValue/pr:Identification/pr:Value"
+											/></h4>
+									</xsl:if>
+									<xsl:if test="//saml:Attribute[@AttributeName='MandatorName']">
+										<hr/>
+										<h4>Ich bin weiters ermächtigt als <xsl:value-of
+												select="//saml:Attribute[@AttributeName='RepresentationType']/saml:AttributeValue/text()"
+											/> von <xsl:value-of
+												select="//saml:Attribute[@AttributeName='MandatorName']/saml:AttributeValue/text()"/>
+											<xsl:if
+												test="//saml:Attribute[@AttributeName='MandatorDateOfBirth']"
+												>, geboren am <xsl:value-of
+												select="substring(//saml:Attribute[@AttributeName='MandatorDateOfBirth']/saml:AttributeValue,9,2)"
+												/>. <xsl:value-of
+												select="substring(//saml:Attribute[@AttributeName='MandatorDateOfBirth']/saml:AttributeValue,6,2)"
+												/>. <xsl:value-of
+												select="substring(//saml:Attribute[@AttributeName='MandatorDateOfBirth']/saml:AttributeValue,1,4)"
+												/>
+											</xsl:if>
+											<xsl:if
+												test="//saml:Attribute[@AttributeName='MandatorDomainIdentifier']"
+												>, <xsl:value-of
+												select="//saml:Attribute[@AttributeName='MandatorDomainIdentifier']/saml:AttributeValue/text()"
+												/>
+											</xsl:if>, in deren Auftrag zu handeln. <xsl:if
+												test="//saml:Attribute[@AttributeName='MandatorWbpk']">
+												<h4>wbPK(*) des Vollmachtgebers: <xsl:value-of
+												select="//saml:Attribute[@AttributeName='MandatorWbpk']/saml:AttributeValue/text()"
+												/></h4>
+											</xsl:if>
+										</h4>
+										<p/>
+									</xsl:if>
+									<xsl:choose>
+										<xsl:when test="//saml:Attribute[@AttributeName='OID']">
+											<p/>
+											<hr/>
+										</xsl:when>
+										<xsl:when test="//saml:Attribute[@AttributeName='HPI']">
+											<p/>
+											<hr/>
+										</xsl:when>
+										<xsl:when test="//saml:Attribute[@AttributeName='wbPK']">
+											<p/>
+											<hr/>
+										</xsl:when>
+									</xsl:choose>
+									<xsl:if test="//saml:Attribute[@AttributeName='wbPK']">
+										<h6>(*) wbPK: Das <i>wirtschaftsbereichsspezifische
+												Personenkennzeichen</i> wird aus den jeweiligen
+											Stammzahlen des Bürgers und des Wirtschaftsunternehmens
+											berechnet und ermöglicht eine eindeutige Zuordnung des
+											Bürgers zum Wirtschaftsunternehmen.</h6>
+									</xsl:if>
+									<xsl:if test="//saml:Attribute[@AttributeName='HPI']">
+										<h6>(**) HPI: Der <i>eHealth Professional Identifier</i>
+											wird aus den jeweiligen Stammzahlen der
+											Gesundheitsdiensteanbieterinnen /
+											Gesundheitsdiensteanbieter berechnet und ermöglicht eine
+											eindeutige Zuordnung der Gesundheitsdiensteanbieterin /
+											des Gesundheitsdiensteanbieters im
+										Gesundheitsbereich.</h6>
+									</xsl:if>
+									<xsl:if test="//saml:Attribute[@AttributeName='OID']">
+										<h6>(***) OID: <i>Object Identifier</i> sind standardisierte
+											Objekt-Bezeichner und beschreiben eindeutig die Rollen
+											des GDA-Token Inhabers.</h6>
+									</xsl:if>
+								</body>
+							</html>
+						</xsl:template>
+					</xsl:stylesheet>
+				</dsig:Transform>
+				<dsig:Transform
+					Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/>
+			</dsig:Transforms>
+			<sl:FinalDataMetaInfo>
+				<sl:MimeType>text/html</sl:MimeType>
+			</sl:FinalDataMetaInfo>
+		</sl:TransformsInfo>
+        <sl:TransformsInfo>
+            <dsig:Transforms> <!-- xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"-->
+                <dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
+                    <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" exclude-result-prefixes="pr saml">
+                        <xsl:output method="xml" xml:space="default"/>
+                        <xsl:template match="/" xmlns="">
+                            <text>
+                                <xsl:text>Mit meiner elektronischen Signatur beantrage ich, </xsl:text>
+                                <xsl:value-of select="//@Issuer"/>
+                                <xsl:text>, geboren am </xsl:text>
+                                <xsl:value-of select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,9,2)"/>
+                                <xsl:text>.</xsl:text>
+                                <xsl:value-of select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,6,2)"/>
+                                <xsl:text>.</xsl:text>
+                                <xsl:value-of select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,1,4)"/>
+                                <xsl:text>, </xsl:text>
+                                <xsl:if test="//saml:Attribute[@AttributeName='OIDTextualDescription']">
+                                    <xsl:text>in der Rolle als </xsl:text>
+                                    <xsl:value-of select="//saml:Attribute[@AttributeName='OIDTextualDescription']/saml:AttributeValue"/>
+                                    <xsl:text>(OID***= </xsl:text>
+                                    <xsl:value-of select="//saml:Attribute[@AttributeName='OID']/saml:AttributeValue"/>)
+                                    <xsl:text>, </xsl:text>
+                                </xsl:if>
+                                <xsl:text>den Zugang zur gesicherten Anwendung.</xsl:text>
+                                <xsl:text>&#xa;&#xa;Datum und Uhrzeit: </xsl:text>
+                                <xsl:value-of select="substring(//@IssueInstant,9,2)"/>
+                                <xsl:text>.</xsl:text>
+                                <xsl:value-of select="substring(//@IssueInstant,6,2)"/>
+                                <xsl:text>.</xsl:text>
+                                <xsl:value-of select="substring(//@IssueInstant,1,4)"/>
+                                <xsl:text>, </xsl:text>
+                                <xsl:value-of select="substring(//@IssueInstant,12,2)"/>
+                                <xsl:text>:</xsl:text>
+                                <xsl:value-of select="substring(//@IssueInstant,15,2)"/>
+                                <xsl:text>:</xsl:text>
+                                <xsl:value-of select="substring(//@IssueInstant,18,2)"/>
+
+                                <xsl:if test="//saml:Attribute[@AttributeName='HPI']">
+                                    <xsl:text>&#xa;&#xa;HPI(**): </xsl:text>
+                                    <xsl:value-of select="//saml:Attribute[@AttributeName='HPI']/saml:AttributeValue"/>
+                                </xsl:if>
+
+                                <xsl:if test="//saml:Attribute[@AttributeName='wbPK']">
+                                    <xsl:text>&#xa;&#xa;wbPK(*): </xsl:text>
+                                    <xsl:value-of select="//saml:Attribute[@AttributeName='wbPK']/saml:AttributeValue/pr:Identification/pr:Value"/>
+                                </xsl:if>
+
+                                <xsl:if test="//saml:Attribute[@AttributeName='MandatorName']">
+                                    <xsl:text>&#xa;&#xa;Ich bin weiters ermächtigt als </xsl:text>
+                                    <xsl:value-of select="//saml:Attribute[@AttributeName='RepresentationType']/saml:AttributeValue/text()"/>
+                                    <xsl:text>von </xsl:text>
+                                    <xsl:value-of select="//saml:Attribute[@AttributeName='MandatorName']/saml:AttributeValue/text()"/>
+                                    <xsl:if test="//saml:Attribute[@AttributeName='MandatorDateOfBirth']">
+                                        <xsl:text>, geboren am </xsl:text>
+                                        <xsl:value-of select="substring(//saml:Attribute[@AttributeName='MandatorDateOfBirth']/saml:AttributeValue,9,2)"/>
+                                        <xsl:text>.</xsl:text>
+                                        <xsl:value-of select="substring(//saml:Attribute[@AttributeName='MandatorDateOfBirth']/saml:AttributeValue,6,2)"/>
+                                        <xsl:text>.</xsl:text>
+                                        <xsl:value-of select="substring(//saml:Attribute[@AttributeName='MandatorDateOfBirth']/saml:AttributeValue,1,4)"/>
+                                    </xsl:if>
+                                    <xsl:if test="//saml:Attribute[@AttributeName='MandatorDomainIdentifier']">
+                                        <xsl:text>,</xsl:text>
+                                        <xsl:value-of select="//saml:Attribute[@AttributeName='MandatorDomainIdentifier']/saml:AttributeValue/text()"/>
+                                    </xsl:if>
+                                    <xsl:text>, in deren Auftrag zu handeln.</xsl:text>
+
+                                    <xsl:if test="//saml:Attribute[@AttributeName='MandatorWbpk']">
+                                        <xsl:text>&#xa;&#xa;wbPK(*) des Vollmachtgebers: </xsl:text>
+                                        <xsl:value-of select="//saml:Attribute[@AttributeName='MandatorWbpk']/saml:AttributeValue/text()"/>
+                                    </xsl:if>
+                                </xsl:if>
+
+                                <xsl:if test="//saml:Attribute[@AttributeName='wbPK']">
+                                    <xsl:text>&#xa;&#xa;(*) wbPK: Das wirtschaftsbereichsspezifische Personenkennzeichen wird aus den jeweiligen Stammzahlen des Bürgers und des Wirtschaftsunternehmens berechnet und ermöglicht eine eindeutige Zuordnung des Bürgers zum Wirtschaftsunternehmen.</xsl:text>
+                                </xsl:if>
+                                <xsl:if test="//saml:Attribute[@AttributeName='HPI']">
+                                    <xsl:text>&#xa;&#xa;(**) HPI: Der eHealth Professional Identifier wird aus den jeweiligen Stammzahlen der Gesundheitsdiensteanbieterinnen / Gesundheitsdiensteanbieter berechnet und ermöglicht eine eindeutige Zuordnung der Gesundheitsdiensteanbieterin / des Gesundheitsdiensteanbieters im Gesundheitsbereich.</xsl:text>
+                                </xsl:if>
+                                <xsl:if test="//saml:Attribute[@AttributeName='OID']">
+                                    <xsl:text>&#xa;&#xa;(***) OID: Object Identifier sind standardisierte Objekt-Bezeichner und beschreiben eindeutig die Rollen des GDA-Token Inhabers.</xsl:text>
+                                </xsl:if>
+                            </text>
+                        </xsl:template>
+                    </xsl:stylesheet>
+                </dsig:Transform>
+                <dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116">
+                    <dsig:XPath>not(text())</dsig:XPath>
+                </dsig:Transform>
+            </dsig:Transforms>
+            <sl:FinalDataMetaInfo>
+                <sl:MimeType>text/plain</sl:MimeType>
+            </sl:FinalDataMetaInfo>
+        </sl:TransformsInfo>
+	</sl:DataObjectInfo>
+	<sl:SignatureInfo>
+		<sl:SignatureEnvironment>
+			<sl:XMLContent>
+				<saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
+					xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#"
+					MajorVersion="1" MinorVersion="0" AssertionID="any" Issuer="Klämens Örthäçké"
+					IssueInstant="2008-06-05T11:26:10+02:00">
+					<saml:AttributeStatement>
+						<saml:Subject>
+							<saml:NameIdentifier>https://demo.egiz.gv.at/exchange-moa-id-auth/</saml:NameIdentifier>
+						</saml:Subject>
+						<saml:Attribute AttributeName="wbPK"
+							AttributeNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#">
+							<saml:AttributeValue>
+								<pr:Identification>
+									<pr:Value>LTpz8VYzns2jrx0J8Gm/R/nAhxA=</pr:Value>
+									<pr:Type>urn:publicid:gv.at:wbpk+FN+TODO</pr:Type>
+								</pr:Identification>
+							</saml:AttributeValue>
+						</saml:Attribute>
+						<saml:Attribute AttributeName="OA"
+							AttributeNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#">
+							<saml:AttributeValue>https://apps.egiz.gv.at/urlaubsschein-frontend/moaid-login</saml:AttributeValue>
+						</saml:Attribute>
+						<saml:Attribute AttributeName="Geburtsdatum"
+							AttributeNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#">
+							<saml:AttributeValue>1971-11-10</saml:AttributeValue>
+						</saml:Attribute>
+					</saml:AttributeStatement>
+				</saml:Assertion>
+			</sl:XMLContent>
+		</sl:SignatureEnvironment>
+		<sl:SignatureLocation Index="2" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">/saml:Assertion</sl:SignatureLocation>
+	</sl:SignatureInfo>
+</sl:CreateXMLSignatureRequest>
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
index 13c57686..86223854 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
@@ -30,8 +30,6 @@ package at.gv.egiz.smcc;
 
 import java.nio.charset.Charset;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.smartcardio.CardChannel;
 import javax.smartcardio.CardException;
 import javax.smartcardio.CommandAPDU;
@@ -41,7 +39,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
-  
+
   private static Log log = LogFactory.getLog(ACOSCard.class);
 
   public static final byte[] AID_DEC = new byte[] { (byte) 0xA0, (byte) 0x00,
@@ -100,8 +98,15 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
       (byte) 0x01 // RSA // TODO: Not verified yet
   };
 
+  private static final int PINSPEC_INF = 0;
+  private static final int PINSPEC_DEC = 1;
+  private static final int PINSPEC_SIG = 2;
+
   public ACOSCard() {
     super("at/gv/egiz/smcc/ACOSCard");
+    pinSpecs.add(PINSPEC_INF, new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("inf.pin.name"), KID_PIN_INF, null));
+    pinSpecs.add(PINSPEC_DEC, new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("dec.pin.name"), KID_PIN_DEC, null));
+    pinSpecs.add(PINSPEC_SIG, new PINSpec(6, 10, "[0-9]", getResourceBundle().getString("sig.pin.name"), KID_PIN_SIG, null));
   }
 
   /* (non-Javadoc)
@@ -165,7 +170,8 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
     try {
       if ("IdentityLink".equals(infobox)) {
  
-        PINSpec spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("inf.pin.name"));
+        PINSpec spec = pinSpecs.get(PINSPEC_INF);
+        //new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("inf.pin.name"));
         
         int retries = -1;
         String pin = null;
@@ -219,7 +225,8 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
       
       if (KeyboxName.SECURE_SIGNATURE_KEYPAIR.equals(keyboxName)) {
 
-        PINSpec spec = new PINSpec(6, 10, "[0-9]", getResourceBundle().getString("sig.pin.name"));
+        PINSpec spec = pinSpecs.get(PINSPEC_SIG);
+        //new PINSpec(6, 10, "[0-9]", getResourceBundle().getString("sig.pin.name"));
         
         int retries = -1;
         String pin = null;
@@ -260,7 +267,8 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
     
       } else if (KeyboxName.CERITIFIED_KEYPAIR.equals(keyboxName)) {
         
-        PINSpec spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("dec.pin.name"));
+        PINSpec spec = pinSpecs.get(PINSPEC_DEC);
+        //new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("dec.pin.name"));
 
         int retries = -1;
         String pin = null;
@@ -321,11 +329,6 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
         0x00, fid, 256));
   }
 
-  @Override
-  public byte[] getKIDs() {
-    return new byte[] { KID_PIN_DEC, KID_PIN_INF, KID_PIN_SIG };
-  }
-
   @Override
   public int verifyPIN(String pin, byte kid) throws LockedException, NotActivatedException, SignatureCardException {
     
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
index 67f090a5..cb068725 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
@@ -31,7 +31,11 @@ package at.gv.egiz.smcc;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.ResourceBundle;
 
 import javax.smartcardio.ATR;
@@ -49,6 +53,8 @@ public abstract class AbstractSignatureCard implements SignatureCard {
 
   private static Log log = LogFactory.getLog(AbstractSignatureCard.class);
 
+  protected List<PINSpec> pinSpecs = new ArrayList<PINSpec>();
+
   private ResourceBundle i18n;
   private String resourceBundleName;
 
@@ -433,4 +439,8 @@ public abstract class AbstractSignatureCard implements SignatureCard {
     }
   }
 
+  @Override
+  public List<PINSpec> getPINSpecs() {
+    return pinSpecs;
+  }
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/PINSpec.java b/smcc/src/main/java/at/gv/egiz/smcc/PINSpec.java
index 0852d664..d180ddf0 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/PINSpec.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/PINSpec.java
@@ -35,23 +35,40 @@ public class PINSpec {
     
     String name_;
 
+    byte kid_;
+
+    byte[] context_aid_;
+
+    /**
+     *
+     * @param minLenght
+     * @param maxLength
+     * @param rexepPattern
+     * @param resourceBundle
+     * @param name
+     * @param kid the keyId for this pin
+     */
     public PINSpec(int minLenght, int maxLength, String rexepPattern, 
-        ResourceBundle resourceBundle, String name) {
+        ResourceBundle resourceBundle, String name, byte kid, byte[] contextAID) {
         
         minLength_ = minLenght;
         maxLength_ = maxLength;
         rexepPattern_ = rexepPattern;
         resourceBundle_ = resourceBundle;
         name_ = name;
+        kid_ = kid;
+        context_aid_ = contextAID;
     }
     
     public PINSpec(int minLenght, int maxLength, String rexepPattern, 
-        String name) {
+        String name, byte kid, byte[] contextAID) {
         
         minLength_ = minLenght;
         maxLength_ = maxLength;
         rexepPattern_ = rexepPattern;
         name_ = name;
+        kid_ = kid;
+        context_aid_ = contextAID;
     }
     
     
@@ -75,7 +92,14 @@ public class PINSpec {
     public String getRexepPattern() {
         return rexepPattern_;
     }
-    
+
+    public byte getKID() {
+      return kid_;
+    }
+
+    public byte[] getContextAID() {
+      return context_aid_;
+    }
     
     
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
index e80c6683..ae43629e 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
@@ -29,10 +29,8 @@
 package at.gv.egiz.smcc;
 
 import java.math.BigInteger;
-import java.util.ArrayList;
 import java.util.Arrays;
 
-import java.util.List;
 import javax.smartcardio.CardChannel;
 import javax.smartcardio.CardException;
 import javax.smartcardio.CommandAPDU;
@@ -42,7 +40,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 public class STARCOSCard extends AbstractSignatureCard implements SignatureCard {
-  
+
   /**
    * Logging facility.
    */
@@ -155,12 +153,17 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
   };
 
   public static final byte KID_PIN_CARD = (byte) 0x01;
-  
+
+  private static final int PINSPEC_CARD = 0;
+  private static final int PINSPEC_SS = 1;
+
   /**
    * Creates an new instance.
    */
   public STARCOSCard() {
     super("at/gv/egiz/smcc/STARCOSCard");
+    pinSpecs.add(PINSPEC_CARD, new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"), KID_PIN_CARD, null));
+    pinSpecs.add(PINSPEC_SS, new PINSpec(6, 10, "[0-9]", getResourceBundle().getString("sig.pin.name"), KID_PIN_SS, AID_DF_SS));
   }
  
   @Override
@@ -210,7 +213,8 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
     try {
       if ("IdentityLink".equals(infobox)) {
  
-        PINSpec spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
+        PINSpec spec = pinSpecs.get(PINSPEC_CARD);
+        //new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
         
         int retries = -1;
         String pin = null;
@@ -302,7 +306,8 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
       
       if (KeyboxName.SECURE_SIGNATURE_KEYPAIR.equals(keyboxName)) {
 
-        PINSpec spec = new PINSpec(6, 10, "[0-9]", getResourceBundle().getString("sig.pin.name"));
+        PINSpec spec = pinSpecs.get(PINSPEC_SS);
+        //new PINSpec(6, 10, "[0-9]", getResourceBundle().getString("sig.pin.name"));
         
         int retries = -1;
         String pin = null;
@@ -334,7 +339,8 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
  
       } else if (KeyboxName.CERITIFIED_KEYPAIR.equals(keyboxName)) {
 
-        PINSpec spec = new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
+        PINSpec spec = pinSpecs.get(PINSPEC_CARD);
+        //new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
  
         int retries = -1;
         String pin = null;
@@ -455,11 +461,6 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
     }
   }
 
-  @Override
-  public byte[] getKIDs() {
-    return new byte[] { KID_PIN_CARD, KID_PIN_SS };
-  }
-
   /**
    * VERIFY PIN
    * <p>
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
index bad7ccf6..8dc4ac2a 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
@@ -36,9 +36,13 @@ import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
+import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 
+import java.util.Map;
 import javax.smartcardio.Card;
 import javax.smartcardio.CardTerminal;
 
@@ -311,7 +315,7 @@ public class SWCard implements SignatureCard {
 
     if (password == null) {
 
-      PINSpec pinSpec = new PINSpec(0, -1, ".", "KeyStore-Password");
+      PINSpec pinSpec = new PINSpec(0, -1, ".", "KeyStore-Password", (byte) 0x01, null);
       
       password = provider.providePIN(pinSpec, -1);
       
@@ -390,13 +394,13 @@ public class SWCard implements SignatureCard {
   }
 
   @Override
-  public byte[] getKIDs() {
-    return null;
+  public int verifyPIN(String pin, byte kid) throws LockedException, NotActivatedException, SignatureCardException {
+    return -1;
   }
 
   @Override
-  public int verifyPIN(String pin, byte kid) throws LockedException, NotActivatedException, SignatureCardException {
-    return -1;
+  public List<PINSpec> getPINSpecs() {
+    return new ArrayList<PINSpec>();
   }
 
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
index 1ec35b78..1e5e09c8 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
@@ -31,6 +31,7 @@ package at.gv.egiz.smcc;
 import java.util.List;
 import java.util.Locale;
 
+import java.util.Map;
 import javax.smartcardio.Card;
 import javax.smartcardio.CardTerminal;
 
@@ -118,10 +119,10 @@ public interface SignatureCard {
       PINProvider provider) throws SignatureCardException, InterruptedException;
 
   /**
-   * get the KIDs for the availabel PINs
+   * Get the KIDs for all available PINs and the corresponding PINSpecs
    * @return array of KIDs
    */
-  public byte[] getKIDs();
+  public List<PINSpec> getPINSpecs();
 
   /**
    *
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java
index e10ba8f9..b6c5a8ca 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java
@@ -102,6 +102,9 @@ public abstract class AbstractBKUWorker extends AbstractSMCCSTAL implements Acti
 
   @Override
   protected boolean waitForCard() {
+    if (signatureCard != null) {
+      return false;
+    }
     SMCCHelper smccHelper = new SMCCHelper();
     actionCommandList.clear();
     actionCommandList.add("cancel");
diff --git a/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java b/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
index a5f8a771..a5d6df23 100644
--- a/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
+++ b/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
@@ -86,15 +86,16 @@ public class AbstractSMCCSTALTest extends AbstractSMCCSTAL implements
       
     }
 
-      @Override
-      public byte[] getKIDs() {
-        return null;
-      }
 
       @Override
       public int verifyPIN(String pin, byte kid) throws LockedException, NotActivatedException, SignatureCardException {
         return 0;
       }
+
+      @Override
+      public List<PINSpec> getPINSpecs() {
+        return new ArrayList<PINSpec>();
+      }
      
    };
     return false;
diff --git a/utils/src/main/java/at/gv/egiz/marshal/NamespacePrefix.java b/utils/src/main/java/at/gv/egiz/marshal/NamespacePrefix.java
new file mode 100644
index 00000000..c03f17cd
--- /dev/null
+++ b/utils/src/main/java/at/gv/egiz/marshal/NamespacePrefix.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.marshal;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public interface NamespacePrefix {
+  String CARDCHANNEL_PREFIX = "cc";
+  String ECDSA_PREFIX = "ecdsa";
+  String PERSONDATA_PREFIX = "pr";
+  String SAML10_PREFIX = "saml";
+  String SL_PREFIX = "sl";
+  String XADES_PREFIX = "xades";
+  String XMLDSIG_PREFIX = "xmldsig";
+  String XSI_PREFIX = "xsi";
+
+}
diff --git a/utils/src/main/java/at/gv/egiz/marshal/NamespacePrefixMapperImpl.java b/utils/src/main/java/at/gv/egiz/marshal/NamespacePrefixMapperImpl.java
index a08c1188..519f6b1f 100644
--- a/utils/src/main/java/at/gv/egiz/marshal/NamespacePrefixMapperImpl.java
+++ b/utils/src/main/java/at/gv/egiz/marshal/NamespacePrefixMapperImpl.java
@@ -36,35 +36,35 @@ public class NamespacePrefixMapperImpl extends NamespacePrefixMapper {
       log.trace("prefix for namespace " + namespaceUri + " requested");
     }
     if ("http://www.w3.org/2001/XMLSchema-instance".equals(namespaceUri)) {
-      return "xsi";
+      return NamespacePrefix.XSI_PREFIX;
     }
 
     if ("http://www.w3.org/2000/09/xmldsig#".equals(namespaceUri)) {
-      return "dsig";
+      return NamespacePrefix.XMLDSIG_PREFIX;
     }
 
     if ("http://www.buergerkarte.at/namespaces/securitylayer/1.2#".equals(namespaceUri)) {
-      return "sl";
+      return NamespacePrefix.SL_PREFIX;
     }
 
     if ("http://www.buergerkarte.at/cardchannel".equals(namespaceUri)) {
-      return "cc";
+      return NamespacePrefix.CARDCHANNEL_PREFIX;
     }
 
     if ("http://www.w3.org/2001/04/xmldsig-more#".equals(namespaceUri)) {
-      return "ecdsa";
+      return NamespacePrefix.ECDSA_PREFIX;
     }
 
     if ("http://reference.e-government.gv.at/namespace/persondata/20020228#".equals(namespaceUri)) {
-      return "pr";
+      return NamespacePrefix.PERSONDATA_PREFIX;
     }
 
     if ("urn:oasis:names:tc:SAML:1.0:assertion".equals(namespaceUri)) {
-      return "saml";
+      return NamespacePrefix.SAML10_PREFIX;
     }
 
     if ("http://uri.etsi.org/01903/v1.1.1#".equals(namespaceUri)) {
-      return "xades";
+      return NamespacePrefix.XADES_PREFIX;
     }
     
     return suggestion;
diff --git a/utils/src/main/java/at/gv/egiz/slbinding/RedirectEventFilter.java b/utils/src/main/java/at/gv/egiz/slbinding/RedirectEventFilter.java
index d2a7fb30..14c5ba48 100644
--- a/utils/src/main/java/at/gv/egiz/slbinding/RedirectEventFilter.java
+++ b/utils/src/main/java/at/gv/egiz/slbinding/RedirectEventFilter.java
@@ -1,19 +1,19 @@
 /*
-* 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.
-*/
+ * 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.
+ */
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
@@ -33,79 +33,84 @@ import javax.xml.stream.events.XMLEvent;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+/*
+ * TODO: don't set redirect stream from caller (caller does not know whether redirection will be triggered)
+ * rather create on trigger and pass to caller
+ */
 public class RedirectEventFilter implements EventFilter {
 
-    public static final String DEFAULT_ENCODING = "UTF-8";
-    private static Log log = LogFactory.getLog(RedirectEventFilter.class);
-    protected XMLEventWriter redirectWriter = null;
-    protected Set<QName> redirectTriggers = null;
-    private int depth = -1;
-    protected NamespaceContext currentNamespaceContext = null;
+  public static final String DEFAULT_ENCODING = "UTF-8";
+  private static Log log = LogFactory.getLog(RedirectEventFilter.class);
+  protected XMLEventWriter redirectWriter = null;
+  protected Set<QName> redirectTriggers = null;
+  private int depth = -1;
+  protected NamespaceContext currentNamespaceContext = null;
 
-    /**
-     * Event redirection is disabled, set a redirect stream to enable.
-     */
-    public RedirectEventFilter() {
-        redirectWriter = null;
-    // redirectTriggers = null;
-    }
+  /**
+   * Event redirection is disabled, set a redirect stream to enable.
+   */
+  public RedirectEventFilter() {
+    redirectWriter = null;
+  // redirectTriggers = null;
+  }
 
-    /**
-     * 
-     * @param redirectStream
-     *          if null, no events are redirected
-     * @param redirectTriggers
-     *          if null, all events are redirected
-     */
-    public RedirectEventFilter(OutputStream redirectStream, String encoding)
-      throws XMLStreamException { // , List<QName> redirectTriggers
-        if (redirectStream != null) {
-            XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
-            if (encoding == null) {
-                encoding = DEFAULT_ENCODING;
-            }
-            this.redirectWriter = outputFactory.createXMLEventWriter(redirectStream,
+  /**
+   *
+   * @param redirectStream
+   *          if null, no events are redirected
+   * @param redirectTriggers
+   *          if null, all events are redirected
+   */
+  public RedirectEventFilter(OutputStream redirectStream, String encoding)
+          throws XMLStreamException { // , List<QName> redirectTriggers
+    if (redirectStream != null) {
+      XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
+      if (encoding == null) {
+        encoding = DEFAULT_ENCODING;
+      }
+      this.redirectWriter = outputFactory.createXMLEventWriter(redirectStream,
               encoding);
-        }
-    // this.redirectTriggers = redirectTriggers;
     }
+  // this.redirectTriggers = redirectTriggers;
+  }
 
-    /**
-     * All startElement events occuring in the redirectTriggers list will trigger
-     * redirection of the entire (sub-)fragment.
-     * 
-     * @param event
-     * @return false if an event is redirected
-     */
-    @Override
-    public boolean accept(XMLEvent event) {
-        int eventType = event.getEventType();
+  /**
+   * All startElement events occuring in the redirectTriggers list will trigger
+   * redirection of the entire (sub-)fragment.
+   *
+   * @param event
+   * @return false if an event is redirected
+   */
+  @Override
+  public boolean accept(XMLEvent event) {
+    int eventType = event.getEventType();
 
-        if (eventType == XMLStreamConstants.START_ELEMENT) {
-            currentNamespaceContext = event.asStartElement().getNamespaceContext();
-        }
-        if (redirectWriter == null) {
-            return true;
-        }
-        if (eventType == XMLStreamConstants.START_ELEMENT) {
-            if (depth >= 0 || triggersRedirect(event.asStartElement().getName())) {
-                depth++;
-            }
-        } else if (eventType == XMLStreamConstants.END_ELEMENT) {
-            if (depth >= 0 && --depth < 0) {
-                // redirect the end element of the trigger, 
-                // but do not redirect the end element of the calling type
-                if (redirectTriggers != null) {
-                    redirectEvent(event);
-                    return false;
-                }
-            }
-        }
-        if (depth >= 0) { //|| (depth == 0 && redirectTriggers == null)) {
-            redirectEvent(event);
-            return false;
+    if (eventType == XMLStreamConstants.START_ELEMENT) {
+      //hopefully, this is a copy
+      currentNamespaceContext = event.asStartElement().getNamespaceContext();
+    }
+    if (redirectWriter == null) {
+      return true;
+    }
+    if (eventType == XMLStreamConstants.START_ELEMENT) {
+      if (depth >= 0 || triggersRedirect(event.asStartElement().getName())) {
+        depth++;
+      }
+    } else if (eventType == XMLStreamConstants.END_ELEMENT) {
+      if (depth >= 0 && --depth < 0) {
+        // redirect the end element of the trigger,
+        // but do not redirect the end element of the calling type
+        if (redirectTriggers != null) {
+          redirectEvent(event);
+          return false;
         }
-        return true; // depth < 0;
+      }
+    }
+    if (depth >= 0) { //|| (depth == 0 && redirectTriggers == null)) {
+      redirectEvent(event);
+      return false;
+    }
+    return true; // depth < 0;
 
 //    switch (event.getEventType()) {
 //    case XMLStreamConstants.START_ELEMENT:
@@ -132,128 +137,130 @@ public class RedirectEventFilter implements EventFilter {
 //      return false;
 //    }
 //    return true; // depth < 0;
-    }
+  }
 
-    /**
-     * @param startElt
-     * @return true if the set of triggers contains startElement 
-     * (or no triggers are registered, i.e. everything is redirected)
-     */
-    private boolean triggersRedirect(QName startElement) {
-        if (redirectTriggers != null) {
-            return redirectTriggers.contains(startElement);
-        }
-        return true;
+  /**
+   * @param startElt
+   * @return true if the set of triggers contains startElement
+   * (or no triggers are registered, i.e. everything is redirected)
+   */
+  private boolean triggersRedirect(QName startElement) {
+    if (redirectTriggers != null) {
+      return redirectTriggers.contains(startElement);
     }
+    return true;
+  }
 
-    private void redirectEvent(XMLEvent event) {
-        try {
-            if (log.isTraceEnabled()) {
-                log.trace("redirecting StAX event " + event);
-            }
-            redirectWriter.add(event);
-        } catch (XMLStreamException ex) {
-            ex.printStackTrace();
-        }
+  private void redirectEvent(XMLEvent event) {
+    try {
+      if (log.isTraceEnabled()) {
+        log.trace("redirecting StAX event " + event);
+      }
+      redirectWriter.add(event);
+    } catch (XMLStreamException ex) {
+      ex.printStackTrace();
     }
+  }
 
-    /**
-     * Enable/disable redirection of <em>all</em> events from now on. 
-     * The redirected events will be UTF-8 encoded and written to the stream.
-     * 
-     * @param redirectstream
-     *          if null, redirection is disabled
-     */
-    public void setRedirectStream(OutputStream redirectStream) throws XMLStreamException {
-        setRedirectStream(redirectStream, DEFAULT_ENCODING, null);
-    }
+  /**
+   * Enable/disable redirection of <em>all</em> events from now on.
+   * The redirected events will be UTF-8 encoded and written to the stream.
+   *
+   * @param redirectstream
+   *          if null, redirection is disabled
+   */
+  public void setRedirectStream(OutputStream redirectStream) throws XMLStreamException {
+    setRedirectStream(redirectStream, DEFAULT_ENCODING, null);
+  }
 
-    /**
-     * Enable/disable redirection of <em>all</em> events from now on. 
-     * 
-     * @param redirectStream if null, redirection is disabled
-     * @param encoding The encoding for the redirect stream
-     * @throws javax.xml.stream.XMLStreamException
-     */
-    public void setRedirectStream(OutputStream redirectStream, String encoding) throws XMLStreamException {
-        setRedirectStream(redirectStream, encoding, null);
-    }
+  /**
+   * Enable/disable redirection of <em>all</em> events from now on.
+   *
+   * @param redirectStream if null, redirection is disabled
+   * @param encoding The encoding for the redirect stream
+   * @throws javax.xml.stream.XMLStreamException
+   */
+  public void setRedirectStream(OutputStream redirectStream, String encoding) throws XMLStreamException {
+    setRedirectStream(redirectStream, encoding, null);
+  }
 
-    /**
-     * Enable/disable redirection of all (child) elements contained in redirect triggers.
-     * The redirected events will be UTF-8 encoded and written to the stream.
-     * 
-     * @param redirectstream
-     *          if null, redirection is disabled
-     * @param redirectTriggers elements that trigger the redirection
-     */
-    public void setRedirectStream(OutputStream redirectStream, Set<QName> redirectTriggers) throws XMLStreamException {
-        setRedirectStream(redirectStream, DEFAULT_ENCODING, redirectTriggers);
-    }
+  /**
+   * Enable/disable redirection of all (child) elements contained in redirect triggers.
+   * The redirected events will be UTF-8 encoded and written to the stream.
+   *
+   * @param redirectstream
+   *          if null, redirection is disabled
+   * @param redirectTriggers elements that trigger the redirection
+   */
+  public void setRedirectStream(OutputStream redirectStream, Set<QName> redirectTriggers) throws XMLStreamException {
+    setRedirectStream(redirectStream, DEFAULT_ENCODING, redirectTriggers);
+  }
 
-    /**
-     * Enable/disable redirection of all (child) elements contained in redirect triggers.
-     * 
-     * @param redirectstream
-     *          if null, redirection is disabled
-     * @param encoding The encoding for the redirect stream
-     * @param redirectTriggers elements that trigger the redirection
-     */
-    public void setRedirectStream(OutputStream redirectStream, String encoding, Set<QName> redirectTriggers) throws XMLStreamException {
-        if (redirectStream != null) {
-            XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
-            if (encoding == null) {
-                encoding = DEFAULT_ENCODING;
-            }
-            redirectWriter = outputFactory.createXMLEventWriter(redirectStream,
+  /**
+   * Enable/disable redirection of all (child) elements contained in redirect triggers.
+   *
+   * TODO: don't set redirect stream from caller (caller does not know whether redirection will be triggered)
+   * rather create on trigger and pass to caller
+   * @param redirectstream
+   *          if null, redirection is disabled
+   * @param encoding The encoding for the redirect stream
+   * @param redirectTriggers elements that trigger the redirection
+   */
+  public void setRedirectStream(OutputStream redirectStream, String encoding, Set<QName> redirectTriggers) throws XMLStreamException {
+    if (redirectStream != null) {
+      XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
+      if (encoding == null) {
+        encoding = DEFAULT_ENCODING;
+      }
+      redirectWriter = outputFactory.createXMLEventWriter(redirectStream,
               encoding);
-            if (redirectTriggers == null) {
-                // start redirecting 
-                depth = 0;
-            }
-            this.redirectTriggers = redirectTriggers;
-        } else {
-            redirectWriter = null;
-            this.redirectTriggers = null;
-        }
+      if (redirectTriggers == null) {
+        // start redirecting
+        depth = 0;
+      }
+      this.redirectTriggers = redirectTriggers;
+    } else {
+      redirectWriter = null;
+      this.redirectTriggers = null;
     }
+  }
 
-    /**
-     * Enable/disable redirection of fragments (defined by elements in
-     * redirectTriggers)
-     * 
-     * @param redirectStream
-     *          if null, redirection is disabled
-     * @param redirectTriggers
-     *          All startElement events occuring in this list will trigger
-     *          redirection of the entire fragment. If null, all events are
-     *          redirected
-     */
-    // public void setRedirectStream(OutputStream redirectStream, List<QName>
-    // redirectTriggers) throws XMLStreamException {
-    // if (redirectStream != null) {
-    // XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
-    // redirectWriter = outputFactory.createXMLEventWriter(redirectStream);
-    // } else {
-    // redirectWriter = null;
-    // }
-    // this.redirectTriggers = (redirectStream == null) ? null : redirectTriggers;
-    // }
-    /**
-     * flushes the internal EventWriter
-     * 
-     * @throws javax.xml.stream.XMLStreamException
-     */
-    public void flushRedirectStream() throws XMLStreamException {
-        redirectWriter.flush();
-    }
+  /**
+   * Enable/disable redirection of fragments (defined by elements in
+   * redirectTriggers)
+   *
+   * @param redirectStream
+   *          if null, redirection is disabled
+   * @param redirectTriggers
+   *          All startElement events occuring in this list will trigger
+   *          redirection of the entire fragment. If null, all events are
+   *          redirected
+   */
+  // public void setRedirectStream(OutputStream redirectStream, List<QName>
+  // redirectTriggers) throws XMLStreamException {
+  // if (redirectStream != null) {
+  // XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
+  // redirectWriter = outputFactory.createXMLEventWriter(redirectStream);
+  // } else {
+  // redirectWriter = null;
+  // }
+  // this.redirectTriggers = (redirectStream == null) ? null : redirectTriggers;
+  // }
+  /**
+   * flushes the internal EventWriter
+   *
+   * @throws javax.xml.stream.XMLStreamException
+   */
+  public void flushRedirectStream() throws XMLStreamException {
+    redirectWriter.flush();
+  }
 
-    /**
-     * the namespaceContext of the last startelement event read
-     * 
-     * @return
-     */
-    public NamespaceContext getCurrentNamespaceContext() {
-        return currentNamespaceContext;
-    }
+  /**
+   * the namespaceContext of the last startelement event read
+   *
+   * @return
+   */
+  public NamespaceContext getCurrentNamespaceContext() {
+    return currentNamespaceContext;
+  }
 }
diff --git a/utils/src/main/java/at/gv/egiz/slbinding/impl/TransformsInfoType.java b/utils/src/main/java/at/gv/egiz/slbinding/impl/TransformsInfoType.java
index b4e988f0..1180e9fa 100644
--- a/utils/src/main/java/at/gv/egiz/slbinding/impl/TransformsInfoType.java
+++ b/utils/src/main/java/at/gv/egiz/slbinding/impl/TransformsInfoType.java
@@ -25,6 +25,7 @@ import java.io.ByteArrayOutputStream;
 import java.util.HashSet;
 import java.util.Set;
 import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import org.apache.commons.logging.Log;
diff --git a/utils/src/main/java/at/gv/egiz/slbinding/impl/XMLContentType.java b/utils/src/main/java/at/gv/egiz/slbinding/impl/XMLContentType.java
index c32542aa..eb147f88 100644
--- a/utils/src/main/java/at/gv/egiz/slbinding/impl/XMLContentType.java
+++ b/utils/src/main/java/at/gv/egiz/slbinding/impl/XMLContentType.java
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory;
 public class XMLContentType extends at.buergerkarte.namespaces.securitylayer._1.XMLContentType implements RedirectCallback {
 
     @XmlTransient
-    private static Log log = LogFactory.getLog(TransformsInfoType.class);
+    private static Log log = LogFactory.getLog(XMLContentType.class);
     @XmlTransient
     protected ByteArrayOutputStream redirectOS = null;
 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java
index 4ab376f1..fae77451 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java
@@ -167,6 +167,7 @@ public class ObjectFactory {
      * 
      */
     public TransformType createTransformType() {
+//      return new at.gv.egiz.slbinding.impl.TransformType();
         return new TransformType();
     }
 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java
index 584baf80..c7044c4c 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java
@@ -57,7 +57,7 @@ import javax.xml.bind.annotation.XmlType;
 })
 public class TransformsType {
 
-    @XmlElement(name = "Transform", required = true)
+    @XmlElement(name = "Transform", required = true) //, type=at.gv.egiz.slbinding.impl.TransformType.class)
     protected List<TransformType> transform;
 
     /**
diff --git a/utils/src/test/java/at/gv/egiz/slbinding/RedirectTest.java b/utils/src/test/java/at/gv/egiz/slbinding/RedirectTest.java
index 99d353ac..7c8c206a 100644
--- a/utils/src/test/java/at/gv/egiz/slbinding/RedirectTest.java
+++ b/utils/src/test/java/at/gv/egiz/slbinding/RedirectTest.java
@@ -52,6 +52,8 @@ import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
 
 import static org.junit.Assert.*;
+import org.w3._2000._09.xmldsig_.TransformType;
+import org.w3._2000._09.xmldsig_.TransformsType;
 
 /**
  *
@@ -131,11 +133,34 @@ public class RedirectTest {
                 Iterator<TransformsInfoType> tiIt = transformsInfos.iterator();
                 while (tiIt.hasNext()) {
                     at.gv.egiz.slbinding.impl.TransformsInfoType ti = (at.gv.egiz.slbinding.impl.TransformsInfoType) tiIt.next();
+//                    TransformsInfoType ti = tiIt.next();
                     assertNotNull(ti);
-                    System.out.println("found at.gv.egiz.slbinding.impl.TransformsInfoType TransformsInfo");
+                    System.out.println("found sl:TransformsInfo: " + ti.getClass().getName()); //at.gv.egiz.slbinding.impl.TransformsInfoType TransformsInfo");
+//                    TransformsType ts = ti.getTransforms();
+//                    assertNotNull(ts);
+//                    System.out.println("found dsig:Transforms " + ts.getClass().getName()); //org.w3._2000._09.xmldsig_.TransformsType dsig:Transforms");
+//                    List<TransformType> tL = ts.getTransform();
+//                    assertNotNull(tL);
+//                    System.out.println("found " + tL.size() + " org.w3._2000._09.xmldsig_.TransformType dsig:Transform");
+//                    for (TransformType t : tL) {
+//                      if (t instanceof at.gv.egiz.slbinding.impl.TransformType) {
+//                        System.out.println("found at.gv.egiz.slbinding.impl.TransformType");
+//                        byte[] redirectedBytes = ((at.gv.egiz.slbinding.impl.TransformType) t).getRedirectedStream().toByteArray();
+//                        if (redirectedBytes != null && redirectedBytes.length > 0) {
+//                          System.out.println("reading redirected stream...");
+//                          os.write("--- redirected Transform ---".getBytes());
+//                          os.write(redirectedBytes);
+//                          os.write("\n".getBytes());
+//                        } else {
+//                          System.out.println("no redirected stream");
+//                        }
+//                      }
+//                    }
+
                     ByteArrayOutputStream dsigTransforms = ti.getRedirectedStream();
+                    os.write("--- redirected TransformsInfo content ---".getBytes());
                     os.write(dsigTransforms.toByteArray());
-                    os.write("\n".getBytes());
+                    os.write("\n---".getBytes());
 
                     MetaInfoType mi = ti.getFinalDataMetaInfo();
                     assertNotNull(mi);
diff --git a/utils/src/test/requests/CreateXMLSignatureRequest02.xml_redirect.txt b/utils/src/test/requests/CreateXMLSignatureRequest02.xml_redirect.txt
index 31be50b7..fc0e4f14 100644
--- a/utils/src/test/requests/CreateXMLSignatureRequest02.xml_redirect.txt
+++ b/utils/src/test/requests/CreateXMLSignatureRequest02.xml_redirect.txt
@@ -1,4 +1,4 @@
-<dsig:Transforms>
+--- redirected TransformsInfo content ---<dsig:Transforms>
 				<dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"></dsig:Transform>
 				<dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
 					<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" version="1.0">
@@ -82,7 +82,7 @@
 				</dsig:Transform>
 				<dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"></dsig:Transform>
 			</dsig:Transforms>
-<dsig:Transforms>
+------ redirected TransformsInfo content ---<dsig:Transforms>
 				<dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"></dsig:Transform>
 				<dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
 					<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" version="1.0">
@@ -162,3 +162,4 @@
 				</dsig:Transform>
 				<dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"></dsig:Transform>
 			</dsig:Transforms>
+---
\ No newline at end of file
-- 
cgit v1.2.3


From 4387153c6f65b55d576e1890c5b582237227369e Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 27 Feb 2009 18:10:57 +0000
Subject: 1.1-rc2

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@310 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java  |  18 ++
 .../java/at/gv/egiz/bku/gui/PINManagementGUI.java  |  73 +++++---
 .../at/gv/egiz/bku/gui/PINManagementGUIFacade.java |   3 +-
 .../java/at/gv/egiz/bku/gui/PINStatusRenderer.java |   2 +-
 .../bku/online/applet/PINManagementBKUWorker.java  |   5 +-
 .../smccstal/ext/PINManagementRequestHandler.java  | 105 ++++++-----
 .../gv/egiz/bku/gui/ActivationMessages.properties  |   1 +
 .../egiz/bku/gui/ActivationMessages_en.properties  |  13 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   4 +
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 198 ++++++++++++---------
 .../stal/service/impl/STALRequestBrokerImpl.java   |   4 -
 BKUOnline/src/main/webapp/PINManagement.jsp        |  79 ++++++++
 BKUOnline/src/main/webapp/SLRequestForm.html       | 155 ++++++++++++++++
 BKUOnline/src/main/webapp/css/applet.css           |   1 -
 BKUOnline/src/main/webapp/css/main.css             |  48 +++++
 BKUOnline/src/main/webapp/index.html               |  57 ++----
 BKUOnline/src/main/webapp/slRequestForm.html       | 154 ----------------
 STAL/src/main/java/at/gv/egiz/stal/STAL.java       |   2 +-
 .../bku/binding/BindingProcessorManagerImpl.java   |   2 +-
 .../at/gv/egiz/bku/smccstal/AbstractBKUWorker.java |   4 +-
 .../at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java  |  18 +-
 21 files changed, 572 insertions(+), 374 deletions(-)
 create mode 100644 BKUOnline/src/main/webapp/PINManagement.jsp
 create mode 100644 BKUOnline/src/main/webapp/SLRequestForm.html
 create mode 100644 BKUOnline/src/main/webapp/css/main.css
 delete mode 100644 BKUOnline/src/main/webapp/slRequestForm.html

(limited to 'BKUCommonGUI')

diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java
index 4059f0e2..ac9ab78b 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java
@@ -40,6 +40,12 @@ public class CardMgmtGUI extends BKUGUIImpl {
           AbstractHelpListener helpListener) {
     super(contentPane, locale, guiStyle, backgroundImgURL, helpListener);
 
+  }
+
+  @Override
+  protected void loadMessageBundle(Locale locale) {
+    super.loadMessageBundle(locale);
+
     if (locale != null) {
         Locale lang = new Locale(locale.getLanguage().substring(0,2));
         log.debug("loading applet resources for language: " + lang.toString());
@@ -47,6 +53,18 @@ public class CardMgmtGUI extends BKUGUIImpl {
     } else {
         cardmgmtMessages = ResourceBundle.getBundle(CARDMGMT_MESSAGES_BUNDLE);
     }
+  }
+
+  @Override
+  protected String getMessage(String key) {
+    if (super.hasMessage(key)) {
+      return super.getMessage(key);
+    }
+    return cardmgmtMessages.getString(key);
+  }
 
+  @Override
+  protected boolean hasMessage(String key) {
+    return (cardmgmtMessages.containsKey(key) || super.hasMessage(key));
   }
 }
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
index 8eef8aea..1276f2d0 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
@@ -39,13 +39,17 @@ import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * TODO pull out ResourceBundle to common superclass for activationGUI and pinMgmtGUI
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
-public class PINManagementGUI extends ActivationGUI implements PINManagementGUIFacade {
+public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFacade {
 
+  protected static final Log log = LogFactory.getLog(PINManagementGUI.class);
+  
   /** remember the pinfield to return to worker */
   protected JPasswordField oldPinField;
   /** remember the pinSpec to return to worker */
@@ -70,7 +74,7 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
   }
 
   @Override
-  public PINSpec getSelectedPIN() {
+  public PINSpec getSelectedPINSpec() {
     return pinSpec;
   }
 
@@ -100,11 +104,11 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
                 mgmtLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
 
                 if (renderHeaderPanel) {
-                  titleLabel.setText(cardmgmtMessages.getString(TITLE_PINMGMT));
-                  String infoPattern = cardmgmtMessages.getString(MESSAGE_PINMGMT);
+                  titleLabel.setText(getMessage(TITLE_PINMGMT));
+                  String infoPattern = getMessage(MESSAGE_PINMGMT);
                   mgmtLabel.setText(MessageFormat.format(infoPattern, pins.size()));
                 } else {
-                  mgmtLabel.setText(cardmgmtMessages.getString(TITLE_PINMGMT));
+                  mgmtLabel.setText(getMessage(TITLE_PINMGMT));
                 }
 
                 final PINStatusTableModel tableModel = new PINStatusTableModel(pins);
@@ -146,19 +150,19 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
                           STATUS status = (STATUS) tableModel.getValueAt(selectionIdx, 1);
 
                           if (status == STATUS.NOT_ACTIV) {
-                            activateButton.setText(cardmgmtMessages.getString(BUTTON_ACTIVATE));
+                            activateButton.setText(getMessage(BUTTON_ACTIVATE));
                             activateButton.setEnabled(true);
                             activateButton.setActionCommand(activateCmd);
                           } else if (status == STATUS.BLOCKED) {
-                            activateButton.setText(cardmgmtMessages.getString(BUTTON_UNBLOCK));
+                            activateButton.setText(getMessage(BUTTON_UNBLOCK));
                             activateButton.setEnabled(true);
                             activateButton.setActionCommand(unblockCmd);
                           } else if (status == STATUS.ACTIV) {
-                            activateButton.setText(cardmgmtMessages.getString(BUTTON_CHANGE));
+                            activateButton.setText(getMessage(BUTTON_CHANGE));
                             activateButton.setEnabled(true);
                             activateButton.setActionCommand(changeCmd);
                           } else {
-                            activateButton.setText(cardmgmtMessages.getString(BUTTON_ACTIVATE));
+                            activateButton.setText(getMessage(BUTTON_ACTIVATE));
                             activateButton.setEnabled(false);
                           }
                         }
@@ -200,7 +204,7 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
 
                 JButton cancelButton = new JButton();
                 cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                cancelButton.setText(getMessage(BUTTON_CLOSE));
                 cancelButton.setActionCommand(cancelCmd);
                 cancelButton.addActionListener(cancelListener);
 
@@ -266,27 +270,27 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
                 mgmtLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
 
                 if (renderHeaderPanel) {
-                  titleLabel.setText(cardmgmtMessages.getString(TITLE));
-                  String mgmtPattern = cardmgmtMessages.getString(MESSAGE_MGMT);
+                  titleLabel.setText(getMessage(TITLE));
+                  String mgmtPattern = getMessage(MESSAGE_MGMT);
                   if (shortText) {
                     mgmtLabel.setText(MessageFormat.format(mgmtPattern, "PIN"));
                   } else {
                     mgmtLabel.setText(MessageFormat.format(mgmtPattern, pinSpec.getLocalizedName()));
                   }
                 } else {
-                  mgmtLabel.setText(cardmgmtMessages.getString(TITLE));
+                  mgmtLabel.setText(getMessage(TITLE));
                 }
 
                 JButton okButton = new JButton();
                 okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                okButton.setText(messages.getString(BUTTON_OK));
+                okButton.setText(getMessage(BUTTON_OK));
                 okButton.setEnabled(false);
                 okButton.setActionCommand(okCommand);
                 okButton.addActionListener(okListener);
 
                 JLabel pinLabel = new JLabel();
                 pinLabel.setFont(pinLabel.getFont().deriveFont(pinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                String pinLabelPattern = (changePin) ? cardmgmtMessages.getString(LABEL_NEW_PIN) : messages.getString(LABEL_PIN);
+                String pinLabelPattern = (changePin) ? getMessage(LABEL_NEW_PIN) : getMessage(LABEL_PIN);
                 pinLabel.setText(MessageFormat.format(pinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
 
                 final JPasswordField repeatPinField = new JPasswordField();
@@ -305,7 +309,7 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
                 });
                 JLabel repeatPinLabel = new JLabel();
                 repeatPinLabel.setFont(pinLabel.getFont());
-                String repeatPinLabelPattern = cardmgmtMessages.getString(LABEL_REPEAT_PIN);
+                String repeatPinLabelPattern = getMessage(LABEL_REPEAT_PIN);
                 repeatPinLabel.setText(MessageFormat.format(repeatPinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
 
                 repeatPinField.setText("");
@@ -325,7 +329,7 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
                 if (changePin) {
                   oldPinLabel = new JLabel();
                   oldPinLabel.setFont(oldPinLabel.getFont().deriveFont(oldPinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                  String oldPinLabelPattern = cardmgmtMessages.getString(LABEL_OLD_PIN);
+                  String oldPinLabelPattern = getMessage(LABEL_OLD_PIN);
                   oldPinLabel.setText(MessageFormat.format(oldPinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
 
                   oldPinField = new JPasswordField();
@@ -345,7 +349,7 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
                 
                 JLabel pinsizeLabel = new JLabel();
                 pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
-                String pinsizePattern = messages.getString(LABEL_PINSIZE);
+                String pinsizePattern = getMessage(LABEL_PINSIZE);
                 String pinSize = String.valueOf(pinSpec.getMinLength());
                 if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
                     pinSize += "-" + pinSpec.getMaxLength();
@@ -468,7 +472,7 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
 
                 JButton cancelButton = new JButton();
                 cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                cancelButton.setText(getMessage(BUTTON_CANCEL));
                 cancelButton.setActionCommand(cancelCommand);
                 cancelButton.addActionListener(cancelListener);
 
@@ -522,12 +526,12 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
                 buttonPanel.removeAll();
 
                 if (renderHeaderPanel) {
-                  titleLabel.setText(messages.getString(TITLE_ERROR));
+                  titleLabel.setText(getMessage(TITLE_ERROR));
                 }
 
                 helpListener.setHelpTopic(HELP_PINMGMT);
 
-                String errorMsgPattern = cardmgmtMessages.getString(ERR_UNBLOCK);
+                String errorMsgPattern = getMessage(ERR_UNBLOCK);
                 String errorMsg = MessageFormat.format(errorMsgPattern, pin.getLocalizedName());
 
                 JLabel errorMsgLabel = new JLabel();
@@ -543,7 +547,7 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
                 if (!renderHeaderPanel) {
                   JLabel errorTitleLabel = new JLabel();
                   errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                  errorTitleLabel.setText(messages.getString(TITLE_ERROR));
+                  errorTitleLabel.setText(getMessage(TITLE_ERROR));
                   errorTitleLabel.setForeground(ERROR_COLOR);
 
                   mainHorizontal
@@ -564,7 +568,7 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
 
                 JButton okButton = new JButton();
                 okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                okButton.setText(messages.getString(BUTTON_OK));
+                okButton.setText(getMessage(BUTTON_OK));
                 okButton.setActionCommand(cancelCommand);
                 okButton.addActionListener(cancelListener);
 
@@ -584,5 +588,28 @@ public class PINManagementGUI extends ActivationGUI implements PINManagementGUIF
         });
   }
 
+  @Override
+  protected int initButtonSize() {
+    int bs = super.initButtonSize();
 
+    JButton b = new JButton();
+    b.setText(getMessage(BUTTON_ACTIVATE));
+    if (b.getPreferredSize().width > bs) {
+      bs = b.getPreferredSize().width;
+    }
+    b.setText(getMessage(BUTTON_CHANGE));
+    if (b.getPreferredSize().width > bs) {
+      bs = b.getPreferredSize().width;
+    }
+    b.setText(getMessage(BUTTON_UNBLOCK));
+    if (b.getPreferredSize().width > bs) {
+      bs = b.getPreferredSize().width;
+    }
+    b.setText(getMessage(BUTTON_CANCEL));
+    if (b.getPreferredSize().width > bs) {
+      bs = b.getPreferredSize().width;
+    }
+
+    return bs;
+  }
 }
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
index 2a8f28d2..ffdc230d 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
@@ -43,6 +43,7 @@ public interface PINManagementGUIFacade extends BKUGUIFacade {
   public static final String ERR_ACTIVATE = "err.activate";
   public static final String ERR_CHANGE = "err.change";
   public static final String ERR_UNBLOCK = "err.unblock";
+  public static final String ERR_RETRIES = "err.retries";
 
   public static final String BUTTON_ACTIVATE = "button.activate";
   public static final String BUTTON_UNBLOCK = "button.unblock";
@@ -73,5 +74,5 @@ public interface PINManagementGUIFacade extends BKUGUIFacade {
 
   public char[] getOldPin();
 
-  public PINSpec getSelectedPIN();
+  public PINSpec getSelectedPINSpec();
 }
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
index 2f8852ff..4cb84b77 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class PINStatusRenderer extends DefaultTableCellRenderer {
   
-  private static final Log log = LogFactory.getLog(PINStatusRenderer.class);
+//  private static final Log log = LogFactory.getLog(PINStatusRenderer.class);
 
   public static final Color RED = new Color(0.9f, 0.0f, 0.0f);
   public static final Color GREEN = new Color(0.0f, 0.8f, 0.0f);
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 ffd83e42..85892026 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
@@ -25,8 +25,6 @@ import at.gv.egiz.stal.ext.PINManagementRequest;
 import at.gv.egiz.stal.ext.PINManagementResponse;
 import java.util.Collections;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * This BKU Worker does not connect to STAL webservice
@@ -52,8 +50,9 @@ public class PINManagementBKUWorker extends AppletBKUWorker {
       if (responses.size() == 1) {
         STALResponse response = responses.get(0);
         if (response instanceof PINManagementResponse) {
-          log.debug("PIN management dialog finished");
+          log.debug("PIN management dialog terminated");
         } else if (response instanceof ErrorResponse) {
+          log.debug("PIN management dialog terminated with error");
           showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, null);
         } else {
           throw new RuntimeException("Invalid STAL response: " + response.getClass().getName());
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
index fcef3191..851bff21 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
@@ -22,6 +22,7 @@ import at.gv.egiz.bku.gui.PINManagementGUIFacade.STATUS;
 import at.gv.egiz.bku.smccstal.AbstractRequestHandler;
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.smcc.SignatureCardException;
+import at.gv.egiz.smcc.VerificationFailedException;
 import at.gv.egiz.smcc.util.SMCCHelper;
 import at.gv.egiz.stal.ErrorResponse;
 import at.gv.egiz.stal.STALRequest;
@@ -31,6 +32,8 @@ import at.gv.egiz.stal.ext.PINManagementResponse;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.smartcardio.Card;
 import javax.smartcardio.CardChannel;
 import javax.smartcardio.CardException;
@@ -45,7 +48,6 @@ import org.apache.commons.logging.LogFactory;
  */
 public class PINManagementRequestHandler extends AbstractRequestHandler {
 
-  public static final String ERR_NOPIN_SELECTED = "err.no.pin.selected";
   protected static final Log log = LogFactory.getLog(PINManagementRequestHandler.class);
 
 //  protected ResourceBundle messages;
@@ -70,7 +72,7 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
         } else if ("back".equals(actionCommand)) {
           showPINManagementDialog(gui);
         } else {
-          PINSpec selectedPIN = gui.getSelectedPIN();
+          PINSpec selectedPIN = gui.getSelectedPINSpec();
 
           if (selectedPIN == null) {
             throw new RuntimeException("no PIN selected for activation/change");
@@ -99,6 +101,11 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
               byte[] pin = encodePIN(gui.getPin()); //new byte[]{(byte) 0x25, (byte) 0x40};
               changePIN(selectedPIN.getKID(), selectedPIN.getContextAID(), oldPin, pin);
               showPINManagementDialog(gui);
+            } catch (VerificationFailedException ex) {
+              log.error("failed to change " + selectedPIN.getLocalizedName() + ": " + ex.getMessage());
+              gui.showErrorDialog(PINManagementGUIFacade.ERR_RETRIES,
+                      new Object[] {selectedPIN.getLocalizedName(), ex.getRetries()},
+                      this, "back");
             } catch (SignatureCardException ex) {
               log.error("failed to change " + selectedPIN.getLocalizedName() + ": " + ex.getMessage());
               gui.showErrorDialog(PINManagementGUIFacade.ERR_CHANGE, 
@@ -132,8 +139,8 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
    * @throws at.gv.egiz.smcc.SignatureCardException
    */
   private void activatePIN(byte kid, byte[] contextAID, byte[] pin) throws SignatureCardException {
+    Card icc = card.getCard();
     try {
-      Card icc = card.getCard();
       icc.beginExclusive();
       CardChannel channel = icc.getBasicChannel();
 
@@ -141,6 +148,7 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
         CommandAPDU selectAPDU = new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, contextAID);
         ResponseAPDU responseAPDU = channel.transmit(selectAPDU);
         if (responseAPDU.getSW() != 0x9000) {
+          icc.endExclusive();
           String msg = "Failed to activate PIN " + SMCCHelper.toString(new byte[]{kid}) +
                   ": Failed to select AID " + SMCCHelper.toString(contextAID) +
                   ": " + SMCCHelper.toString(responseAPDU.getBytes());
@@ -150,8 +158,9 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
       }
 
       if (pin.length > 7) {
-        log.error("Invalid PIN");
-        throw new SignatureCardException("Invalid PIN");
+        icc.endExclusive();
+        log.error("PIN too long");
+        throw new SignatureCardException("PIN too long");
       }
       byte length = (byte) (0x20 | pin.length * 2);
 
@@ -166,24 +175,27 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
       ResponseAPDU responseAPDU = channel.transmit(verifyAPDU);
 
       if (responseAPDU.getSW() != 0x9000) {
+        icc.endExclusive();
         String msg = "Failed to activate PIN " + SMCCHelper.toString(new byte[]{kid}) + ": " + SMCCHelper.toString(responseAPDU.getBytes());
         log.error(msg);
         throw new SignatureCardException(msg);
       }
-
-
       icc.endExclusive();
-
-
     } catch (CardException ex) {
-      log.error("Failed to get PIN status: " + ex.getMessage());
-      throw new SignatureCardException("Failed to get PIN status", ex);
+      log.error("Failed to activate PIN: " + ex.getMessage());
+      throw new SignatureCardException(ex.getMessage(), ex);
+    } finally {
+      try {
+        icc.endExclusive();
+      } catch (CardException ex) {
+        log.trace("failed to end exclusive card access");
+      }
     }
   }
 
-  private void changePIN(byte kid, byte[] contextAID, byte[] oldPIN, byte[] newPIN) throws SignatureCardException {
+  private void changePIN(byte kid, byte[] contextAID, byte[] oldPIN, byte[] newPIN) throws SignatureCardException, VerificationFailedException {
+    Card icc = card.getCard();
     try {
-      Card icc = card.getCard();
       icc.beginExclusive();
       CardChannel channel = icc.getBasicChannel();
 
@@ -191,6 +203,7 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
         CommandAPDU selectAPDU = new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, contextAID);
         ResponseAPDU responseAPDU = channel.transmit(selectAPDU);
         if (responseAPDU.getSW() != 0x9000) {
+          icc.endExclusive();
           String msg = "Failed to change PIN " + SMCCHelper.toString(new byte[]{kid}) +
                   ": Failed to select AID " + SMCCHelper.toString(contextAID) +
                   ": " + SMCCHelper.toString(responseAPDU.getBytes());
@@ -200,8 +213,9 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
       }
 
       if (oldPIN.length > 7 || newPIN.length > 7) {
-        log.error("Invalid PIN");
-        throw new SignatureCardException("Invalid PIN");
+        icc.endExclusive();
+        log.error("PIN too long");
+        throw new SignatureCardException("PIN too long");
       }
       byte oldLength = (byte) (0x20 | oldPIN.length * 2);
       byte newLength = (byte) (0x20 | newPIN.length * 2);
@@ -220,49 +234,43 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
       CommandAPDU verifyAPDU = new CommandAPDU(apdu);
       ResponseAPDU responseAPDU = channel.transmit(verifyAPDU);
 
+      if (responseAPDU.getSW1() == 0x63 && responseAPDU.getSW2() >> 4 == 0xc) {
+        icc.endExclusive();
+        int retries = responseAPDU.getSW2() & 0x0f;
+        log.error("Wrong PIN, " + retries + " tries left");
+        throw new VerificationFailedException(retries);
+      }
       if (responseAPDU.getSW() != 0x9000) {
-        String msg = "Failed to change PIN " + SMCCHelper.toString(new byte[]{kid}) + ": " + SMCCHelper.toString(responseAPDU.getBytes());
+        icc.endExclusive();
+        String msg = "Failed to change PIN " 
+                + SMCCHelper.toString(new byte[]{kid}) + ": "
+                + SMCCHelper.toString(responseAPDU.getBytes());
         log.error(msg);
         throw new SignatureCardException(msg);
       }
-
-
-      icc.endExclusive();
-
+      
 
     } catch (CardException ex) {
-      log.error("Failed to get PIN status: " + ex.getMessage());
-      throw new SignatureCardException("Failed to get PIN status", ex);
+      log.error("Failed to change PIN: " + ex.getMessage());
+      throw new SignatureCardException(ex.getMessage(), ex);
+    } finally {
+      try {
+        icc.endExclusive();
+      } catch (CardException ex) {
+        log.trace("failed to end exclusive card access");
+      }
     }
   }
 
   public Map<PINSpec, STATUS> getPINStatuses() throws SignatureCardException {
+    Card icc = card.getCard();
     try {
-      Card icc = card.getCard();
       icc.beginExclusive();
       CardChannel channel = icc.getBasicChannel();
 
       HashMap<PINSpec, STATUS> pinStatuses = new HashMap<PINSpec, STATUS>();
       List<PINSpec> pins = card.getPINSpecs();
 
-      //select DF_SichereSignatur 00 A4 04 0C 08 D0 40 00 00 17 00 12 01
-//      CommandAPDU selectAPDU = new CommandAPDU(new byte[]{(byte) 0x00, (byte) 0xa4, (byte) 0x04, (byte) 0x0c, (byte) 0x08,
-//                (byte) 0xd0, (byte) 0x40, (byte) 0x00, (byte) 0x00, (byte) 0x17, (byte) 0x00, (byte) 0x12, (byte) 0x01});
-//      ResponseAPDU rAPDU = channel.transmit(selectAPDU);
-//      log.debug("SELECT FILE DF_SichereSignatur: " + SMCCHelper.toString(rAPDU.getBytes()));
-
-      //select DF_SIG DF 70
-//      CommandAPDU selectAPDU = new CommandAPDU(new byte[]{(byte) 0x00, (byte) 0xa4, (byte) 0x00, (byte) 0x0c, (byte) 0x02,
-//                (byte) 0xdf, (byte) 0x70 });
-//      ResponseAPDU rAPDU = channel.transmit(selectAPDU);
-//      log.debug("SELECT FILE DF_SIG: " + SMCCHelper.toString(rAPDU.getBytes()));
-
-      //select DF_DEC DF 71
-//      CommandAPDU selectAPDU = new CommandAPDU(new byte[]{(byte) 0x00, (byte) 0xa4, (byte) 0x04, (byte) 0x0c, (byte) 0x08,
-//                (byte) 0xd0, (byte) 0x40, (byte) 0x00, (byte) 0x00, (byte) 0x17, (byte) 0x00, (byte) 0x12, (byte) 0x01});
-//      ResponseAPDU rAPDU = channel.transmit(selectAPDU);
-//      log.debug("SELECT FILE DF_SichereSignatur: " + SMCCHelper.toString(rAPDU.getBytes()));
-
       for (PINSpec pinSpec : pins) {
         byte kid = pinSpec.getKID();
         byte[] contextAID = pinSpec.getContextAID();
@@ -271,6 +279,7 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
           CommandAPDU selectAPDU = new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, contextAID);
           ResponseAPDU responseAPDU = channel.transmit(selectAPDU);
           if (responseAPDU.getSW() != 0x9000) {
+            icc.endExclusive();
             String msg = "Failed to activate PIN " + SMCCHelper.toString(new byte[]{kid}) +
                     ": Failed to select AID " + SMCCHelper.toString(contextAID) +
                     ": " + SMCCHelper.toString(responseAPDU.getBytes());
@@ -296,13 +305,19 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
 
         pinStatuses.put(pinSpec, status);
       }
-      icc.endExclusive();
+//      icc.endExclusive();
 
       return pinStatuses;
 
     } catch (CardException ex) {
       log.error("Failed to get PIN status: " + ex.getMessage());
-      throw new SignatureCardException("Failed to get PIN status", ex);
+      throw new SignatureCardException(ex.getMessage(), ex);
+    } finally {
+      try {
+        icc.endExclusive();
+      } catch (CardException ex) {
+        log.trace("failed to end exclusive card access");
+      }
     }
   }
 
@@ -312,7 +327,7 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
     for (int i = 0; i < length; i++) {
       pin[i] = (byte) (16*Character.digit(pinChars[i*2], 16) + Character.digit(pinChars[i*2+1], 16));
     }
-    log.trace("***** "  + SMCCHelper.toString(pin) + " ******");
+//    log.trace("***** "  + SMCCHelper.toString(pin) + " ******");
     return pin;
   }
 
@@ -324,7 +339,7 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
               this, "cancel");
     } catch (SignatureCardException ex) {
       gui.showErrorDialog(BKUGUIFacade.ERR_UNKNOWN_WITH_PARAM, 
-              new Object[]{"FAILED TO GET PIN STATUSES: " + ex.getMessage()},
+              new Object[]{ex.getMessage()},
               this, "cancel");
     }
   }
diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
index e51044af..b6099db6 100644
--- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
+++ b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
@@ -41,6 +41,7 @@ help.pin.mgmt=help.pin.mgmt
 err.activate=<html>Beim Aktivieren der {0} trat ein Fehler auf.</html>
 err.change=<html>Beim \u00C4ndern der {0} trat ein Fehler auf.</html>
 err.unblock=<html>Das Entsperren der {0} wird nicht unterst\u00FCtzt.</html>
+err.retries=<html>Falscher {0}, noch {1} Versuche</html>
 
 status.not.active=NICHT AKTIV
 status.active=AKTIV
diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
index 1cf4a102..40332826 100644
--- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
+++ b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
@@ -38,11 +38,12 @@ button.unblock=Unblock
 help.activation=help.activation
 help.pin.mgmt=help.pin.mgmt
 
-err.activate=<html>An error occured during activation of {0}.</html>
-err.change=<html>An error occured during changing of {0}.</html>
+err.activate=<html>An error occured during the activation of {0}.</html>
+err.change=<html>An error occured during the changing of {0}.</html>
 err.unblock=<html>Unblocking of {0} is not supported.</html>
+err.retries=<html>Wrong {0}, {1} tries remaining</html>
 
-status.not.active=Not active
-status.active=Active
-status.blocked=Blocked
-status.unknown=Unknown
+status.not.active=NOT ACTIVE
+status.active=ACTIVE
+status.blocked=BLOCKED
+status.unknown=UNKNOWN
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 6fd29ba9..ae91670a 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -97,6 +97,10 @@ public interface BKUGUIFacade {
     
 //  public void init(Container contentPane, Locale locale, Style guiStyle, URL background, ActionListener helpListener);
 
+  /**
+   * BKUWorker needs to init signature card with locale
+   * @return
+   */
   public Locale getLocale();
 
   public void showWelcomeDialog();
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 1d5a2cf4..ca597701 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -115,13 +115,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
             ActionListener helpListener) {
       this.contentPane = contentPane;
 
-      if (locale != null) {
-          Locale lang = new Locale(locale.getLanguage().substring(0,2));
-          log.debug("loading applet resources for language: " + lang.toString());
-          messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, lang);
-      } else {
-          messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
-      }
+      loadMessageBundle(locale);
 
       if (guiStyle == Style.advanced) {
         renderHeaderPanel = true;
@@ -230,11 +224,11 @@ public class BKUGUIImpl implements BKUGUIFacade {
 
       helpLabel = new JLabel();
       helpLabel.setIcon(new ImageIcon(getClass().getResource(HELP_IMG))); 
-      helpLabel.getAccessibleContext().setAccessibleName(messages.getString(ALT_HELP));
+      helpLabel.getAccessibleContext().setAccessibleName(getMessage(ALT_HELP));
       helpLabel.addMouseListener(helpListener);
       helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
     
-      buttonSize = initButtonSize(messages, renderCancelButton);
+      buttonSize = initButtonSize();
         
       if (renderHeaderPanel) {
         headerPanel = new JPanel();
@@ -292,11 +286,33 @@ public class BKUGUIImpl implements BKUGUIFacade {
       contentPanelLayout.setVerticalGroup(verticalContent);
     }
 
+    /**
+     * BKUWorker inits signaturecard with locale
+     * @return
+     */
     @Override
     public Locale getLocale() {
       return messages.getLocale();
     }
 
+    /**
+     * to be overridden by subclasses providing additional resource messages
+     * @param key
+     * @return
+     */
+    protected String getMessage(String key) {
+      return messages.getString(key);
+    }
+
+    /**
+     * to be overridden by subclasses providing additional resource messages
+     * @param key
+     * @return
+     */
+    protected boolean hasMessage(String key) {
+      return messages.containsKey(key);
+    }
+
     @Override
     public void showWelcomeDialog() {
       
@@ -318,10 +334,10 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 welcomeMsgLabel.setFont(welcomeMsgLabel.getFont().deriveFont(welcomeMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                 
                 if (renderHeaderPanel) {
-                  titleLabel.setText(messages.getString(TITLE_WELCOME));
-                  welcomeMsgLabel.setText(messages.getString(MESSAGE_WAIT));
+                  titleLabel.setText(getMessage(TITLE_WELCOME));
+                  welcomeMsgLabel.setText(getMessage(MESSAGE_WAIT));
                 } else {
-                  welcomeMsgLabel.setText(messages.getString(TITLE_WELCOME));   
+                  welcomeMsgLabel.setText(getMessage(TITLE_WELCOME));
                 }
                 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
@@ -364,14 +380,14 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 buttonPanel.removeAll();
 
                 if (renderHeaderPanel) {
-                  titleLabel.setText(messages.getString(TITLE_INSERTCARD));
+                  titleLabel.setText(getMessage(TITLE_INSERTCARD));
                 }
                 
                 helpListener.setHelpTopic(HELP_INSERTCARD);
 
                 JLabel insertCardMsgLabel = new JLabel();
                 insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                insertCardMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD));
+                insertCardMsgLabel.setText(getMessage(MESSAGE_INSERTCARD));
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
@@ -395,7 +411,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 if (renderCancelButton) {
                   JButton cancelButton = new JButton();
                   cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                  cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                  cancelButton.setText(getMessage(BUTTON_CANCEL));
                   cancelButton.addActionListener(cancelListener);
                   cancelButton.setActionCommand(cancelCommand);
 
@@ -440,10 +456,10 @@ public class BKUGUIImpl implements BKUGUIFacade {
               insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
 
               if (renderHeaderPanel) {
-                titleLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED));
-                insertCardMsgLabel.setText(messages.getString(MESSAGE_INSERTCARD));
+                titleLabel.setText(getMessage(TITLE_CARD_NOT_SUPPORTED));
+                insertCardMsgLabel.setText(getMessage(MESSAGE_INSERTCARD));
               } else {
-                insertCardMsgLabel.setText(messages.getString(TITLE_CARD_NOT_SUPPORTED)); 
+                insertCardMsgLabel.setText(getMessage(TITLE_CARD_NOT_SUPPORTED));
               }
 
               helpListener.setHelpTopic(HELP_CARDNOTSUPPORTED);
@@ -469,7 +485,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
               if (renderCancelButton) {
                 JButton cancelButton = new JButton();
                 cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                cancelButton.setText(getMessage(BUTTON_CANCEL));
                 cancelButton.addActionListener(cancelListener);
                 cancelButton.setActionCommand(cancelCommand);
 
@@ -506,23 +522,23 @@ public class BKUGUIImpl implements BKUGUIFacade {
 
                 if (renderHeaderPanel) {
                   if (numRetries < 0) {
-                      String cardpinTitle = messages.getString(TITLE_CARDPIN);
+                      String cardpinTitle = getMessage(TITLE_CARDPIN);
                       titleLabel.setText(MessageFormat.format(cardpinTitle, new Object[]{pinSpec.getLocalizedName()}));
                   } else {
-                      titleLabel.setText(messages.getString(TITLE_RETRY));
+                      titleLabel.setText(getMessage(TITLE_RETRY));
                   }
                 }
 
                 JButton okButton = new JButton();
                 okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                okButton.setText(messages.getString(BUTTON_OK));
+                okButton.setText(getMessage(BUTTON_OK));
                 okButton.setEnabled(false);
                 okButton.setActionCommand(okCommand);
                 okButton.addActionListener(okListener);
 
                 JLabel cardPinLabel = new JLabel();
                 cardPinLabel.setFont(cardPinLabel.getFont().deriveFont(cardPinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                String pinLabel = messages.getString(LABEL_PIN);
+                String pinLabel = getMessage(LABEL_PIN);
                 cardPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
 
                 pinField = new JPasswordField();
@@ -542,7 +558,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 JLabel infoLabel = new JLabel();
                 if (numRetries < 0) {
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                  String infoPattern = messages.getString(MESSAGE_ENTERPIN);
+                  String infoPattern = getMessage(MESSAGE_ENTERPIN);
                   if (shortText) {
                     infoLabel.setText(MessageFormat.format(infoPattern, new Object[] {"PIN"}));
                   } else {
@@ -552,9 +568,9 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 } else {
                   String retryPattern;
                   if (numRetries < 2) {
-                    retryPattern = messages.getString(MESSAGE_LAST_RETRY);
+                    retryPattern = getMessage(MESSAGE_LAST_RETRY);
                   } else {
-                    retryPattern = messages.getString(MESSAGE_RETRIES);
+                    retryPattern = getMessage(MESSAGE_RETRIES);
                   }
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
                   infoLabel.setText(MessageFormat.format(retryPattern, new Object[]{String.valueOf(numRetries)}));
@@ -564,7 +580,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 
                 JLabel pinsizeLabel = new JLabel();
                 pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
-                String pinsizePattern = messages.getString(LABEL_PINSIZE);
+                String pinsizePattern = getMessage(LABEL_PINSIZE);
                 String pinSize = String.valueOf(pinSpec.getMinLength());
                 if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
                     pinSize += "-" + pinSpec.getMaxLength();
@@ -638,7 +654,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 if (renderCancelButton) {
                   JButton cancelButton = new JButton();
                   cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                  cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                  cancelButton.setText(getMessage(BUTTON_CANCEL));
                   cancelButton.setActionCommand(cancelCommand);
                   cancelButton.addActionListener(cancelListener);
 
@@ -699,22 +715,22 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 
                 if (renderHeaderPanel) {
                   if (numRetries < 0) {
-                      titleLabel.setText(messages.getString(TITLE_SIGN));
+                      titleLabel.setText(getMessage(TITLE_SIGN));
                   } else {
-                      titleLabel.setText(messages.getString(TITLE_RETRY));
+                      titleLabel.setText(getMessage(TITLE_RETRY));
                   }
                 }
 
                 JButton signButton = new JButton();
                 signButton.setFont(signButton.getFont().deriveFont(signButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                signButton.setText(messages.getString(BUTTON_SIGN));
+                signButton.setText(getMessage(BUTTON_SIGN));
                 signButton.setEnabled(false);
                 signButton.setActionCommand(signCommand);
                 signButton.addActionListener(signListener);
 
                 JLabel signPinLabel = new JLabel();
                 signPinLabel.setFont(signPinLabel.getFont().deriveFont(signPinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                String pinLabel = messages.getString(LABEL_PIN);
+                String pinLabel = getMessage(LABEL_PIN);
                 signPinLabel.setText(MessageFormat.format(pinLabel, new Object[]{pinSpec.getLocalizedName()}));
 
                 pinField = new JPasswordField();
@@ -733,7 +749,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
 
                 JLabel pinsizeLabel = new JLabel();
                 pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
-                String pinsizePattern = messages.getString(LABEL_PINSIZE);
+                String pinsizePattern = getMessage(LABEL_PINSIZE);
                 String pinSize = String.valueOf(pinSpec.getMinLength());
                 if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
                     pinSize += "-" + pinSpec.getMaxLength();
@@ -744,9 +760,9 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 if (numRetries < 0) {
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                   if (shortText) {
-                    infoLabel.setText(messages.getString(MESSAGE_HASHDATALINK_TINY));
+                    infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_TINY));
                   } else {
-                    infoLabel.setText(messages.getString(MESSAGE_HASHDATALINK));
+                    infoLabel.setText(getMessage(MESSAGE_HASHDATALINK));
                   }
                   infoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
                   infoLabel.setForeground(HYPERLINK_COLOR);
@@ -762,9 +778,9 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 } else {
                   String retryPattern;
                   if (numRetries < 2) {
-                    retryPattern = messages.getString(MESSAGE_LAST_RETRY);
+                    retryPattern = getMessage(MESSAGE_LAST_RETRY);
                   } else {
-                    retryPattern = messages.getString(MESSAGE_RETRIES);
+                    retryPattern = getMessage(MESSAGE_RETRIES);
                   }
                   infoLabel.setText(MessageFormat.format(retryPattern, new Object[]{String.valueOf(numRetries)}));
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
@@ -839,7 +855,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 if (renderCancelButton) {
                   JButton cancelButton = new JButton();
                   cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                  cancelButton.setText(messages.getString(BUTTON_CANCEL));
+                  cancelButton.setText(getMessage(BUTTON_CANCEL));
                   cancelButton.setActionCommand(cancelCommand);
                   cancelButton.addActionListener(cancelListener);
 
@@ -881,12 +897,12 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 buttonPanel.removeAll();
 
                 if (renderHeaderPanel) {
-                  titleLabel.setText(messages.getString(TITLE_ERROR));
+                  titleLabel.setText(getMessage(TITLE_ERROR));
                 }
 
                 helpListener.setHelpTopic(errorMsgKey);
                 
-                String errorMsgPattern = messages.getString(errorMsgKey);
+                String errorMsgPattern = getMessage(errorMsgKey);
                 String errorMsg = MessageFormat.format(errorMsgPattern, errorMsgParams);
                 
                 JLabel errorMsgLabel = new JLabel();
@@ -902,7 +918,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 if (!renderHeaderPanel) {
                   JLabel errorTitleLabel = new JLabel();
                   errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                  errorTitleLabel.setText(messages.getString(TITLE_ERROR));
+                  errorTitleLabel.setText(getMessage(TITLE_ERROR));
                   errorTitleLabel.setForeground(ERROR_COLOR);
                 
                   mainHorizontal
@@ -923,7 +939,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 
                 JButton okButton = new JButton();
                 okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                okButton.setText(messages.getString(BUTTON_OK));
+                okButton.setText(getMessage(BUTTON_OK));
                 okButton.setActionCommand(okCommand);
                 okButton.addActionListener(okListener);
 
@@ -959,12 +975,12 @@ public class BKUGUIImpl implements BKUGUIFacade {
           buttonPanel.removeAll();
 
           if (renderHeaderPanel) {
-            titleLabel.setText(messages.getString(TITLE_ERROR));
+            titleLabel.setText(getMessage(TITLE_ERROR));
           }
 
           helpListener.setHelpTopic(errorMsgKey);
           
-          String errorMsgPattern = messages.getString(errorMsgKey);
+          String errorMsgPattern = getMessage(errorMsgKey);
           String errorMsg = MessageFormat.format(errorMsgPattern, errorMsgParams);
 
           JLabel errorMsgLabel = new JLabel();
@@ -981,7 +997,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
           if (!renderHeaderPanel) {
             JLabel errorTitleLabel = new JLabel();
             errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
-            errorTitleLabel.setText(messages.getString(TITLE_ERROR));
+            errorTitleLabel.setText(getMessage(TITLE_ERROR));
             errorTitleLabel.setForeground(ERROR_COLOR);
 
             mainHorizontal
@@ -1021,7 +1037,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 buttonPanel.removeAll();
 
                 if (renderHeaderPanel) {
-                  titleLabel.setText(messages.getString(TITLE_WAIT));
+                  titleLabel.setText(getMessage(TITLE_WAIT));
                 }
                 
                 helpListener.setHelpTopic(HELP_WAIT);
@@ -1031,7 +1047,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 if (waitMessage != null) {
                     waitMsgLabel.setText("<html>" + waitMessage + "</html>");
                 } else {
-                    waitMsgLabel.setText(messages.getString(MESSAGE_WAIT));
+                    waitMsgLabel.setText(getMessage(MESSAGE_WAIT));
                 }
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
@@ -1079,7 +1095,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
             final String okCommand) {
       
       if (signedReferences == null) {
-        showErrorDialog(messages.getString(ERR_NO_HASHDATA), new Object[] {"No SignedReferences provided"}, okListener, okCommand);
+        showErrorDialog(getMessage(ERR_NO_HASHDATA), new Object[] {"No SignedReferences provided"}, okListener, okCommand);
         return;
       }
       
@@ -1142,14 +1158,14 @@ public class BKUGUIImpl implements BKUGUIFacade {
           buttonPanel.removeAll();
 
           if (renderHeaderPanel) {
-            titleLabel.setText(messages.getString(TITLE_HASHDATA));
+            titleLabel.setText(getMessage(TITLE_HASHDATA));
           }
           
           helpListener.setHelpTopic(HELP_HASHDATALIST);
           
           JLabel refIdLabel = new JLabel();
           refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-          String refIdLabelPattern = messages.getString(MESSAGE_HASHDATALIST);
+          String refIdLabelPattern = getMessage(MESSAGE_HASHDATALIST);
           refIdLabel.setText(MessageFormat.format(refIdLabelPattern, new Object[]{signedReferences.size()}));
 
           HashDataTableModel tableModel = new HashDataTableModel(signedReferences, renderRefId);
@@ -1229,7 +1245,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
 
           JButton backButton = new JButton();
           backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-          backButton.setText(messages.getString(BUTTON_BACK));
+          backButton.setText(getMessage(BUTTON_BACK));
           backButton.setActionCommand(backCommand);
           backButton.addActionListener(backListener);
 
@@ -1271,15 +1287,15 @@ public class BKUGUIImpl implements BKUGUIFacade {
           fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
           fileDialog.setFileHidingEnabled(true);
           if (signedRefs.size() == 1) {
-            fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVE));
+            fileDialog.setDialogTitle(getMessage(WINDOWTITLE_SAVE));
             fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
             String mimeType = signedRefs.get(0).getMimeType();
             MimeFilter mimeFilter = new MimeFilter(mimeType, messages);
             fileDialog.setFileFilter(mimeFilter);
-            String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + MimeFilter.getExtension(mimeType);
+            String filename = getMessage(SAVE_HASHDATAINPUT_PREFIX) + MimeFilter.getExtension(mimeType);
             fileDialog.setSelectedFile(new File(userHome, filename));
           } else {
-            fileDialog.setDialogTitle(messages.getString(WINDOWTITLE_SAVEDIR));
+            fileDialog.setDialogTitle(getMessage(WINDOWTITLE_SAVEDIR));
             fileDialog.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
           }
           
@@ -1292,14 +1308,14 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 String id = hashDataInput.getReferenceId();
                 File file;
                 if (f.isDirectory()) {
-                  String filename = messages.getString(SAVE_HASHDATAINPUT_PREFIX) + '_' + id + MimeFilter.getExtension(mimeType);
+                  String filename = getMessage(SAVE_HASHDATAINPUT_PREFIX) + '_' + id + MimeFilter.getExtension(mimeType);
                   file = new File(f, filename);
                 } else {
                   file = f;
                 }
                 if (file.exists()) {
-                  String ovrwrt = messages.getString(MESSAGE_OVERWRITE);
-                  int overwrite = JOptionPane.showConfirmDialog(fileDialog, MessageFormat.format(ovrwrt, file), messages.getString(WINDOWTITLE_OVERWRITE), JOptionPane.OK_CANCEL_OPTION);
+                  String ovrwrt = getMessage(MESSAGE_OVERWRITE);
+                  int overwrite = JOptionPane.showConfirmDialog(fileDialog, MessageFormat.format(ovrwrt, file), getMessage(WINDOWTITLE_OVERWRITE), JOptionPane.OK_CANCEL_OPTION);
                   if (overwrite != JOptionPane.OK_OPTION) {
                     continue;
                   }
@@ -1352,34 +1368,50 @@ public class BKUGUIImpl implements BKUGUIFacade {
         });
       }
     }
-    
-  private static int initButtonSize(ResourceBundle messages, boolean renderCancelButton) {
 
-    int buttonSize = 0;
-    
-    JButton b = new JButton();
-    b.setText(messages.getString(BUTTON_OK));
-    if (b.getPreferredSize().width > buttonSize) {
-      buttonSize = b.getPreferredSize().width;
-    }
-    b.setText(messages.getString(BUTTON_SIGN));
-    if (b.getPreferredSize().width > buttonSize) {
-      buttonSize = b.getPreferredSize().width;
-    }
-    b.setText(messages.getString(BUTTON_BACK));
-    if (b.getPreferredSize().width > buttonSize) {
-      buttonSize = b.getPreferredSize().width;
-    }
-    b.setText(messages.getString(BUTTON_SAVE));
-    if (b.getPreferredSize().width > buttonSize) {
-      buttonSize = b.getPreferredSize().width;
+    /**
+     * Called from constructor.
+     * Subclasses may override this method to ensure the message bundle is loaded
+     * once initButtonSize (called from constructor as well) is called.
+     * (Only relevant if initButtonSize is overridden as well)
+     * @param locale
+     */
+    protected void loadMessageBundle(Locale locale) {
+      if (locale != null) {
+        Locale lang = new Locale(locale.getLanguage().substring(0, 2));
+        log.debug("loading applet resources for language: " + lang.toString());
+        messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, lang);
+      } else {
+        messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
+      }
     }
-    if (renderCancelButton) {
-      b.setText(messages.getString(BUTTON_CANCEL));
-      if (b.getPreferredSize().width > buttonSize) {
-        buttonSize = b.getPreferredSize().width;
+
+    protected int initButtonSize() {
+      int bs = 0;
+
+      JButton b = new JButton();
+      b.setText(getMessage(BUTTON_OK));
+      if (b.getPreferredSize().width > bs) {
+        bs = b.getPreferredSize().width;
+      }
+      b.setText(getMessage(BUTTON_SIGN));
+      if (b.getPreferredSize().width > bs) {
+        bs = b.getPreferredSize().width;
+      }
+      b.setText(getMessage(BUTTON_BACK));
+      if (b.getPreferredSize().width > bs) {
+        bs = b.getPreferredSize().width;
+      }
+      b.setText(getMessage(BUTTON_SAVE));
+      if (b.getPreferredSize().width > bs) {
+        bs = b.getPreferredSize().width;
+      }
+      if (renderCancelButton) {
+        b.setText(getMessage(BUTTON_CANCEL));
+        if (b.getPreferredSize().width > bs) {
+          bs = b.getPreferredSize().width;
+        }
       }
+      return bs;
     }
-    return buttonSize;
-  }
 }
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
index 81b70b7c..9a9bd444 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
@@ -315,10 +315,6 @@ public class STALRequestBrokerImpl implements STALRequestBroker {
       }
     }
     
-    @Override
-    public void setLocale(Locale locale) {
-    }
-
     private List<JAXBElement<? extends RequestType>> createSingleQuitRequest() {
       QuitRequestType quitT = of.createQuitRequestType();
       JAXBElement<QuitRequestType> quit = of.createGetNextRequestResponseTypeQuitRequest(quitT);
diff --git a/BKUOnline/src/main/webapp/PINManagement.jsp b/BKUOnline/src/main/webapp/PINManagement.jsp
new file mode 100644
index 00000000..0f08f64b
--- /dev/null
+++ b/BKUOnline/src/main/webapp/PINManagement.jsp
@@ -0,0 +1,79 @@
+<!--
+  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.
+-->
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8"
+         import="at.gv.egiz.org.apache.tomcat.util.http.AcceptLanguage"%>
+
+<!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 PIN Management</title>
+        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+        <script type="text/javascript" src="js/deployJava.js"></script>
+        <style type="text/css" media="all">@import "css/applet.css";</style>
+
+        <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
+        <META HTTP-EQUIV="EXPIRES" CONTENT="Mon, 22 Jul 2002 11:12:01 GMT">
+        <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
+    </head>
+    <%
+        String locale = request.getParameter("locale");
+        if (locale == null) {
+            String acceptLanguage = request.getHeader("Accept-Language");
+            locale = AcceptLanguage.getLocale(acceptLanguage).toString();
+        }
+        String widthP = request.getParameter("appletWidth");
+        String heightP = request.getParameter("appletHeight");
+        int width = (widthP == null) ? 295
+                : Integer.parseInt(widthP);
+        int height = (heightP == null) ? 195
+                : Integer.parseInt(heightP);
+        String guiStyle = request.getParameter("appletGuiStyle");
+        if (guiStyle == null) {
+            guiStyle = "advanced";
+        }
+        String backgroundImg = request.getParameter("appletBackground");
+    %>
+    <body id="appletpage" style="width:<%=width%>">
+            <script>
+                if (!deployJava.versionCheck('1.6.0_04+')) {
+                    document
+                    .write('<b>Diese Anwendung benötigt die Java Platform Version 1.6.0_04 oder höher.</b>' + '<input type="submit" value="Java Platform 1.6.0_02 installieren" onclick="deployJava.installLatestJRE();">');
+                } else {
+                    var attributes = {
+                        codebase :'applet',
+                        code : 'at.gv.egiz.bku.online.applet.PINManagementApplet.class',
+                        archive : 'BKUAppletExt.jar, commons-logging.jar, iaik_jce_me4se.jar',
+                        width : <%=width%>,
+                        height :<%=height%>
+                    };
+                    var parameters = {
+                        GuiStyle : '<%=guiStyle%>',
+                        Locale : '<%=locale%>',
+                        Background : '<%=backgroundImg%>',
+                        HelpURL : '../help/',
+                        SessionID : '<%=request.getSession().getId()%>',
+                        RedirectURL : '../',
+                        RedirectTarget: '_parent'
+                    };
+                    var version = '1.6.0_04';
+                    deployJava.runApplet(attributes, parameters, version);
+                }
+            </script>
+    </body>
+</html>
diff --git a/BKUOnline/src/main/webapp/SLRequestForm.html b/BKUOnline/src/main/webapp/SLRequestForm.html
new file mode 100644
index 00000000..2aed5298
--- /dev/null
+++ b/BKUOnline/src/main/webapp/SLRequestForm.html
@@ -0,0 +1,155 @@
+<!--
+  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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+    <head>
+        <title>Security-Layer v1.2 Request Formular</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <script language="JavaScript">
+            <!--
+            function setAppletDimension(width, height)
+            {
+                document.forms.slform.appletWidth.value=width;
+                document.forms.slform.appletHeight.value=height;
+            }
+            function setNOPRequest() {
+                document.forms.slform.XMLRequest.value='<?xml version="1.0" encoding="UTF-8"?><NullOperationRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>';
+            }
+            
+            //-->
+        </script>
+        <style type="text/css" media="all">@import "css/main.css";</style>
+
+    </head>
+    <body>
+        <h1>Security-Layer v1.2 Request Formular</h1>
+        <style type="text/css">
+            fieldset {
+                padding: 1em;
+                font: 80%/ 1 sans-serif;
+                background-color: #F2EFE9;
+                padding-left: 5em;
+            }
+
+            fieldset.submit {
+                float: none;
+                width: auto;
+                border: 0 none #FFF;
+                padding-left: 14em;
+                border-style: none;
+                background-color: transparent;
+            }
+
+            label {
+                float: left;
+                width: 8em;
+                margin-right: 0.5em;
+                padding-top: 0.2em;
+                text-align: right;
+                font-weight: bold;
+                color: #000;
+                padding-top: 0.2em;
+            }
+
+            legend {
+                border: 1px solid;
+                padding: 2px 6px
+            }
+        </style>
+
+        <p>
+        <form action="./http-security-layer-request" method="Post"
+              enctype="application/x-www-form-urlencoded" name="slform">
+            <!--input name="locale" value="es_MX" type="hidden" /-->
+            <fieldset><legend>Enter XML Request</legend>
+                <p><label for="XMLRequest">XML Request</label> <textarea
+                        name="XMLRequest" rows=15 cols="60" id="XMLRequest">
+<?xml version="1.0" encoding="UTF-8"?>
+<sl:CreateXMLSignatureRequest 
+   xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
+<sl:KeyboxIdentifier>SecureSignatureKeypair</sl:KeyboxIdentifier>
+   <sl:DataObjectInfo Structure="enveloping">
+     <sl:DataObject>
+       <sl:XMLContent>Ich bin ein einfacher Text.</sl:XMLContent>
+     </sl:DataObject>
+    <sl:TransformsInfo>
+      <sl:FinalDataMetaInfo>
+       <sl:MimeType>text/plain</sl:MimeType>
+       </sl:FinalDataMetaInfo>
+    </sl:TransformsInfo>
+  </sl:DataObjectInfo>
+</sl:CreateXMLSignatureRequest> 
+                </textarea></p>
+                <!--
+<?xml version="1.0" encoding="UTF-8" ?>
+<sl:InfoboxReadRequest
+    xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
+    <sl:InfoboxIdentifier>IdentityLink</sl:InfoboxIdentifier>
+    <sl:BinaryFileParameters ContentIsXMLEntity="true" />
+</sl:InfoboxReadRequest>
+-->
+<!--
+<?xml version='1.0' encoding='UTF-8'?>
+<sl10:InfoboxUpdateRequest xmlns:sl10='http://www.buergerkarte.at/namespaces/securitylayer/1.2#'>
+    <sl10:InfoboxIdentifier>CardChannel</sl10:InfoboxIdentifier>
+    <sl10:BinaryFileParameters>
+        <sl10:XMLContent>
+            <Script>
+                <Reset cold='true' />
+                <CommandAPDU sequence='1' of='2' expectedSW='9000'>00A4000C023F00</CommandAPDU>
+                <CommandAPDU sequence='2' of='2' expectedSW='9000'>00B0820000</CommandAPDU>
+            </Script>
+        </sl10:XMLContent>
+    </sl10:BinaryFileParameters>
+</sl10:InfoboxUpdateRequest>
+-->
+
+                <p>
+                    <label for="appletGuiStyle">GUI Style</label>
+                    <input type="radio" name="appletGuiStyle" value="tiny" onclick="setAppletDimension(152, 145)">tiny
+                    <input type="radio" name="appletGuiStyle" value="simple" checked="checked" onclick="setAppletDimension(190,130)">simple
+                    <input type="radio" name="appletGuiStyle" value="advanced" onclick="setAppletDimension(300, 180)">advanced
+                </p>
+                <p><label for="appletWidth">Applet Width</label> <input
+                    name="appletWidth" value="190" id="appletWidth">
+                <p><label for="appletHeight">Applet Height</label> <input
+                    name="appletHeight" value="130" id="appletHeight">
+                <p><label for="appletBackground">Applet Background</label> <input
+                    name="appletBackground" value="" id="appletBackground">
+
+
+                <p>
+                    <label for="appletExtension">Extension</label>
+                    <input type="radio" name="appletExtension" value="activation" onclick="setInfoboxUpdateRequest()">Activation
+                    <input type="radio" name="appletExtension" value="pin" onclick="setAppletDimension(400, 200)">PIN Management
+                </p>
+
+<!--
+                <p><label for="RedirectURL">RedirectURL</label> <input
+                    name="RedirectURL" value="" id="RedirectURL"></p>
+                <p><label for="DataURL">DataURL</label> <input name="DataURL"
+                    value="" id="DataURL"></p>
+                <p><label for="StyleSheetURL">StyleSheetURL</label> <input
+                    name="StyleSheetURL" value="" id="StyleSheetURL"></p>
+                <p>
+-->
+            </fieldset>
+            <fieldset class="submit"><input type="submit" class="submit"></fieldset>
+        </form>
+
+    </body>
+</html>
diff --git a/BKUOnline/src/main/webapp/css/applet.css b/BKUOnline/src/main/webapp/css/applet.css
index 4bfbd77d..d2c734a1 100644
--- a/BKUOnline/src/main/webapp/css/applet.css
+++ b/BKUOnline/src/main/webapp/css/applet.css
@@ -1,4 +1,3 @@
-
 root { 
     display: block;
 }
diff --git a/BKUOnline/src/main/webapp/css/main.css b/BKUOnline/src/main/webapp/css/main.css
new file mode 100644
index 00000000..114b8da9
--- /dev/null
+++ b/BKUOnline/src/main/webapp/css/main.css
@@ -0,0 +1,48 @@
+/* 
+Document   : main
+Created on : 27.02.2009, 10:24:41
+Author     : clemens
+Description:
+Purpose of the stylesheet follows.
+*/
+
+/* 
+TODO customize this sample style
+Syntax recommendation http://www.w3.org/TR/REC-CSS2/
+*/
+
+root { 
+    display: block;
+}
+
+body {
+    font-family: sans-serif;
+    font-size: 14px;
+}
+
+h1 {
+    font-size: 16px;
+}
+
+.box {
+    margin-top: 10px;
+    color: #292929;
+    width: 250px;
+    border: 1px solid #BABABA;
+    background-color: #ddd;
+    padding-left: 10px;
+    padding-right: 10px;
+    margin-left: 10px;
+    margin-bottom: 1em;
+    -o-border-radius: 10px;
+    -moz-border-radius: 12px;
+    -webkit-border-radius: 10px;
+    -webkit-box-shadow: 0px 3px 7px #adadad;
+    border-radius: 10px;
+    -moz-box-sizing: border-box;
+    -opera-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    -khtml-box-sizing: border-box;
+    box-sizing: border-box;
+    overflow: hidden;
+}
\ No newline at end of file
diff --git a/BKUOnline/src/main/webapp/index.html b/BKUOnline/src/main/webapp/index.html
index 94e2890f..653da5b1 100644
--- a/BKUOnline/src/main/webapp/index.html
+++ b/BKUOnline/src/main/webapp/index.html
@@ -16,44 +16,21 @@
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-<head>
-<title>BKU Online</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body>
-<style type="text/css">
-  .box {
-    margin-top: 10px;
-    color: #292929;
-    width: 300px;
-    border: 1px solid #BABABA;
-    background-color: #ddd;
-    padding-left: 10px;
-    padding-right: 10px;
-    margin-left: 10px;
-    margin-bottom: 1em;
-    -o-border-radius: 10px;
-    -moz-border-radius: 12px;
-    -webkit-border-radius: 10px;
-    -webkit-box-shadow: 0px 3px 7px #adadad;
-    border-radius: 10px;
-    -moz-box-sizing: border-box;
-    -opera-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -khtml-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-  }
-</style>
-<div id="animDiv" class="box">
-<p>
-<h1>TestRequest</h1>
-<a href="slRequestForm.html">Security Layer Request</a>
-<h1>STAL Service</h1>
-<a href="stal">STAL Service Endpoint Information</a>
-</p>
-</div>
-
-
-</body>
+    <head>
+        <title>BKU Online</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <style type="text/css" media="all">@import "css/main.css";</style>
+    </head>
+    <body>
+        <div id="animDiv" class="box">
+            <p>
+                <h1>SL Request</h1>
+                <a href="SLRequestForm.html">Security Layer Request</a>
+                <h1>PIN Management</h1>
+                <a href="PINManagement.jsp">PIN Management Applet</a>
+                <h1>STAL Service</h1>
+                <a href="stal">STAL Service Endpoint</a>
+            </p>
+        </div>
+    </body>
 </html>
diff --git a/BKUOnline/src/main/webapp/slRequestForm.html b/BKUOnline/src/main/webapp/slRequestForm.html
deleted file mode 100644
index 76cd1be9..00000000
--- a/BKUOnline/src/main/webapp/slRequestForm.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!--
-  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.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>Security-Layer v1.2 Request Formular</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-        <script language="JavaScript">
-            <!--
-            function setAppletDimension(width, height)
-            {
-                document.forms.slform.appletWidth.value=width;
-                document.forms.slform.appletHeight.value=height;
-            }
-            function setNOPRequest() {
-                document.forms.slform.XMLRequest.value='<?xml version="1.0" encoding="UTF-8"?><NullOperationRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>';
-            }
-            
-            //-->
-        </script>
-
-    </head>
-    <body>
-        <h1>Security-Layer v1.2 Request Formular</h1>
-        <style type="text/css">
-            fieldset {
-                padding: 1em;
-                font: 80%/ 1 sans-serif;
-                background-color: #F2EFE9;
-                padding-left: 5em;
-            }
-
-            fieldset.submit {
-                float: none;
-                width: auto;
-                border: 0 none #FFF;
-                padding-left: 14em;
-                border-style: none;
-                background-color: transparent;
-            }
-
-            label {
-                float: left;
-                width: 8em;
-                margin-right: 0.5em;
-                padding-top: 0.2em;
-                text-align: right;
-                font-weight: bold;
-                color: #000;
-                padding-top: 0.2em;
-            }
-
-            legend {
-                border: 1px solid;
-                padding: 2px 6px
-            }
-        </style>
-
-        <p>
-        <form action="./http-security-layer-request" method="Post"
-              enctype="application/x-www-form-urlencoded" name="slform">
-            <!--input name="locale" value="es_MX" type="hidden" /-->
-            <fieldset><legend>Enter XML Request</legend>
-                <p><label for="XMLRequest">XML Request</label> <textarea
-                        name="XMLRequest" rows=15 cols="60" id="XMLRequest">
-<?xml version="1.0" encoding="UTF-8"?>
-<sl:CreateXMLSignatureRequest 
-   xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
-<sl:KeyboxIdentifier>SecureSignatureKeypair</sl:KeyboxIdentifier>
-   <sl:DataObjectInfo Structure="enveloping">
-     <sl:DataObject>
-       <sl:XMLContent>Ich bin ein einfacher Text.</sl:XMLContent>
-     </sl:DataObject>
-    <sl:TransformsInfo>
-      <sl:FinalDataMetaInfo>
-       <sl:MimeType>text/plain</sl:MimeType>
-       </sl:FinalDataMetaInfo>
-    </sl:TransformsInfo>
-  </sl:DataObjectInfo>
-</sl:CreateXMLSignatureRequest> 
-                </textarea></p>
-                <!--
-<?xml version="1.0" encoding="UTF-8" ?>
-<sl:InfoboxReadRequest
-    xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
-    <sl:InfoboxIdentifier>IdentityLink</sl:InfoboxIdentifier>
-    <sl:BinaryFileParameters ContentIsXMLEntity="true" />
-</sl:InfoboxReadRequest>
--->
-<!--
-<?xml version='1.0' encoding='UTF-8'?>
-<sl10:InfoboxUpdateRequest xmlns:sl10='http://www.buergerkarte.at/namespaces/securitylayer/1.2#'>
-    <sl10:InfoboxIdentifier>CardChannel</sl10:InfoboxIdentifier>
-    <sl10:BinaryFileParameters>
-        <sl10:XMLContent>
-            <Script>
-                <Reset cold='true' />
-                <CommandAPDU sequence='1' of='2' expectedSW='9000'>00A4000C023F00</CommandAPDU>
-                <CommandAPDU sequence='2' of='2' expectedSW='9000'>00B0820000</CommandAPDU>
-            </Script>
-        </sl10:XMLContent>
-    </sl10:BinaryFileParameters>
-</sl10:InfoboxUpdateRequest>
--->
-
-                <p>
-                    <label for="appletGuiStyle">GUI Style</label>
-                    <input type="radio" name="appletGuiStyle" value="tiny" onclick="setAppletDimension(152, 145)">tiny
-                    <input type="radio" name="appletGuiStyle" value="simple" checked="checked" onclick="setAppletDimension(190,130)">simple
-                    <input type="radio" name="appletGuiStyle" value="advanced" onclick="setAppletDimension(300, 180)">advanced
-                </p>
-                <p><label for="appletWidth">Applet Width</label> <input
-                    name="appletWidth" value="190" id="appletWidth">
-                <p><label for="appletHeight">Applet Height</label> <input
-                    name="appletHeight" value="130" id="appletHeight">
-                <p><label for="appletBackground">Applet Background</label> <input
-                    name="appletBackground" value="" id="appletBackground">
-
-
-                <p>
-                    <label for="appletExtension">Extension</label>
-                    <input type="radio" name="appletExtension" value="activation" onclick="setInfoboxUpdateRequest()">Activation
-                    <input type="radio" name="appletExtension" value="pin" onclick="setAppletDimension(400, 200)">PIN Management
-                </p>
-
-<!--
-                <p><label for="RedirectURL">RedirectURL</label> <input
-                    name="RedirectURL" value="" id="RedirectURL"></p>
-                <p><label for="DataURL">DataURL</label> <input name="DataURL"
-                    value="" id="DataURL"></p>
-                <p><label for="StyleSheetURL">StyleSheetURL</label> <input
-                    name="StyleSheetURL" value="" id="StyleSheetURL"></p>
-                <p>
--->
-            </fieldset>
-            <fieldset class="submit"><input type="submit" class="submit"></fieldset>
-        </form>
-
-    </body>
-</html>
diff --git a/STAL/src/main/java/at/gv/egiz/stal/STAL.java b/STAL/src/main/java/at/gv/egiz/stal/STAL.java
index 7015ec29..a88d8f89 100644
--- a/STAL/src/main/java/at/gv/egiz/stal/STAL.java
+++ b/STAL/src/main/java/at/gv/egiz/stal/STAL.java
@@ -39,5 +39,5 @@ public interface STAL {
    * If the locale is not set the default locale will be used.
    * @param locale must not be null.
    */
-  public void setLocale(Locale locale);
+//  public void setLocale(Locale locale);
 }
\ No newline at end of file
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java
index 5b061850..144416ed 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java
@@ -216,7 +216,7 @@ public class BindingProcessorManagerImpl implements BindingProcessorManager {
     bindingProcessor.init(stal, commandInvokerClass.newInstance());
     if (locale != null) {
       bindingProcessor.setLocale(locale);
-      stal.setLocale(locale);
+//      stal.setLocale(locale);
     }
     return bindingProcessor;
   }
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java
index b6c5a8ca..23b71690 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java
@@ -54,7 +54,7 @@ public abstract class AbstractBKUWorker extends AbstractSMCCSTAL implements Acti
       throw new NullPointerException("No BKU GUI provided");
     }
     this.gui = gui;
-    this.locale = gui.getLocale();
+//    this.locale = gui.getLocale();
     addRequestHandler(QuitRequest.class, this);
   }
 
@@ -149,7 +149,7 @@ public abstract class AbstractBKUWorker extends AbstractSMCCSTAL implements Acti
         }
         break;
       case SMCCHelper.CARD_FOUND:
-        signatureCard = smccHelper.getSignatureCard(locale);
+        signatureCard = smccHelper.getSignatureCard(gui.getLocale());
         return false;
       }
       smccHelper.update(3000);
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
index 0074860f..3691156e 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
+//import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -41,7 +41,7 @@ public abstract class AbstractSMCCSTAL implements STAL {
 
   public final static int DEFAULT_MAX_RETRIES = 1;
 
-  protected Locale locale = Locale.getDefault();
+//  protected Locale locale = Locale.getDefault();
   protected SignatureCard signatureCard = null;
   protected Map<String, SMCCSTALRequestHandler> handlerMap = new HashMap<String, SMCCSTALRequestHandler>();
 
@@ -159,13 +159,13 @@ public abstract class AbstractSMCCSTAL implements STAL {
     return handlerMap.get(request.getSimpleName());
   }
 
-  @Override
-  public void setLocale(Locale locale) {
-    if (locale == null) {
-      throw new NullPointerException("Locale must not be set to null");
-    }
-    this.locale = locale;
-  }
+//  @Override
+//  public void setLocale(Locale locale) {
+//    if (locale == null) {
+//      throw new NullPointerException("Locale must not be set to null");
+//    }
+//    this.locale = locale;
+//  }
 
   public void setMaxRetries(int maxRetries) {
     this.maxRetries = maxRetries;
-- 
cgit v1.2.3


From a8690cc956924e1d83b0c45d21995ee2e10fbba2 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 4 Mar 2009 16:44:34 +0000
Subject: 1.1-rc3

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@311 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/gui/PINManagementGUIFacade.java |   4 +
 .../smccstal/ext/PINManagementRequestHandler.java  | 170 ++-----------
 .../gv/egiz/bku/gui/ActivationMessages.properties  |   4 +
 .../egiz/bku/gui/ActivationMessages_en.properties  |   4 +
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   4 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 177 ++++++-------
 .../gv/egiz/bku/online/webapp/ResultServlet.java   |   9 +-
 .../main/java/at/gv/egiz/bku/binding/DataUrl.java  |   3 +-
 .../at/gv/egiz/bku/binding/DataUrlConnection.java  |   6 -
 .../gv/egiz/bku/binding/DataUrlConnectionImpl.java |   7 +-
 .../bku/binding/LegacyDataUrlConnectionImpl.java   |  11 +-
 .../java/at/gv/egiz/bku/conf/Configurator.java     |  19 +-
 .../test/java/at/gv/egiz/stal/dummy/DummySTAL.java | 280 ++++++++++-----------
 smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java   |  42 +++-
 .../at/gv/egiz/smcc/AbstractSignatureCard.java     |  53 +++-
 .../src/main/java/at/gv/egiz/smcc/STARCOSCard.java |  90 +++++--
 smcc/src/main/java/at/gv/egiz/smcc/SWCard.java     |   8 +
 .../main/java/at/gv/egiz/smcc/SignatureCard.java   |  11 +-
 18 files changed, 445 insertions(+), 457 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
index ffdc230d..6b083e16 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
@@ -32,6 +32,10 @@ public interface PINManagementGUIFacade extends BKUGUIFacade {
   public static final String TITLE_ACTIVATE_PIN = "title.activate.pin";
   public static final String TITLE_CHANGE_PIN = "title.change.pin";
   public static final String TITLE_UNBLOCK_PIN = "title.unblock.pin";
+  public static final String TITLE_ACTIVATE_SUCCESS = "title.activate.success";
+  public static final String TITLE_CHANGE_SUCCESS = "title.change.success";
+  public static final String MESSAGE_ACTIVATE_SUCCESS = "message.activate.success";
+  public static final String MESSAGE_CHANGE_SUCCESS = "message.change.success";
   public static final String MESSAGE_PINMGMT = "message.pin.mgmt";
   public static final String MESSAGE_ACTIVATE_PIN = "message.activate.pin";
   public static final String MESSAGE_CHANGE_PIN = "message.change.pin";
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
index 851bff21..c8472c97 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
@@ -32,8 +32,6 @@ import at.gv.egiz.stal.ext.PINManagementResponse;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.smartcardio.Card;
 import javax.smartcardio.CardChannel;
 import javax.smartcardio.CardException;
@@ -50,11 +48,6 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
 
   protected static final Log log = LogFactory.getLog(PINManagementRequestHandler.class);
 
-//  protected ResourceBundle messages;
-
-//  public PINManagementRequestHandler(ResourceBundle messages) {
-//    this.messages = messages;
-//  }
   @Override
   public STALResponse handleRequest(STALRequest request) throws InterruptedException {
     if (request instanceof PINManagementRequest) {
@@ -86,8 +79,14 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
             gui.showUnblockPINDialog(selectedPIN, this, "unblock", this, "back");
           } else if ("activate".equals(actionCommand)) {
             try {
-              byte[] pin = encodePIN(gui.getPin());
-              activatePIN(selectedPIN.getKID(), selectedPIN.getContextAID(), pin);
+              card.activatePIN(selectedPIN.getKID(),
+                      selectedPIN.getContextAID(),
+                      String.valueOf(gui.getPin()));
+              gui.showMessageDialog(PINManagementGUIFacade.TITLE_ACTIVATE_SUCCESS,
+                      PINManagementGUIFacade.MESSAGE_ACTIVATE_SUCCESS,
+                      new Object[] {selectedPIN.getLocalizedName()},
+                      this, "ok");
+              waitForAction();
               showPINManagementDialog(gui);
             } catch (SignatureCardException ex) {
               log.error("failed to activate " + selectedPIN.getLocalizedName() + ": " + ex.getMessage());
@@ -97,9 +96,15 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
             }
           } else if ("change".equals(actionCommand)) {
             try {
-              byte[] oldPin = encodePIN(gui.getOldPin()); //new byte[]{(byte) 0x25, (byte) 0x40, (byte) 0x01};
-              byte[] pin = encodePIN(gui.getPin()); //new byte[]{(byte) 0x25, (byte) 0x40};
-              changePIN(selectedPIN.getKID(), selectedPIN.getContextAID(), oldPin, pin);
+              card.changePIN(selectedPIN.getKID(),
+                      selectedPIN.getContextAID(),
+                      String.valueOf(gui.getOldPin()),
+                      String.valueOf(gui.getPin()));
+              gui.showMessageDialog(PINManagementGUIFacade.TITLE_CHANGE_SUCCESS,
+                      PINManagementGUIFacade.MESSAGE_CHANGE_SUCCESS,
+                      new Object[] {selectedPIN.getLocalizedName()},
+                      this, "ok");
+              waitForAction();
               showPINManagementDialog(gui);
             } catch (VerificationFailedException ex) {
               log.error("failed to change " + selectedPIN.getLocalizedName() + ": " + ex.getMessage());
@@ -131,137 +136,6 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
     return true;
   }
 
-  /**
-   * pin.length &lt; 4bit
-   * @param kid
-   * @param contextAID
-   * @param pin
-   * @throws at.gv.egiz.smcc.SignatureCardException
-   */
-  private void activatePIN(byte kid, byte[] contextAID, byte[] pin) throws SignatureCardException {
-    Card icc = card.getCard();
-    try {
-      icc.beginExclusive();
-      CardChannel channel = icc.getBasicChannel();
-
-      if (contextAID != null) {
-        CommandAPDU selectAPDU = new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, contextAID);
-        ResponseAPDU responseAPDU = channel.transmit(selectAPDU);
-        if (responseAPDU.getSW() != 0x9000) {
-          icc.endExclusive();
-          String msg = "Failed to activate PIN " + SMCCHelper.toString(new byte[]{kid}) +
-                  ": Failed to select AID " + SMCCHelper.toString(contextAID) +
-                  ": " + SMCCHelper.toString(responseAPDU.getBytes());
-          log.error(msg);
-          throw new SignatureCardException(msg);
-        }
-      }
-
-      if (pin.length > 7) {
-        icc.endExclusive();
-        log.error("PIN too long");
-        throw new SignatureCardException("PIN too long");
-      }
-      byte length = (byte) (0x20 | pin.length * 2);
-
-      byte[] apdu = new byte[]{
-        (byte) 0x00, (byte) 0x24, (byte) 0x01, kid, (byte) 0x08,
-        (byte) length, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF};
-      for (int i = 0; i < pin.length; i++) {
-        apdu[i + 6] = pin[i];
-      }
-
-      CommandAPDU verifyAPDU = new CommandAPDU(apdu);
-      ResponseAPDU responseAPDU = channel.transmit(verifyAPDU);
-
-      if (responseAPDU.getSW() != 0x9000) {
-        icc.endExclusive();
-        String msg = "Failed to activate PIN " + SMCCHelper.toString(new byte[]{kid}) + ": " + SMCCHelper.toString(responseAPDU.getBytes());
-        log.error(msg);
-        throw new SignatureCardException(msg);
-      }
-      icc.endExclusive();
-    } catch (CardException ex) {
-      log.error("Failed to activate PIN: " + ex.getMessage());
-      throw new SignatureCardException(ex.getMessage(), ex);
-    } finally {
-      try {
-        icc.endExclusive();
-      } catch (CardException ex) {
-        log.trace("failed to end exclusive card access");
-      }
-    }
-  }
-
-  private void changePIN(byte kid, byte[] contextAID, byte[] oldPIN, byte[] newPIN) throws SignatureCardException, VerificationFailedException {
-    Card icc = card.getCard();
-    try {
-      icc.beginExclusive();
-      CardChannel channel = icc.getBasicChannel();
-
-      if (contextAID != null) {
-        CommandAPDU selectAPDU = new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, contextAID);
-        ResponseAPDU responseAPDU = channel.transmit(selectAPDU);
-        if (responseAPDU.getSW() != 0x9000) {
-          icc.endExclusive();
-          String msg = "Failed to change PIN " + SMCCHelper.toString(new byte[]{kid}) +
-                  ": Failed to select AID " + SMCCHelper.toString(contextAID) +
-                  ": " + SMCCHelper.toString(responseAPDU.getBytes());
-          log.error(msg);
-          throw new SignatureCardException(msg);
-        }
-      }
-
-      if (oldPIN.length > 7 || newPIN.length > 7) {
-        icc.endExclusive();
-        log.error("PIN too long");
-        throw new SignatureCardException("PIN too long");
-      }
-      byte oldLength = (byte) (0x20 | oldPIN.length * 2);
-      byte newLength = (byte) (0x20 | newPIN.length * 2);
-
-      byte[] apdu = new byte[]{
-        (byte) 0x00, (byte) 0x24, (byte) 0x00, kid, (byte) 0x10,
-        oldLength, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
-        newLength, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF};
-      for (int i = 0; i < oldPIN.length; i++) {
-        apdu[i + 6] = oldPIN[i];
-      }
-      for (int i = 0; i < newPIN.length; i++) {
-        apdu[i + 14] = newPIN[i];
-      }
-
-      CommandAPDU verifyAPDU = new CommandAPDU(apdu);
-      ResponseAPDU responseAPDU = channel.transmit(verifyAPDU);
-
-      if (responseAPDU.getSW1() == 0x63 && responseAPDU.getSW2() >> 4 == 0xc) {
-        icc.endExclusive();
-        int retries = responseAPDU.getSW2() & 0x0f;
-        log.error("Wrong PIN, " + retries + " tries left");
-        throw new VerificationFailedException(retries);
-      }
-      if (responseAPDU.getSW() != 0x9000) {
-        icc.endExclusive();
-        String msg = "Failed to change PIN " 
-                + SMCCHelper.toString(new byte[]{kid}) + ": "
-                + SMCCHelper.toString(responseAPDU.getBytes());
-        log.error(msg);
-        throw new SignatureCardException(msg);
-      }
-      
-
-    } catch (CardException ex) {
-      log.error("Failed to change PIN: " + ex.getMessage());
-      throw new SignatureCardException(ex.getMessage(), ex);
-    } finally {
-      try {
-        icc.endExclusive();
-      } catch (CardException ex) {
-        log.trace("failed to end exclusive card access");
-      }
-    }
-  }
-
   public Map<PINSpec, STATUS> getPINStatuses() throws SignatureCardException {
     Card icc = card.getCard();
     try {
@@ -321,16 +195,6 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
     }
   }
 
-  private byte[] encodePIN(char[] pinChars) {
-    int length = (int) Math.ceil(pinChars.length/2);
-    byte[] pin = new byte[length];
-    for (int i = 0; i < length; i++) {
-      pin[i] = (byte) (16*Character.digit(pinChars[i*2], 16) + Character.digit(pinChars[i*2+1], 16));
-    }
-//    log.trace("***** "  + SMCCHelper.toString(pin) + " ******");
-    return pin;
-  }
-
   private void showPINManagementDialog(PINManagementGUIFacade gui) {
     try {
       Map<PINSpec, STATUS> pins = getPINStatuses();
diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
index b6099db6..430f85b5 100644
--- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
+++ b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
@@ -18,11 +18,15 @@ title.pin.mgmt=<html>PIN Verwaltung</html>
 title.activate.pin=<html>PIN Aktivieren</html>
 title.change.pin=<html>PIN \u00C4ndern</html>
 title.unblock.pin=<html>PIN Entsperren</html>
+title.activate.success=<html>Erfolg</html>
+title.change.success=<html>Erfolg</html>
 
 message.pin.mgmt=<html>Die Karte verf\u00FCgt \u00FCber {0} PINs</html>
 message.activate.pin=<html>{0} eingeben und best\u00E4tigen</html>
 message.change.pin=<html>{0} eingeben und best\u00E4tigen</html>
 message.unblock.pin=<html>PUK zu {0} eingeben</html>
+message.activate.success=<html>{0} wurde erfolgreich aktiviert.</html>
+message.change.success=<html>{0} wurde erfolgreich ge\u00E4ndert.</html>
 
 label.activation=<html>e-card Aktivierungsprozess</html>
 label.activation.step=<html>Schritt {0}</html>
diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
index 40332826..98d18633 100644
--- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
+++ b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
@@ -18,11 +18,15 @@ title.pin.mgmt=<html>PIN Management</html>
 title.activate.pin=<html>Activate PIN</html>
 title.change.pin=<html>Change PIN</html>
 title.unblock.pin=<html>Unblock PIN</html>
+title.activate.success=<html>Success</html>
+title.change.success=<html>Success</html>
 
 message.pin.mgmt=<html>The smartcard has {0} PINs</html>
 message.activate.pin=<html>Enter and confirm {0}</html>
 message.change.pin=<html>Enter and confirm {0}</html>
 message.unblock.pin=<html>Enter PUK for {0}</html>
+message.activate.success=<html>{0} successfully activated</html>
+message.change.success=<html>{0} successfully changed</html>
 
 label.activation=<html>e-card activation process</html>
 label.activation.step=<html>Step {0}</html>
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index ae91670a..be5e3fc8 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -127,7 +127,9 @@ public interface BKUGUIFacade {
 
   public void showHashDataInputDialog(List<HashDataInput> signedReferences, ActionListener okListener, String okCommand);
 
-  public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams, ActionListener okListener, String actionCommand);
+  public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams, ActionListener okListener, String okCommand);
 
   public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams);
+
+  public void showMessageDialog(String titleKey, String msgKey, Object[] msgParams, ActionListener okListener, String okCommand);
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index ca597701..d6c96627 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -19,8 +19,10 @@ package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.stal.HashDataInput;
+import java.awt.Color;
 import java.awt.Container;
 import java.awt.Cursor;
+import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -882,145 +884,116 @@ public class BKUGUIImpl implements BKUGUIFacade {
     }
 
     @Override
-    public void showErrorDialog(final String errorMsgKey, final Object[] errorMsgParams, final ActionListener okListener, final String okCommand) {
+    public void showErrorDialog(
+            final String errorMsgKey, final Object[] errorMsgParams,
+            final ActionListener okListener, final String okCommand) {
         
-      log.debug("scheduling error dialog");
-      
+      showMessageDialog(TITLE_ERROR, ERROR_COLOR,
+              errorMsgKey, errorMsgParams, okListener, okCommand);
+    }
+
+    @Override
+    public void showErrorDialog(
+            final String errorMsgKey, final Object[] errorMsgParams) {
+
+      showMessageDialog(TITLE_ERROR, ERROR_COLOR,
+              errorMsgKey, errorMsgParams, null, null);
+    }
+
+    @Override
+    public void showMessageDialog(
+            final String titleKey,
+            final String msgKey, final Object[] msgParams,
+            final ActionListener okListener, final String okCommand) {
+
+      showMessageDialog(titleKey, null, 
+              msgKey, msgParams, okListener, okCommand);
+    }
+
+    private void showMessageDialog(
+            final String titleKey, final Color titleColor,
+            final String msgKey, final Object[] msgParams,
+            final ActionListener okListener, final String okCommand) {
+
+      log.debug("scheduling message dialog");
+
       SwingUtilities.invokeLater(new Runnable() {
 
           @Override
             public void run() {
 
-                log.debug("show error dialog");
-                
+                log.debug("show message dialog");
+
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
                 if (renderHeaderPanel) {
-                  titleLabel.setText(getMessage(TITLE_ERROR));
+                  titleLabel.setText(getMessage(titleKey));
                 }
 
-                helpListener.setHelpTopic(errorMsgKey);
-                
-                String errorMsgPattern = getMessage(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);
+                helpListener.setHelpTopic(msgKey);
+
+                String msgPattern = getMessage(msgKey);
+                String msg = MessageFormat.format(msgPattern, msgParams);
+
+                JLabel msgLabel = new JLabel();
+                msgLabel.setFont(msgLabel.getFont().deriveFont(msgLabel.getFont().getStyle() & ~Font.BOLD));
+                msgLabel.setText(msg);
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
 
                 GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
                 GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
-                
+
                 if (!renderHeaderPanel) {
-                  JLabel errorTitleLabel = new JLabel();
-                  errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                  errorTitleLabel.setText(getMessage(TITLE_ERROR));
-                  errorTitleLabel.setForeground(ERROR_COLOR);
-                
+                  JLabel titleLabel = new JLabel();
+                  titleLabel.setFont(titleLabel.getFont().deriveFont(titleLabel.getFont().getStyle() | Font.BOLD));
+                  titleLabel.setText(getMessage(titleKey));
+                  if (titleColor != null) {
+                    titleLabel.setForeground(titleColor);
+                  }
+
                   mainHorizontal
                           .addGroup(mainPanelLayout.createSequentialGroup()
-                            .addComponent(errorTitleLabel)
+                            .addComponent(titleLabel)
                             .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
                             .addComponent(helpLabel));
                   mainVertical
                           .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                            .addComponent(errorTitleLabel)
+                            .addComponent(titleLabel)
                             .addComponent(helpLabel));
                 }
-                
+
                 mainPanelLayout.setHorizontalGroup(mainHorizontal
-                        .addComponent(errorMsgLabel));
+                        .addComponent(msgLabel));
                 mainPanelLayout.setVerticalGroup(mainVertical
-                        .addComponent(errorMsgLabel));
-                
-                JButton okButton = new JButton();
-                okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                okButton.setText(getMessage(BUTTON_OK));
-                okButton.setActionCommand(okCommand);
-                okButton.addActionListener(okListener);
+                        .addComponent(msgLabel));
 
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
+                if (okListener != null && okCommand != null) {
+                  JButton okButton = new JButton();
+                  okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  okButton.setText(getMessage(BUTTON_OK));
+                  okButton.setActionCommand(okCommand);
+                  okButton.addActionListener(okListener);
 
-                buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-                buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                    .addComponent(okButton));
+                  GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                  buttonPanel.setLayout(buttonPanelLayout);
+
+                  buttonPanelLayout.setHorizontalGroup(
+                    buttonPanelLayout.createSequentialGroup()
+                          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                          .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+                  buttonPanelLayout.setVerticalGroup(
+                    buttonPanelLayout.createSequentialGroup()
+                      .addComponent(okButton));
+                }
 
                 contentPanel.validate();
             }
         });
     }
 
-    @Override
-    public void showErrorDialog(final String errorMsgKey, final Object[] errorMsgParams) {
-      
-      log.debug("scheduling error  dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-        @Override
-        public void run() {
-          
-          log.debug("show error dialog");
-      
-          mainPanel.removeAll();
-          buttonPanel.removeAll();
-
-          if (renderHeaderPanel) {
-            titleLabel.setText(getMessage(TITLE_ERROR));
-          }
-
-          helpListener.setHelpTopic(errorMsgKey);
-          
-          String errorMsgPattern = getMessage(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);
-          
-          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-          mainPanel.setLayout(mainPanelLayout);
-
-          
-          GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
-          GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
-
-          if (!renderHeaderPanel) {
-            JLabel errorTitleLabel = new JLabel();
-            errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
-            errorTitleLabel.setText(getMessage(TITLE_ERROR));
-            errorTitleLabel.setForeground(ERROR_COLOR);
-
-            mainHorizontal
-                    .addGroup(mainPanelLayout.createSequentialGroup()
-                      .addComponent(errorTitleLabel)
-                      .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                      .addComponent(helpLabel));
-            mainVertical
-                    .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(errorTitleLabel)
-                      .addComponent(helpLabel));
-          }
-
-          mainPanelLayout.setHorizontalGroup(mainHorizontal
-                  .addComponent(errorMsgLabel));
-          mainPanelLayout.setVerticalGroup(mainVertical
-                  .addComponent(errorMsgLabel));
-          
-          contentPanel.validate();
-        }
-      });
-    }
-
     @Override
     public void showWaitDialog(final String waitMessage) {
         
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java
index 12707117..7855b73c 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java
@@ -31,6 +31,7 @@ import org.apache.commons.logging.LogFactory;
 import at.gv.egiz.bku.binding.HTTPBindingProcessor;
 import at.gv.egiz.bku.binding.HttpUtil;
 import at.gv.egiz.bku.binding.IdFactory;
+import at.gv.egiz.bku.conf.Configurator;
 import at.gv.egiz.bku.utils.NullOutputStream;
 
 /**
@@ -40,7 +41,6 @@ import at.gv.egiz.bku.utils.NullOutputStream;
 public class ResultServlet extends SpringBKUServlet {
 
   private final static Log log = LogFactory.getLog(ResultServlet.class);
-  public final static String USER_AGENT_PROPERTY_KEY = "UserAgent";
 
   private String encoding = "UTF-8";
   private String expiredPage = "./expiredError.jsp";
@@ -116,15 +116,16 @@ public class ResultServlet extends SpringBKUServlet {
       return;
     }
     resp.setStatus(bp.getResponseCode());
+//    log.info("ALLOW CACHING OF RESULT PAGE");
     resp.setHeader("Cache-Control", "no-store"); // HTTP 1.1
     resp.setHeader("Pragma", "no-cache"); // HTTP 1.0
     resp.setDateHeader("Expires", 0);
-    if (configurator.getProperty(USER_AGENT_PROPERTY_KEY) != null) {
+    if (configurator.getProperty(Configurator.USERAGENT_CONFIG_P) != null) {
       resp.setHeader(HttpUtil.HTTP_HEADER_USER_AGENT, configurator
-          .getProperty(USER_AGENT_PROPERTY_KEY));
+          .getProperty(Configurator.USERAGENT_CONFIG_P));
     } else {
       resp.setHeader(HttpUtil.HTTP_HEADER_USER_AGENT,
-          "citizen-card-environment/1.2 MOCCA Unknown");
+              Configurator.USERAGENT_DEFAULT);
     }
     for (Iterator<String> it = bp.getResponseHeaders().keySet().iterator(); it
         .hasNext();) {
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrl.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrl.java
index 7b682136..aaeacd98 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrl.java
@@ -16,6 +16,7 @@
  */
 package at.gv.egiz.bku.binding;
 
+import at.gv.egiz.bku.conf.Configurator;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
@@ -82,7 +83,7 @@ public class DataUrl {
   public static void setConfiguration(Properties props) {
     configuration = props;
     if (configuration != null) {
-      String className = configuration.getProperty(DataUrlConnection.DATAURLCONNECTION_CONFIG_P);
+      String className = configuration.getProperty(Configurator.DATAURLCONNECTION_CONFIG_P);
       if (className != null) {
         try {
           log.info("set DataURLConnection class: " + className);
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnection.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnection.java
index 21407cc3..f954a017 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnection.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnection.java
@@ -34,12 +34,6 @@ import at.gv.egiz.bku.slcommands.SLResult;
  */
 public interface DataUrlConnection {
 
-    public final static String USERAGENT_CONFIG_P = "UserAgent";
-    public static final String USERAGENT_DEFAULT = "citizen-card-environment/1.2 MOCCA/UNKNOWN";
-    public static final String USERAGENT_BASE = "citizen-card-environment/1.2 MOCCA/";
-
-    public static final String DATAURLCONNECTION_CONFIG_P = "DataURLConnectionImplClass";
-
     public static final String FORMPARAM_RESPONSETYPE = "ResponseType";
     public static final String DEFAULT_RESPONSETYPE = "HTTP-Security-Layer-RESPONSE";
     public static final String FORMPARAM_XMLRESPONSE = "XMLResponse";
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnectionImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnectionImpl.java
index d9a9454e..4c235456 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnectionImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnectionImpl.java
@@ -43,6 +43,7 @@ import org.apache.commons.logging.LogFactory;
 
 import at.gv.egiz.bku.binding.multipart.InputStreamPartSource;
 import at.gv.egiz.bku.binding.multipart.SLResultPart;
+import at.gv.egiz.bku.conf.Configurator;
 import at.gv.egiz.bku.slcommands.SLResult;
 import at.gv.egiz.bku.slcommands.SLResult.SLResultType;
 import at.gv.egiz.bku.slexceptions.SLRuntimeException;
@@ -225,12 +226,12 @@ public class DataUrlConnectionImpl implements DataUrlConnectionSPI {
     boundary = "--" + IdFactory.getInstance().createId().toString();
     requestHttpHeaders = new HashMap<String, String>();
     if ((config != null)
-        && (config.getProperty(USERAGENT_CONFIG_P) != null)) {
+        && (config.getProperty(Configurator.USERAGENT_CONFIG_P) != null)) {
       requestHttpHeaders.put(HttpUtil.HTTP_HEADER_USER_AGENT, config
-          .getProperty(USERAGENT_CONFIG_P));
+          .getProperty(Configurator.USERAGENT_CONFIG_P));
     } else {
       requestHttpHeaders
-          .put(HttpUtil.HTTP_HEADER_USER_AGENT, USERAGENT_DEFAULT);
+          .put(HttpUtil.HTTP_HEADER_USER_AGENT, Configurator.USERAGENT_DEFAULT);
 
     }
     requestHttpHeaders.put(HttpUtil.HTTP_HEADER_CONTENT_TYPE,
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/LegacyDataUrlConnectionImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/LegacyDataUrlConnectionImpl.java
index ef9dd199..cfccb7f1 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/LegacyDataUrlConnectionImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/LegacyDataUrlConnectionImpl.java
@@ -1,6 +1,7 @@
 package at.gv.egiz.bku.binding;
 
 
+import at.gv.egiz.bku.conf.Configurator;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -38,7 +39,7 @@ import at.gv.egiz.bku.utils.binding.Protocol;
  */
 public class LegacyDataUrlConnectionImpl implements DataUrlConnectionSPI {
   
-  private final static Log log = LogFactory.getLog(DataUrlConnectionImpl.class);
+  private final static Log log = LogFactory.getLog(LegacyDataUrlConnectionImpl.class);
 
   public final static Protocol[] SUPPORTED_PROTOCOLS = { Protocol.HTTP,
       Protocol.HTTPS };
@@ -212,13 +213,13 @@ public class LegacyDataUrlConnectionImpl implements DataUrlConnectionSPI {
     this.url = url;
     requestHttpHeaders = new HashMap<String, String>();
     if ((config != null)
-        && (config.getProperty(USERAGENT_CONFIG_P) != null)) {
-      log.debug("setting User-Agent header: " + config.getProperty(USERAGENT_CONFIG_P));
+        && (config.getProperty(Configurator.USERAGENT_CONFIG_P) != null)) {
+      log.debug("setting User-Agent header: " + config.getProperty(Configurator.USERAGENT_CONFIG_P));
       requestHttpHeaders.put(HttpUtil.HTTP_HEADER_USER_AGENT, config
-          .getProperty(USERAGENT_CONFIG_P));
+          .getProperty(Configurator.USERAGENT_CONFIG_P));
     } else {
       requestHttpHeaders
-          .put(HttpUtil.HTTP_HEADER_USER_AGENT, USERAGENT_DEFAULT);
+          .put(HttpUtil.HTTP_HEADER_USER_AGENT, Configurator.USERAGENT_DEFAULT);
 
     }
     requestHttpHeaders.put(HttpUtil.HTTP_HEADER_CONTENT_TYPE,
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java b/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java
index a6c70d2c..6213ffcf 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java
@@ -49,6 +49,13 @@ public abstract class Configurator {
 
   private Log log = LogFactory.getLog(Configurator.class);
 
+  public final static String USERAGENT_CONFIG_P = "UserAgent";
+  public static final String DATAURLCONNECTION_CONFIG_P = "DataURLConnectionImplClass";
+
+  public static final String USERAGENT_DEFAULT = "citizen-card-environment/1.2 MOCCA/UNKNOWN";
+  public static final String USERAGENT_BASE = "citizen-card-environment/1.2 MOCCA/";
+
+
   protected Properties properties;
 
   protected CertValidator certValidator;
@@ -203,22 +210,22 @@ public abstract class Configurator {
   }
 
   public void configureVersion() {
-    if (properties.getProperty(DataUrlConnection.USERAGENT_CONFIG_P) == null) {
+    if (properties.getProperty(USERAGENT_CONFIG_P) == null) {
       Properties p = new Properties();
       try {
         InputStream is = getManifest();
         if (is != null) {
           p.load(getManifest());
           String version = p.getProperty("Implementation-Build");
-          properties.setProperty(DataUrlConnection.USERAGENT_CONFIG_P,
-                  DataUrlConnection.USERAGENT_BASE + version);
+          properties.setProperty(USERAGENT_CONFIG_P,
+                  USERAGENT_BASE + version);
           log.debug("Setting user agent to: "
               + properties
-                  .getProperty(DataUrlConnection.USERAGENT_CONFIG_P));
+                  .getProperty(USERAGENT_CONFIG_P));
         } else {
           log.warn("Cannot read manifest");
-          properties.setProperty(DataUrlConnection.USERAGENT_CONFIG_P,
-                  DataUrlConnection.USERAGENT_DEFAULT);
+          properties.setProperty(USERAGENT_CONFIG_P,
+                  USERAGENT_DEFAULT);
         }
       } catch (IOException e) {
         log.error(e);
diff --git a/bkucommon/src/test/java/at/gv/egiz/stal/dummy/DummySTAL.java b/bkucommon/src/test/java/at/gv/egiz/stal/dummy/DummySTAL.java
index 77dd7e4f..8adeadee 100644
--- a/bkucommon/src/test/java/at/gv/egiz/stal/dummy/DummySTAL.java
+++ b/bkucommon/src/test/java/at/gv/egiz/stal/dummy/DummySTAL.java
@@ -14,149 +14,141 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package at.gv.egiz.stal.dummy;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.Signature;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.stal.ErrorResponse;
-import at.gv.egiz.stal.InfoboxReadRequest;
-import at.gv.egiz.stal.InfoboxReadResponse;
-import at.gv.egiz.stal.STAL;
-import at.gv.egiz.stal.STALRequest;
-import at.gv.egiz.stal.STALResponse;
-import at.gv.egiz.stal.SignRequest;
-import at.gv.egiz.stal.SignResponse;
-
-public class DummySTAL implements STAL { 
-
-  static Log log = LogFactory.getLog(DummySTAL.class);
-
-  protected X509Certificate cert = null;
-  protected PrivateKey privateKey = null;
-  
-  public DummySTAL() {
-    try {
+package at.gv.egiz.stal.dummy;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.Signature;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.stal.ErrorResponse;
+import at.gv.egiz.stal.InfoboxReadRequest;
+import at.gv.egiz.stal.InfoboxReadResponse;
+import at.gv.egiz.stal.STAL;
+import at.gv.egiz.stal.STALRequest;
+import at.gv.egiz.stal.STALResponse;
+import at.gv.egiz.stal.SignRequest;
+import at.gv.egiz.stal.SignResponse;
+
+public class DummySTAL implements STAL { 
+
+  static Log log = LogFactory.getLog(DummySTAL.class);
+
+  protected X509Certificate cert = null;
+  protected PrivateKey privateKey = null;
+  
+  public DummySTAL() {
+    try {
       KeyStore ks = KeyStore.getInstance("pkcs12");
       InputStream ksStream = getClass().getClassLoader().getResourceAsStream(
-      "at/gv/egiz/bku/slcommands/impl/Cert.p12");
-      ks.load(ksStream, "1622".toCharArray());
-      for (Enumeration<String> aliases = ks.aliases(); aliases
-          .hasMoreElements();) {
-        String alias = aliases.nextElement();
-        log.debug("Found alias " + alias + " in keystore");
-        if (ks.isKeyEntry(alias)) {
-          log.debug("Found key entry for alias: " + alias);
-          privateKey = (PrivateKey) ks.getKey(alias, "1622".toCharArray());
-          cert = (X509Certificate) ks.getCertificate(alias);  
-          System.out.println(cert);
-        }
-      }
-    } catch (Exception e) {
-      log.error(e);
-    }
-
-  }
-
-  @Override
-  public List<STALResponse> handleRequest(List<? extends STALRequest> requestList) {
-
-    List<STALResponse> responses = new ArrayList<STALResponse>();
-    for (STALRequest request : requestList) {
-
-      log.debug("Got STALRequest " + request + ".");
-
-      if (request instanceof InfoboxReadRequest) {
-
-        String infoboxIdentifier = ((InfoboxReadRequest) request)
-            .getInfoboxIdentifier();
-        InputStream stream = getClass().getClassLoader().getResourceAsStream(
-            "at/gv/egiz/stal/dummy/infoboxes4/" + infoboxIdentifier + ".bin");
-
-        STALResponse response;
-        if (stream != null) {
-
-          log.debug("Infobox " + infoboxIdentifier + " found.");
-
-          byte[] infobox;
-          try {
-            ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-            int b;
-            while ((b = stream.read()) != -1) {
-              buffer.write(b);
-            }
-            infobox = buffer.toByteArray();
-          } catch (IOException e) {
-            throw new RuntimeException(e);
-          }
-
-          InfoboxReadResponse infoboxReadResponse = new InfoboxReadResponse();
-          infoboxReadResponse.setInfoboxValue(infobox);
-          response = infoboxReadResponse;
-
-        } else if ((infoboxIdentifier.equals("SecureSignatureKeypair")) ||(infoboxIdentifier.equals("CertifiedKeypair"))) {
-          try {
-            InfoboxReadResponse infoboxReadResponse = new InfoboxReadResponse();
-            infoboxReadResponse.setInfoboxValue(cert.getEncoded());
-            response = infoboxReadResponse;
-          } catch (CertificateEncodingException e) {
-            log.error(e);
-            response = new ErrorResponse();
-          }
-        } else {
-
-          log.debug("Infobox " + infoboxIdentifier + " not found.");
-
-          response = new ErrorResponse();
-        }
-        responses.add(response);
-
-      } else if (request instanceof SignRequest) {
-        try {
-
-          SignRequest signReq = (SignRequest) request;
-          Signature s = Signature.getInstance("SHA1withRSA");
-          s.initSign(privateKey);
-          s.update(signReq.getSignedInfo());
-          byte[] sigVal = s.sign();
-          SignResponse resp = new SignResponse();
-          resp.setSignatureValue(sigVal);
-          responses.add(resp);
-        } catch (Exception e) {
-          log.error(e);
-          responses.add(new ErrorResponse());
-        }
-
-      } else {
-
-        log.debug("Request not implemented.");
-
-        responses.add(new ErrorResponse());
-      }
-
-    }
-
-    return responses;
-  }
-
-  @Override
-  public void setLocale(Locale locale) {
-    // TODO Auto-generated method stub
-    
-  }
-  
-
-}
+      "at/gv/egiz/bku/slcommands/impl/Cert.p12");
+      ks.load(ksStream, "1622".toCharArray());
+      for (Enumeration<String> aliases = ks.aliases(); aliases
+          .hasMoreElements();) {
+        String alias = aliases.nextElement();
+        log.debug("Found alias " + alias + " in keystore");
+        if (ks.isKeyEntry(alias)) {
+          log.debug("Found key entry for alias: " + alias);
+          privateKey = (PrivateKey) ks.getKey(alias, "1622".toCharArray());
+          cert = (X509Certificate) ks.getCertificate(alias);  
+          System.out.println(cert);
+        }
+      }
+    } catch (Exception e) {
+      log.error(e);
+    }
+
+  }
+
+  @Override
+  public List<STALResponse> handleRequest(List<? extends STALRequest> requestList) {
+
+    List<STALResponse> responses = new ArrayList<STALResponse>();
+    for (STALRequest request : requestList) {
+
+      log.debug("Got STALRequest " + request + ".");
+
+      if (request instanceof InfoboxReadRequest) {
+
+        String infoboxIdentifier = ((InfoboxReadRequest) request)
+            .getInfoboxIdentifier();
+        InputStream stream = getClass().getClassLoader().getResourceAsStream(
+            "at/gv/egiz/stal/dummy/infoboxes4/" + infoboxIdentifier + ".bin");
+
+        STALResponse response;
+        if (stream != null) {
+
+          log.debug("Infobox " + infoboxIdentifier + " found.");
+
+          byte[] infobox;
+          try {
+            ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+            int b;
+            while ((b = stream.read()) != -1) {
+              buffer.write(b);
+            }
+            infobox = buffer.toByteArray();
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+
+          InfoboxReadResponse infoboxReadResponse = new InfoboxReadResponse();
+          infoboxReadResponse.setInfoboxValue(infobox);
+          response = infoboxReadResponse;
+
+        } else if ((infoboxIdentifier.equals("SecureSignatureKeypair")) ||(infoboxIdentifier.equals("CertifiedKeypair"))) {
+          try {
+            InfoboxReadResponse infoboxReadResponse = new InfoboxReadResponse();
+            infoboxReadResponse.setInfoboxValue(cert.getEncoded());
+            response = infoboxReadResponse;
+          } catch (CertificateEncodingException e) {
+            log.error(e);
+            response = new ErrorResponse();
+          }
+        } else {
+
+          log.debug("Infobox " + infoboxIdentifier + " not found.");
+
+          response = new ErrorResponse();
+        }
+        responses.add(response);
+
+      } else if (request instanceof SignRequest) {
+        try {
+
+          SignRequest signReq = (SignRequest) request;
+          Signature s = Signature.getInstance("SHA1withRSA");
+          s.initSign(privateKey);
+          s.update(signReq.getSignedInfo());
+          byte[] sigVal = s.sign();
+          SignResponse resp = new SignResponse();
+          resp.setSignatureValue(sigVal);
+          responses.add(resp);
+        } catch (Exception e) {
+          log.error(e);
+          responses.add(new ErrorResponse());
+        }
+
+      } else {
+
+        log.debug("Request not implemented.");
+
+        responses.add(new ErrorResponse());
+      }
+
+    }
+
+    return responses;
+  }
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
index 86223854..57925240 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
@@ -28,6 +28,7 @@
 //
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.util.SMCCHelper;
 import java.nio.charset.Charset;
 
 import javax.smartcardio.CardChannel;
@@ -104,9 +105,12 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
 
   public ACOSCard() {
     super("at/gv/egiz/smcc/ACOSCard");
-    pinSpecs.add(PINSPEC_INF, new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("inf.pin.name"), KID_PIN_INF, null));
-    pinSpecs.add(PINSPEC_DEC, new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("dec.pin.name"), KID_PIN_DEC, null));
-    pinSpecs.add(PINSPEC_SIG, new PINSpec(6, 10, "[0-9]", getResourceBundle().getString("sig.pin.name"), KID_PIN_SIG, null));
+    pinSpecs.add(PINSPEC_INF,
+            new PINSpec(0, 8, "[0-9]", getResourceBundle().getString("inf.pin.name"), KID_PIN_INF, AID_DEC));
+    pinSpecs.add(PINSPEC_DEC, 
+            new PINSpec(0, 8, "[0-9]", getResourceBundle().getString("dec.pin.name"), KID_PIN_DEC, AID_DEC));
+    pinSpecs.add(PINSPEC_SIG, 
+            new PINSpec(0, 8, "[0-9]", getResourceBundle().getString("sig.pin.name"), KID_PIN_SIG, AID_SIG));
   }
 
   /* (non-Javadoc)
@@ -334,14 +338,13 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
     
     CardChannel channel = getCardChannel();
 
-    byte[] asciiPIN = pin.getBytes(Charset.forName("ASCII"));
-    byte[] encodedPIN = new byte[8];
-    System.arraycopy(asciiPIN, 0, encodedPIN, 0, Math.min(asciiPIN.length,
-        encodedPIN.length));
-
     ResponseAPDU resp;
     try {
-      resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid, encodedPIN), false);
+      if (pin != null) {
+        resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid, encodePINBlock(pin)), false);
+      } else {
+        resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid), false);
+      }
     } catch (CardException ex) {
       log.error("smart card communication failed: " + ex.getMessage());
       throw new SignatureCardException("smart card communication failed: " + ex.getMessage(), ex);
@@ -419,7 +422,28 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
     }
   }
 
+  @Override
   public String toString() {
     return "a-sign premium";
   }
+
+  /**
+   * ASCII encoded pin, padded with 0x00
+   * @param pin
+   * @return a 8 byte pin block 
+   */
+  @Override
+  public byte[] encodePINBlock(String pin) {
+    byte[] asciiPIN = pin.getBytes(Charset.forName("ASCII"));
+    byte[] encodedPIN = new byte[8];
+    System.arraycopy(asciiPIN, 0, encodedPIN, 0, Math.min(asciiPIN.length,
+        encodedPIN.length));
+//    System.out.println("ASCII encoded PIN block: " + SMCCHelper.toString(encodedPIN));
+    return encodedPIN;
+  }
+
+  @Override
+  public void activatePIN(byte kid, byte[] contextAID, String pin) throws SignatureCardException {
+    throw new SignatureCardException("PIN activation not supported by this card");
+  }
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
index cb068725..63301bd1 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
@@ -28,14 +28,13 @@
 //
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.util.SMCCHelper;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.ResourceBundle;
 
 import javax.smartcardio.ATR;
@@ -443,4 +442,54 @@ public abstract class AbstractSignatureCard implements SignatureCard {
   public List<PINSpec> getPINSpecs() {
     return pinSpecs;
   }
+
+  public void changePIN(byte kid, byte[] contextAID, String oldPIN, String newPIN) throws SignatureCardException, VerificationFailedException {
+    Card icc = getCard();
+    try {
+      icc.beginExclusive();
+      CardChannel channel = icc.getBasicChannel();
+
+      if (contextAID != null) {
+        ResponseAPDU responseAPDU = transmit(channel,
+                new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, contextAID));
+        if (responseAPDU.getSW() != 0x9000) {
+          icc.endExclusive();
+          String msg = "Failed to change PIN " + SMCCHelper.toString(new byte[]{kid}) +
+                  ": Failed to select AID " + SMCCHelper.toString(contextAID) +
+                  ": " + SMCCHelper.toString(responseAPDU.getBytes());
+          log.error(msg);
+          throw new SignatureCardException(msg);
+        }
+      }
+
+      byte[] cmd = new byte[16];
+      System.arraycopy(encodePINBlock(oldPIN), 0, cmd, 0, 8);
+      System.arraycopy(encodePINBlock(newPIN), 0, cmd, 8, 8);
+
+      ResponseAPDU responseAPDU = transmit(channel,
+              new CommandAPDU(0x00, 0x24, 0x00, kid, cmd), false);
+
+      icc.endExclusive();
+
+      if (responseAPDU.getSW1() == 0x63 && responseAPDU.getSW2() >> 4 == 0xc) {
+        int retries = responseAPDU.getSW2() & 0x0f;
+        log.error("Failed VERIFY PIN, " + retries + " tries left");
+        throw new VerificationFailedException(retries);
+      }
+      if (responseAPDU.getSW() != 0x9000) {
+        String msg = "Failed to change PIN "
+                + SMCCHelper.toString(new byte[]{kid}) + ": "
+                + SMCCHelper.toString(responseAPDU.getBytes());
+        log.error(msg);
+        throw new SignatureCardException(msg);
+      }
+
+    } catch (CardException ex) {
+      log.error("Failed to change PIN: " + ex.getMessage());
+      throw new SignatureCardException(ex.getMessage(), ex);
+    }
+  }
+  
+  abstract byte[] encodePINBlock(String pin);
+
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
index ae43629e..b1288f74 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
@@ -28,9 +28,9 @@
 //
 package at.gv.egiz.smcc;
 
-import java.math.BigInteger;
+import at.gv.egiz.smcc.util.SMCCHelper;
 import java.util.Arrays;
-
+import javax.smartcardio.Card;
 import javax.smartcardio.CardChannel;
 import javax.smartcardio.CardException;
 import javax.smartcardio.CommandAPDU;
@@ -162,8 +162,14 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
    */
   public STARCOSCard() {
     super("at/gv/egiz/smcc/STARCOSCard");
-    pinSpecs.add(PINSPEC_CARD, new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"), KID_PIN_CARD, null));
-    pinSpecs.add(PINSPEC_SS, new PINSpec(6, 10, "[0-9]", getResourceBundle().getString("sig.pin.name"), KID_PIN_SS, AID_DF_SS));
+    pinSpecs.add(PINSPEC_CARD, 
+            new PINSpec(4, 12, "[0-9]",
+              getResourceBundle().getString("card.pin.name"),
+              KID_PIN_CARD, null));
+    pinSpecs.add(PINSPEC_SS,
+            new PINSpec(6, 12, "[0-9]",
+              getResourceBundle().getString("sig.pin.name"),
+              KID_PIN_SS, AID_DF_SS));
   }
  
   @Override
@@ -491,21 +497,8 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
       if (pin == null) {
         resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid));
       } else {
-        // PIN length in bytes
-        int len = (int) Math.ceil(pin.length() / 2);
-
         // BCD encode PIN and marshal PIN block
-        byte[] pinBytes = new BigInteger(pin, 16).toByteArray();
-        byte[] pinBlock = new byte[8];
-        if (len < pinBytes.length) {
-          System.arraycopy(pinBytes, pinBytes.length - len, pinBlock, 1, len);
-        } else {
-          System.arraycopy(pinBytes, 0, pinBlock, len - pinBytes.length + 1,
-              pinBytes.length);
-        }
-        pinBlock[0] = (byte) (0x20 + len * 2);
-        Arrays.fill(pinBlock, len + 1, 8, (byte) 0xff);
-
+        byte[] pinBlock = encodePINBlock(pin);
         resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid, pinBlock), false);
 
       }
@@ -553,6 +546,65 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
     return "e-card";
   }
 
- 
+  /**
+   * BCD encodes the pin, pads with 0xFF and prepends the pins length
+   * @param pin
+   * @return a 8 byte pin block consisting of length byte (0x2X),
+   * the BCD encoded pin and a 0xFF padding
+   */
+  @Override
+  public byte[] encodePINBlock(String pin) {
+    char[] pinChars = pin.toCharArray();
+    int numDigits = pinChars.length;
+    int numBytes = (int) Math.ceil(numDigits/2.0);
+
+    byte[] pinBlock = new byte[8];
+    pinBlock[0] = (byte) (0x20 | numDigits);
+
+    for (int i = 0; i < numBytes; i++) {
+      int p1 = 16*Character.digit(pinChars[i*2], 16);
+      int p2 = (i*2+1 < numDigits) ? Character.digit(pinChars[i*2+1], 16) : 0xf;
+      pinBlock[i+1] = (byte) (p1 + p2);
+    }
+    Arrays.fill(pinBlock, numBytes + 1, pinBlock.length, (byte) 0xff);
+//    log.trace("BCD encoded PIN block: " + SMCCHelper.toString(pinBlock));
+
+    return pinBlock;
+  }
+
+  public void activatePIN(byte kid, byte[] contextAID, String pin) throws SignatureCardException {
+    Card icc = getCard();
+    try {
+      icc.beginExclusive();
+      CardChannel channel = icc.getBasicChannel();
+
+      if (contextAID != null) {
+        ResponseAPDU responseAPDU = transmit(channel,
+                new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, contextAID));
+        if (responseAPDU.getSW() != 0x9000) {
+          icc.endExclusive();
+          String msg = "Failed to activate PIN " + SMCCHelper.toString(new byte[]{kid}) +
+                  ": Failed to select AID " + SMCCHelper.toString(contextAID) +
+                  ": " + SMCCHelper.toString(responseAPDU.getBytes());
+          log.error(msg);
+          throw new SignatureCardException(msg);
+        }
+      }
+
+      ResponseAPDU responseAPDU = transmit(channel,
+              new CommandAPDU(0x00, 0x24, 0x01, kid, encodePINBlock(pin)), false);
+
+      icc.endExclusive();
+
+      if (responseAPDU.getSW() != 0x9000) {
+        String msg = "Failed to activate PIN " + SMCCHelper.toString(new byte[]{kid}) + ": " + SMCCHelper.toString(responseAPDU.getBytes());
+        log.error(msg);
+        throw new SignatureCardException(msg);
+      }
+    } catch (CardException ex) {
+      log.error("Failed to activate PIN: " + ex.getMessage());
+      throw new SignatureCardException(ex.getMessage(), ex);
+    }
+  }
 
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
index 8dc4ac2a..57aeb994 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
@@ -403,4 +403,12 @@ public class SWCard implements SignatureCard {
     return new ArrayList<PINSpec>();
   }
 
+  @Override
+  public void changePIN(byte kid, byte[] contextAID, String oldPIN, String newPIN) throws SignatureCardException, VerificationFailedException {
+  }
+
+  @Override
+  public void activatePIN(byte kid, byte[] contextAID, String pin) throws SignatureCardException {
+  }
+
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
index 1e5e09c8..a88593bc 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
@@ -31,7 +31,6 @@ package at.gv.egiz.smcc;
 import java.util.List;
 import java.util.Locale;
 
-import java.util.Map;
 import javax.smartcardio.Card;
 import javax.smartcardio.CardTerminal;
 
@@ -135,11 +134,19 @@ public interface SignatureCard {
    */
   public int verifyPIN(String pin, byte kid) throws LockedException, NotActivatedException, SignatureCardException;
 
+  public void changePIN(byte kid, byte[] contextAID,
+          String oldPIN, String newPIN)
+          throws SignatureCardException, VerificationFailedException;
+
+  public void activatePIN(byte kid, byte[] contextAID,
+          String pin)
+          throws SignatureCardException;
+
   /**
    * Sets the local for evtl. required callbacks (e.g. PINSpec)
    * @param locale must not be null;
    */
   public void setLocale(Locale locale);
   
-
+  
 }
-- 
cgit v1.2.3


From d20bfd8b45e0a83773a12a649aa7ba0aaf58e649 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 10 Mar 2009 10:37:45 +0000
Subject: bug: showMessageDialog(key, param, listener, null) does not display
 OK button

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@315 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index d6c96627..6a1f2aad 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -970,7 +970,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 mainPanelLayout.setVerticalGroup(mainVertical
                         .addComponent(msgLabel));
 
-                if (okListener != null && okCommand != null) {
+                if (okListener != null) {
                   JButton okButton = new JButton();
                   okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
                   okButton.setText(getMessage(BUTTON_OK));
-- 
cgit v1.2.3


From b1c0b243cc7f24f4a2ede6d02bdead4032451f41 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 10 Mar 2009 11:10:27 +0000
Subject: pinfield and pinsize label aligned trailing

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@316 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 53 +++++++++++-----------
 1 file changed, 26 insertions(+), 27 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 6a1f2aad..76b1d795 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -605,27 +605,27 @@ public class BKUGUIImpl implements BKUGUIFacade {
                           .addComponent(helpLabel);
                 } 
 
-                GroupLayout.Group pinHorizontal;
+                // align pinfield and pinsize to the right
+                GroupLayout.ParallelGroup pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING);
                 GroupLayout.Group pinVertical;
 
                 if (pinLabelPos == PinLabelPosition.ABOVE) {
-                  pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                          .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                          .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                          .addGroup(mainPanelLayout.createSequentialGroup()
-                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                            .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
+                  pinHorizontal
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                            .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                          .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
                   pinVertical = mainPanelLayout.createSequentialGroup()
                           .addComponent(cardPinLabel)
                           .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                           .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
                 } else {
-                  pinHorizontal = mainPanelLayout.createSequentialGroup()
-                          .addComponent(cardPinLabel, 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(pinsizeLabel));
+                  pinHorizontal
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addComponent(cardPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                            .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                          .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
                   pinVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
                           .addComponent(cardPinLabel)
                           .addComponent(pinField);
@@ -806,28 +806,27 @@ public class BKUGUIImpl implements BKUGUIFacade {
                           .addComponent(helpLabel);
                 }
 
-                GroupLayout.Group pinHorizontal;
+                // align pinfield and pinsize to the right
+                GroupLayout.ParallelGroup pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING);
                 GroupLayout.Group pinVertical;
 
                 if (pinLabelPos == PinLabelPosition.ABOVE) {
-                  pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                          .addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                          .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                          .addGroup(mainPanelLayout.createSequentialGroup()
-                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                            .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
-                          
+                  pinHorizontal
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                            .addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                          .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
                   pinVertical = mainPanelLayout.createSequentialGroup()
                           .addComponent(signPinLabel)
                           .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                           .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
                 } else {
-                  pinHorizontal = 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(pinsizeLabel));
+                  pinHorizontal
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                            .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                          .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
                   pinVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
                           .addComponent(signPinLabel)
                           .addComponent(pinField);
-- 
cgit v1.2.3


From 28e772965f4fb313aeb5018e6104943a1177bc06 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 10 Mar 2009 11:10:55 +0000
Subject: pinfield and pinsize label aligned trailing

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@317 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'BKUCommonGUI')

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 08ecaa7f..ef64ac59 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
@@ -21,6 +21,7 @@
 package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.STARCOSCard;
 import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
 import java.awt.event.ActionEvent;
@@ -46,7 +47,8 @@ public class BKUGUIWorker implements Runnable {
   public void run() {
 //        try {
 
-    final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Signatur-PIN", (byte) 0x81, null);
+    final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Test-PIN", (byte) 0x81, null);
+    final PINSpec cardPinSpec = new PINSpec(4, 4, "[0-9]", "Test-PIN", (byte) 0x01, null);
 
 
     final ActionListener cancelListener = new ActionListener() {
-- 
cgit v1.2.3


From 2a1df5e58e44f8d77f34eb80df74e8c0d27caceb Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 18 Mar 2009 22:27:28 +0000
Subject: 1.1-rc5 (pinProviderFactories, gui refactoring, signatureCard,
 secureViewer)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@322 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../gv/egiz/bku/online/applet/AppletBKUWorker.java |   5 +-
 .../bku/online/applet/AppletHashDataDisplay.java   | 217 --------
 .../egiz/bku/online/applet/AppletSecureViewer.java | 221 ++++++++
 .../java/at/gv/egiz/bku/gui/PINManagementGUI.java  | 365 +++++++-------
 .../at/gv/egiz/bku/gui/PINManagementGUIFacade.java |  46 +-
 .../bku/online/applet/PINManagementBKUWorker.java  |  10 +-
 .../smccstal/ext/ManagementPINProviderFactory.java |  53 ++
 .../smccstal/ext/PINManagementRequestHandler.java  | 319 ++++++------
 .../bku/smccstal/ext/PinpadPINProviderFactory.java | 126 +++++
 .../smccstal/ext/SoftwarePINProviderFactory.java   | 148 ++++++
 .../gv/egiz/bku/gui/ActivationMessages.properties  |  17 +-
 .../egiz/bku/gui/ActivationMessages_en.properties  |  15 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |   4 +-
 .../gv/egiz/bku/smccstal/ext/FileSystemTest.java   | 435 ----------------
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |  66 ++-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 560 +++++++++++----------
 .../main/java/at/gv/egiz/bku/gui/PinDocument.java  |  30 +-
 .../at/gv/egiz/bku/gui/Messages.properties         |  28 +-
 .../at/gv/egiz/bku/gui/Messages_en.properties      |  28 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |   6 +-
 .../at/gv/egiz/bku/local/stal/BKUGuiProxy.java     | 106 ++--
 .../bku/local/stal/LocalSignRequestHandler.java    |   4 +-
 .../java/at/gv/egiz/bku/local/app/Container.java   |   5 -
 .../main/webapp/helpfiles/de/cardnotsupported.html |  47 ++
 .../main/webapp/helpfiles/de/cardnotsupported.png  | Bin 0 -> 2120 bytes
 .../webapp/helpfiles/de/help.cardnotsupported.html |  47 --
 .../webapp/helpfiles/de/help.cardnotsupported.png  | Bin 2120 -> 0 bytes
 .../main/webapp/helpfiles/de/help.insertcard.html  |  42 --
 .../main/webapp/helpfiles/de/help.insertcard.png   | Bin 2270 -> 0 bytes
 .../src/main/webapp/helpfiles/de/help.wait.html    |  39 --
 .../src/main/webapp/helpfiles/de/help.wait.png     | Bin 1542 -> 0 bytes
 .../src/main/webapp/helpfiles/de/help.welcome.html |  40 --
 .../src/main/webapp/helpfiles/de/help.welcome.png  | Bin 1537 -> 0 bytes
 .../src/main/webapp/helpfiles/de/insertcard.html   |  42 ++
 .../src/main/webapp/helpfiles/de/insertcard.png    | Bin 0 -> 2270 bytes
 BKUOnline/src/main/webapp/helpfiles/de/wait.html   |  39 ++
 BKUOnline/src/main/webapp/helpfiles/de/wait.png    | Bin 0 -> 1542 bytes
 .../src/main/webapp/helpfiles/de/welcome.html      |  40 ++
 BKUOnline/src/main/webapp/helpfiles/de/welcome.png | Bin 0 -> 1537 bytes
 smcc/src/main/java/at/gv/egiz/smcc/ACOS04Card.java |  30 ++
 smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java   | 410 ++++++++++-----
 .../at/gv/egiz/smcc/AbstractSignatureCard.java     | 352 +++++++++++--
 .../java/at/gv/egiz/smcc/ChangePINProvider.java    |  39 ++
 .../src/main/java/at/gv/egiz/smcc/PINProvider.java |  26 +-
 .../src/main/java/at/gv/egiz/smcc/STARCOSCard.java | 479 +++++++++++-------
 smcc/src/main/java/at/gv/egiz/smcc/SWCard.java     |  36 +-
 .../main/java/at/gv/egiz/smcc/SignatureCard.java   |  42 +-
 .../java/at/gv/egiz/smcc/SignatureCardFactory.java |   2 +-
 .../java/at/gv/egiz/smcc/TimeoutException.java     |  39 ++
 smcc/src/test/resources/log4j.properties           |   2 +-
 .../at/gv/egiz/bku/smccstal/AbstractBKUWorker.java |   8 +-
 .../gv/egiz/bku/smccstal/AbstractPINProvider.java  |  67 +++
 .../at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java  |   6 +
 .../bku/smccstal/InfoBoxReadRequestHandler.java    |  40 +-
 .../gv/egiz/bku/smccstal/PINProviderFactory.java   |  47 ++
 .../bku/smccstal/PinpadPINProviderFactory.java     | 155 ++++++
 .../java/at/gv/egiz/bku/smccstal/SecureViewer.java |  44 ++
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   | 149 +++---
 .../bku/smccstal/SoftwarePINProviderFactory.java   | 140 ++++++
 .../java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java |  16 +-
 60 files changed, 3278 insertions(+), 2001 deletions(-)
 delete mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
 create mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java
 create mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java
 create mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PinpadPINProviderFactory.java
 create mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/SoftwarePINProviderFactory.java
 delete mode 100644 BKUAppletExt/src/test/java/at/gv/egiz/bku/smccstal/ext/FileSystemTest.java
 create mode 100644 BKUOnline/src/main/webapp/helpfiles/de/cardnotsupported.html
 create mode 100644 BKUOnline/src/main/webapp/helpfiles/de/cardnotsupported.png
 delete mode 100644 BKUOnline/src/main/webapp/helpfiles/de/help.cardnotsupported.html
 delete mode 100644 BKUOnline/src/main/webapp/helpfiles/de/help.cardnotsupported.png
 delete mode 100644 BKUOnline/src/main/webapp/helpfiles/de/help.insertcard.html
 delete mode 100644 BKUOnline/src/main/webapp/helpfiles/de/help.insertcard.png
 delete mode 100644 BKUOnline/src/main/webapp/helpfiles/de/help.wait.html
 delete mode 100644 BKUOnline/src/main/webapp/helpfiles/de/help.wait.png
 delete mode 100644 BKUOnline/src/main/webapp/helpfiles/de/help.welcome.html
 delete mode 100644 BKUOnline/src/main/webapp/helpfiles/de/help.welcome.png
 create mode 100644 BKUOnline/src/main/webapp/helpfiles/de/insertcard.html
 create mode 100644 BKUOnline/src/main/webapp/helpfiles/de/insertcard.png
 create mode 100644 BKUOnline/src/main/webapp/helpfiles/de/wait.html
 create mode 100644 BKUOnline/src/main/webapp/helpfiles/de/wait.png
 create mode 100644 BKUOnline/src/main/webapp/helpfiles/de/welcome.html
 create mode 100644 BKUOnline/src/main/webapp/helpfiles/de/welcome.png
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/ACOS04Card.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/ChangePINProvider.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/TimeoutException.java
 create mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java
 create mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java
 create mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PinpadPINProviderFactory.java
 create mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SecureViewer.java
 create mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SoftwarePINProviderFactory.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
index eb6cf30b..9b9735f6 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
@@ -60,14 +60,15 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
 
   @Override
   public void run() {
-    gui.showWelcomeDialog();
+    gui.showMessageDialog(BKUGUIFacade.TITLE_WELCOME,
+            BKUGUIFacade.MESSAGE_WELCOME);
 
     try {
       STALPortType stalPort = applet.getSTALPort();
       STALTranslator stalTranslator = applet.getSTALTranslator();
 
       addRequestHandler(SignRequest.class,
-              new AppletHashDataDisplay(stalPort, sessionId));
+              new AppletSecureViewer(stalPort, sessionId));
 
       GetNextRequestResponseType nextRequestResp = stalPort.connect(sessionId);
 
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
deleted file mode 100644
index 2ed9aa5b..00000000
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.online.applet;
-
-import java.security.DigestException;
-import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.bku.smccstal.SignRequestHandler;
-import at.gv.egiz.stal.HashDataInput;
-import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
-import at.gv.egiz.stal.service.GetHashDataInputFault;
-import at.gv.egiz.stal.service.STALPortType;
-import at.gv.egiz.stal.service.types.GetHashDataInputResponseType;
-import at.gv.egiz.stal.service.types.GetHashDataInputType;
-import at.gv.egiz.stal.signedinfo.ReferenceType;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * A SignRequesthandler that obtains hashdata inputs from a STAL webservice and
- * displays these either within the applet or in a separate frame.
- * The internal viewer displays plaintext data only, other mimetypes can be saved to disk.
- * The standalone (frame) viewer displays all mimetypes.
- * 
- * (This class depends on STALService and therefore is not part of BKUCommonGUI.)
- * 
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class AppletHashDataDisplay extends SignRequestHandler {
-
-  private static final Log log = LogFactory.getLog(AppletHashDataDisplay.class);
-  protected STALPortType stalPort;
-  protected String sessId;
-
-  public AppletHashDataDisplay(STALPortType stalPort, String sessId) {
-    if (stalPort == null || sessId == null) {
-      throw new NullPointerException("STAL port must not be null");
-    }
-    this.sessId = sessId;
-    this.stalPort = stalPort;
-  }
-
-  /**
-   * TODO don't throw exceptions
-   * @param signedReferences
-   * @throws java.security.DigestException
-   * @throws java.lang.Exception
-   */
-  @Override
-  public void displayHashDataInputs(List<ReferenceType> signedReferences) throws DigestException, Exception {
-
-    List<GetHashDataInputResponseType.Reference> hdi = getHashDataInput(signedReferences);
-    List<HashDataInput> verifiedHashDataInputs = verifyHashDataInput(signedReferences, hdi);
-
-    if (verifiedHashDataInputs.size() > 0) {
-      gui.showHashDataInputDialog(verifiedHashDataInputs, this, "hashDataDone");
-    } else {
-      throw new Exception("No signature data (apart from any QualifyingProperties or a Manifest)");
-    }
-  }
-
-  /**
-   * Get all hashdata inputs that contain an ID attribute but no Type attribute.
-   * @param signedReferences
-   * @return
-   * @throws at.gv.egiz.stal.service.GetHashDataInputFault
-   */
-  private List<GetHashDataInputResponseType.Reference> getHashDataInput(List<ReferenceType> signedReferences) throws GetHashDataInputFault, Exception {
-    GetHashDataInputType request = new GetHashDataInputType();
-    request.setSessionId(sessId);
-
-//    HashMap<String, ReferenceType> idSignedRefMap = new HashMap<String, ReferenceType>();
-    for (ReferenceType signedRef : signedReferences) {
-      //don't get Manifest, QualifyingProperties, ...
-      if (signedRef.getType() == null) {
-        String signedRefId = signedRef.getId();
-        if (signedRefId != null) {
-          if (log.isTraceEnabled()) {
-            log.trace("requesting hashdata input for reference " + signedRefId);
-          }
-//          idSignedRefMap.put(signedRefId, signedRef);
-          GetHashDataInputType.Reference ref = new GetHashDataInputType.Reference();
-          ref.setID(signedRefId);
-          request.getReference().add(ref);
-
-        } else {
-          throw new Exception("Cannot resolve signature data for dsig:Reference without Id attribute");
-        }
-      }
-    }
-    
-    if (request.getReference().size() < 1) {
-      log.error("No signature data (apart from any QualifyingProperties or a Manifest) for session " + sessId);
-      throw new Exception("No signature data (apart from any QualifyingProperties or a Manifest)");
-    }
-
-    if (log.isDebugEnabled()) {
-      log.debug("WebService call GetHashDataInput for " + request.getReference().size() + " references in session " + sessId);
-    }
-    GetHashDataInputResponseType response = stalPort.getHashDataInput(request);
-    return response.getReference();
-  }
-
-  /**
-   * Verifies all signed references and returns STAL HashDataInputs
-   * @param signedReferences
-   * @param hashDataInputs
-   * @return
-   * @throws java.security.DigestException
-   * @throws java.security.NoSuchAlgorithmException
-   * @throws Exception if no hashdata input is provided for a signed reference
-   */
-  private List<HashDataInput> verifyHashDataInput(List<ReferenceType> signedReferences, List<GetHashDataInputResponseType.Reference> hashDataInputs) throws DigestException, NoSuchAlgorithmException, Exception {
-
-    ArrayList<HashDataInput> verifiedHashDataInputs = new ArrayList<HashDataInput>();
-
-    for (ReferenceType signedRef : signedReferences) {
-      if (signedRef.getType() == null) {
-        log.info("Verifying digest for signed reference " + signedRef.getId());
-
-        String signedRefId = signedRef.getId();
-        byte[] signedDigest = signedRef.getDigestValue();
-        String signedDigestAlg = null;
-        if (signedRef.getDigestMethod() != null) {
-          signedDigestAlg = signedRef.getDigestMethod().getAlgorithm();
-        } else {
-          throw new NoSuchAlgorithmException("Failed to verify digest value for reference " + signedRefId + ": no digest algorithm");
-        }
-
-        // usually, there is just one item here
-        GetHashDataInputResponseType.Reference hashDataInput = null;
-        for (GetHashDataInputResponseType.Reference hdi : hashDataInputs) {
-          if (signedRefId.equals(hdi.getID())) {
-            hashDataInput = hdi;
-            break;
-          }
-        }
-        if (hashDataInput == null) {
-          throw new Exception("No hashdata input for reference " + signedRefId + " returned by service");
-        }
-
-        byte[] hdi = hashDataInput.getValue();
-        String mimeType = hashDataInput.getMimeType();
-        String encoding = hashDataInput.getEncoding();
-
-        if (hdi == null) {
-          throw new Exception("No hashdata input for reference " + signedRefId + " provided by service");
-        }
-        if (log.isDebugEnabled()) {
-          log.debug("Got HashDataInput " + signedRefId + " (" + mimeType + ";" + encoding + ")");
-        }
-
-        byte[] hashDataInputDigest = digest(hdi, signedDigestAlg);
-
-        if (log.isDebugEnabled()) {
-          log.debug("Comparing digest values... ");
-        }
-//        log.warn("***************** DISABLED HASHDATA VERIFICATION");
-        if (!Arrays.equals(hashDataInputDigest, signedDigest)) {
-          log.error("Bad digest value for reference " + signedRefId);
-          throw new DigestException("Bad digest value for reference " + signedRefId);
-        }
-
-        verifiedHashDataInputs.add(new ByteArrayHashDataInput(hdi, signedRefId, mimeType, encoding));
-      }
-    }
-    
-    return verifiedHashDataInputs;
-  }
-
-  //TODO
-  private byte[] digest(byte[] hashDataInput, String mdAlg) throws NoSuchAlgorithmException {
-    if ("http://www.w3.org/2000/09/xmldsig#sha1".equals(mdAlg)) {
-      mdAlg = "SHA-1";
-    } else if ("http://www.w3.org/2001/04/xmlenc#sha256".equals(mdAlg)) {
-      mdAlg = "SHA-256";
-    } else if ("http://www.w3.org/2001/04/xmlenc#sha224".equals(mdAlg)) {
-      mdAlg = "SHA-224";
-    } else if ("http://www.w3.org/2001/04/xmldsig-more#sha224".equals(mdAlg)) {
-      mdAlg = "SHA-224";
-    } else if ("http://www.w3.org/2001/04/xmldsig-more#sha384".equals(mdAlg)) {
-      mdAlg = "SHA-384";
-    } else if ("http://www.w3.org/2001/04/xmlenc#sha512".equals(mdAlg)) {
-      mdAlg = "SHA-512";
-    } else if ("http://www.w3.org/2001/04/xmldsig-more#md2".equals(mdAlg)) {
-      mdAlg = "MD2";
-    } else if ("http://www.w3.org/2001/04/xmldsig-more#md5".equals(mdAlg)) {
-      mdAlg = "MD5";
-    } else if ("http://www.w3.org/2001/04/xmlenc#ripemd160".equals(mdAlg)) {
-      mdAlg = "RipeMD-160";
-    } else {
-      throw new NoSuchAlgorithmException("Failed to verify digest value: unsupported digest algorithm " + mdAlg);
-    }
-
-    MessageDigest md = MessageDigest.getInstance(mdAlg);
-    return md.digest(hashDataInput);
-  }
-}
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java
new file mode 100644
index 00000000..e2551e2d
--- /dev/null
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java
@@ -0,0 +1,221 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.online.applet;
+
+import at.gv.egiz.bku.smccstal.SecureViewer;
+import java.security.DigestException;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.bku.smccstal.SignRequestHandler;
+import at.gv.egiz.stal.HashDataInput;
+import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
+import at.gv.egiz.stal.service.GetHashDataInputFault;
+import at.gv.egiz.stal.service.STALPortType;
+import at.gv.egiz.stal.service.types.GetHashDataInputResponseType;
+import at.gv.egiz.stal.service.types.GetHashDataInputType;
+import at.gv.egiz.stal.signedinfo.ReferenceType;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * A SignRequesthandler that obtains hashdata inputs from a STAL webservice and
+ * displays these either within the applet or in a separate frame.
+ * The internal viewer displays plaintext data only, other mimetypes can be saved to disk.
+ * The standalone (frame) viewer displays all mimetypes.
+ * 
+ * (This class depends on STALService and therefore is not part of BKUCommonGUI.)
+ * 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class AppletSecureViewer extends SignRequestHandler {
+
+  private static final Log log = LogFactory.getLog(AppletSecureViewer.class);
+  protected STALPortType stalPort;
+  protected String sessId;
+
+  public AppletSecureViewer(STALPortType stalPort, String sessId) {
+    if (stalPort == null || sessId == null) {
+      throw new NullPointerException("STAL port must not be null");
+    }
+    this.sessId = sessId;
+    this.stalPort = stalPort;
+  }
+
+  /**
+   * TODO don't throw exceptions
+   * @param signedReferences
+   * @throws java.security.DigestException
+   * @throws java.lang.Exception
+   */
+  @Override
+  public void displayDataToBeSigned(List<ReferenceType> signedReferences) 
+          throws DigestException, Exception {
+
+  List<GetHashDataInputResponseType.Reference> hdi = getHashDataInput(signedReferences);
+    List<HashDataInput> verifiedHashDataInputs = verifyHashDataInput(signedReferences, hdi);
+
+    if (verifiedHashDataInputs.size() > 0) {
+      gui.showSecureViewer(verifiedHashDataInputs, this, "hashDataDone");
+    } else {
+      throw new Exception("No signature data (apart from any QualifyingProperties or a Manifest)");
+    }
+  }
+
+  /**
+   * Get all hashdata inputs that contain an ID attribute but no Type attribute.
+   * @param signedReferences
+   * @return
+   * @throws at.gv.egiz.stal.service.GetHashDataInputFault
+   */
+  private List<GetHashDataInputResponseType.Reference> getHashDataInput(List<ReferenceType> signedReferences)
+          throws GetHashDataInputFault, Exception {
+    GetHashDataInputType request = new GetHashDataInputType();
+    request.setSessionId(sessId);
+
+//    HashMap<String, ReferenceType> idSignedRefMap = new HashMap<String, ReferenceType>();
+    for (ReferenceType signedRef : signedReferences) {
+      //don't get Manifest, QualifyingProperties, ...
+      if (signedRef.getType() == null) {
+        String signedRefId = signedRef.getId();
+        if (signedRefId != null) {
+          if (log.isTraceEnabled()) {
+            log.trace("requesting hashdata input for reference " + signedRefId);
+          }
+//          idSignedRefMap.put(signedRefId, signedRef);
+          GetHashDataInputType.Reference ref = new GetHashDataInputType.Reference();
+          ref.setID(signedRefId);
+          request.getReference().add(ref);
+
+        } else {
+          throw new Exception("Cannot resolve signature data for dsig:Reference without Id attribute");
+        }
+      }
+    }
+    
+    if (request.getReference().size() < 1) {
+      log.error("No signature data (apart from any QualifyingProperties or a Manifest) for session " + sessId);
+      throw new Exception("No signature data (apart from any QualifyingProperties or a Manifest)");
+    }
+
+    if (log.isDebugEnabled()) {
+      log.debug("WebService call GetHashDataInput for " + request.getReference().size() + " references in session " + sessId);
+    }
+    GetHashDataInputResponseType response = stalPort.getHashDataInput(request);
+    return response.getReference();
+  }
+
+  /**
+   * Verifies all signed references and returns STAL HashDataInputs
+   * @param signedReferences
+   * @param hashDataInputs
+   * @return
+   * @throws java.security.DigestException
+   * @throws java.security.NoSuchAlgorithmException
+   * @throws Exception if no hashdata input is provided for a signed reference
+   */
+  private List<HashDataInput> verifyHashDataInput(List<ReferenceType> signedReferences, List<GetHashDataInputResponseType.Reference> hashDataInputs)
+          throws DigestException, NoSuchAlgorithmException, Exception {
+
+    ArrayList<HashDataInput> verifiedHashDataInputs = new ArrayList<HashDataInput>();
+
+    for (ReferenceType signedRef : signedReferences) {
+      if (signedRef.getType() == null) {
+        log.info("Verifying digest for signed reference " + signedRef.getId());
+
+        String signedRefId = signedRef.getId();
+        byte[] signedDigest = signedRef.getDigestValue();
+        String signedDigestAlg = null;
+        if (signedRef.getDigestMethod() != null) {
+          signedDigestAlg = signedRef.getDigestMethod().getAlgorithm();
+        } else {
+          throw new NoSuchAlgorithmException("Failed to verify digest value for reference " + signedRefId + ": no digest algorithm");
+        }
+
+        // usually, there is just one item here
+        GetHashDataInputResponseType.Reference hashDataInput = null;
+        for (GetHashDataInputResponseType.Reference hdi : hashDataInputs) {
+          if (signedRefId.equals(hdi.getID())) {
+            hashDataInput = hdi;
+            break;
+          }
+        }
+        if (hashDataInput == null) {
+          throw new Exception("No hashdata input for reference " + signedRefId + " returned by service");
+        }
+
+        byte[] hdi = hashDataInput.getValue();
+        String mimeType = hashDataInput.getMimeType();
+        String encoding = hashDataInput.getEncoding();
+
+        if (hdi == null) {
+          throw new Exception("No hashdata input for reference " + signedRefId + " provided by service");
+        }
+        if (log.isDebugEnabled()) {
+          log.debug("Got HashDataInput " + signedRefId + " (" + mimeType + ";" + encoding + ")");
+        }
+
+        byte[] hashDataInputDigest = digest(hdi, signedDigestAlg);
+
+        if (log.isDebugEnabled()) {
+          log.debug("Comparing digest values... ");
+        }
+//        log.warn("***************** DISABLED HASHDATA VERIFICATION");
+        if (!Arrays.equals(hashDataInputDigest, signedDigest)) {
+          log.error("Bad digest value for reference " + signedRefId);
+          throw new DigestException("Bad digest value for reference " + signedRefId);
+        }
+
+        verifiedHashDataInputs.add(new ByteArrayHashDataInput(hdi, signedRefId, mimeType, encoding));
+      }
+    }
+    
+    return verifiedHashDataInputs;
+  }
+
+  //TODO
+  private byte[] digest(byte[] hashDataInput, String mdAlg) throws NoSuchAlgorithmException {
+    if ("http://www.w3.org/2000/09/xmldsig#sha1".equals(mdAlg)) {
+      mdAlg = "SHA-1";
+    } else if ("http://www.w3.org/2001/04/xmlenc#sha256".equals(mdAlg)) {
+      mdAlg = "SHA-256";
+    } else if ("http://www.w3.org/2001/04/xmlenc#sha224".equals(mdAlg)) {
+      mdAlg = "SHA-224";
+    } else if ("http://www.w3.org/2001/04/xmldsig-more#sha224".equals(mdAlg)) {
+      mdAlg = "SHA-224";
+    } else if ("http://www.w3.org/2001/04/xmldsig-more#sha384".equals(mdAlg)) {
+      mdAlg = "SHA-384";
+    } else if ("http://www.w3.org/2001/04/xmlenc#sha512".equals(mdAlg)) {
+      mdAlg = "SHA-512";
+    } else if ("http://www.w3.org/2001/04/xmldsig-more#md2".equals(mdAlg)) {
+      mdAlg = "MD2";
+    } else if ("http://www.w3.org/2001/04/xmldsig-more#md5".equals(mdAlg)) {
+      mdAlg = "MD5";
+    } else if ("http://www.w3.org/2001/04/xmlenc#ripemd160".equals(mdAlg)) {
+      mdAlg = "RipeMD-160";
+    } else {
+      throw new NoSuchAlgorithmException("Failed to verify digest value: unsupported digest algorithm " + mdAlg);
+    }
+
+    MessageDigest md = MessageDigest.getInstance(mdAlg);
+    return md.digest(hashDataInput);
+  }
+}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
index c904be0c..159dd29d 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
@@ -56,8 +56,6 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
   /** remember the pinSpec to return to worker */
   protected PINSpec pinSpec;
 
-  protected enum DIALOG { VERIFY, ACTIVATE, CHANGE, UNBLOCK };
-
   public PINManagementGUI(Container contentPane,
           Locale locale,
           Style guiStyle,
@@ -235,43 +233,110 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
   }
 
   @Override
-  public void showActivatePINDialog(final PINSpec pin,
-          final ActionListener okListener, final String okCommand,
-          final ActionListener cancelListener, final String cancelCommand) {
-    log.debug("scheduling activate pin dialog");
-    showPINDialog(DIALOG.ACTIVATE, pin, okListener, okCommand, cancelListener, cancelCommand);
+  public void showPINDialog(DIALOG type, PINSpec pinSpec,
+          ActionListener okListener, String okCommand,
+          ActionListener cancelListener, String cancelCommand) {
+    showPINDialog(type, pinSpec, -1, false,
+            okListener, okCommand, cancelListener, cancelCommand);
+  }
+
+  @Override
+  public void showPINDialog(DIALOG type, PINSpec pinSpec, int retries,
+          ActionListener okListener, String okCommand,
+          ActionListener cancelListener, String cancelCommand) {
+    showPINDialog(type, pinSpec, retries, false,
+            okListener, okCommand, cancelListener, cancelCommand);
   }
 
+  @Override
+  public void showPinpadPINDialog(DIALOG type, PINSpec pinSpec, int retries) {
+    String title, msg;
+    Object[] params;
+    if (retries < 0) {
+      params = new Object[2];
+      if (shortText) {
+        params[0] = "PIN";
+      } else {
+        params[0] = pinSpec.getLocalizedName();
+      }
+      String pinSize = String.valueOf(pinSpec.getMinLength());
+      if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+          pinSize += "-" + pinSpec.getMaxLength();
+      }
+      params[1] = pinSize;
+      if (type == DIALOG.CHANGE) {
+        log.debug("show change pin dialog");
+        title = TITLE_CHANGE_PIN;
+        msg = MESSAGE_CHANGEPIN_PINPAD;
+      } else if (type == DIALOG.ACTIVATE) {
+        log.debug("show activate pin dialog");
+        title = TITLE_ACTIVATE_PIN;
+        msg = MESSAGE_ENTERPIN_PINPAD;
+      } else if (type == DIALOG.VERIFY) {
+        log.debug("show verify pin dialog");
+        title = TITLE_VERIFY_PIN;
+        msg = MESSAGE_ENTERPIN_PINPAD;
+      } else {
+        log.debug("show unblock pin dialog");
+        title = TITLE_UNBLOCK_PIN;
+        msg = MESSAGE_ENTERPIN_PINPAD;
+      }
+
+    } else {
+      log.debug("show retry pin dialog");
+      title = TITLE_RETRY;
+      msg = (retries < 2) ?
+        MESSAGE_LAST_RETRY : MESSAGE_RETRIES;
+      params = new Object[] {String.valueOf(retries)};
+    }
+    showMessageDialog(title, msg, params);
+  }
 
   private void showPINDialog(final DIALOG type, final PINSpec pinSpec,
+          final int retries, final boolean pinpad,
           final ActionListener okListener, final String okCommand,
           final ActionListener cancelListener, final String cancelCommand) {
 
+    log.debug("scheduling pin dialog");
+
       SwingUtilities.invokeLater(new Runnable() {
 
             @Override
             public void run() {
 
-              String HELP_TOPIC, TITLE, MESSAGE_MGMT;
+              String HELP_TOPIC, TITLE, MESSAGE_MGMT, MESSAGE_MGMT_PARAM;
               HELP_TOPIC = HELP_PINMGMT;
 
-              if (type == DIALOG.CHANGE) {
-                log.debug("show change pin dialog");
-                TITLE = TITLE_CHANGE_PIN;
-                MESSAGE_MGMT = MESSAGE_CHANGE_PIN;
-              } else if (type == DIALOG.ACTIVATE) {
-                log.debug("show activate pin dialog");
-                TITLE = TITLE_ACTIVATE_PIN;
-                MESSAGE_MGMT = MESSAGE_ACTIVATE_PIN;
-                oldPinField = null;
-              } else if (type == DIALOG.VERIFY) {
-                log.debug("show verify pin dialog");
-                TITLE = TITLE_VERIFY_PIN;
-                MESSAGE_MGMT = MESSAGE_VERIFY_PIN;
+              if (retries < 0) {
+                if (type == DIALOG.CHANGE) {
+                  log.debug("show change pin dialog");
+                  TITLE = TITLE_CHANGE_PIN;
+                  MESSAGE_MGMT = MESSAGE_CHANGE_PIN;
+                } else if (type == DIALOG.ACTIVATE) {
+                  log.debug("show activate pin dialog");
+                  TITLE = TITLE_ACTIVATE_PIN;
+                  MESSAGE_MGMT = MESSAGE_ACTIVATE_PIN;
+                  oldPinField = null;
+                } else if (type == DIALOG.VERIFY) {
+                  log.debug("show verify pin dialog");
+                  TITLE = TITLE_VERIFY_PIN;
+                  MESSAGE_MGMT = MESSAGE_VERIFY_PIN;
+                } else {
+                  log.debug("show unblock pin dialog");
+                  TITLE = TITLE_UNBLOCK_PIN;
+                  MESSAGE_MGMT = MESSAGE_UNBLOCK_PIN;
+                }
+                if (shortText) {
+                  MESSAGE_MGMT_PARAM = "PIN";
+                } else {
+                  MESSAGE_MGMT_PARAM = pinSpec.getLocalizedName();
+                }
               } else {
-                log.debug("show unblock pin dialog");
-                TITLE = TITLE_UNBLOCK_PIN;
-                MESSAGE_MGMT = MESSAGE_UNBLOCK_PIN;
+                log.debug("show retry pin dialog");
+                TITLE = TITLE_RETRY;
+                MESSAGE_MGMT = (retries < 2) ?
+                  MESSAGE_LAST_RETRY : MESSAGE_RETRIES;
+                MESSAGE_MGMT_PARAM = String.valueOf(retries);
               }
 
                 mainPanel.removeAll();
@@ -280,24 +345,67 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                 helpListener.setHelpTopic(HELP_TOPIC);
 
                 JLabel mgmtLabel = new JLabel();
-                mgmtLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~Font.BOLD));
+                if (retries < 0) {
+                  mgmtLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~Font.BOLD));
+                } else {
+                  mgmtLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() | Font.BOLD));
+                  mgmtLabel.setForeground(ERROR_COLOR);
+                  helpListener.setHelpTopic(HELP_RETRY);
+                }
 
                 if (renderHeaderPanel) {
                   titleLabel.setText(getMessage(TITLE));
                   String mgmtPattern = getMessage(MESSAGE_MGMT);
-                  if (shortText) {
-                    mgmtLabel.setText(MessageFormat.format(mgmtPattern, "PIN"));
-                  } else {
-                    mgmtLabel.setText(MessageFormat.format(mgmtPattern, pinSpec.getLocalizedName()));
-                  }
+                  mgmtLabel.setText(MessageFormat.format(mgmtPattern, MESSAGE_MGMT_PARAM));
                 } else {
                   mgmtLabel.setText(getMessage(TITLE));
                 }
 
+                String pinSize = String.valueOf(pinSpec.getMinLength());
+                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+                    pinSize += "-" + pinSpec.getMaxLength();
+                }
+
+                ////////////////////////////////////////////////////////////////
+                // COMMON LAYOUT SECTION
+                ////////////////////////////////////////////////////////////////
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
+                          .addComponent(mgmtLabel);
+                GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                          .addComponent(mgmtLabel);
+
+                if (!renderHeaderPanel) {
+                  infoHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel);
+                  infoVertical
+                          .addComponent(helpLabel);
+                }
+
+                GroupLayout.ParallelGroup pinHorizontal;
+                GroupLayout.SequentialGroup pinVertical;
+
+                if (pinpad) {
+                  JLabel pinpadLabel = new JLabel();
+                  pinpadLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~Font.BOLD));
+                  String pinpadPattern = getMessage(MESSAGE_PINPAD);
+                  pinpadLabel.setText(MessageFormat.format(pinpadPattern,
+                          new Object[] { pinSpec.getLocalizedName(), pinSize }));
+                  
+                  pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                          .addComponent(pinpadLabel);
+                  pinVertical = mainPanelLayout.createSequentialGroup()
+                          .addComponent(pinpadLabel);
+                } else {
+
                 JButton okButton = new JButton();
                 okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~Font.BOLD));
                 okButton.setText(getMessage(BUTTON_OK));
-                okButton.setEnabled(type == DIALOG.VERIFY && pinSpec.getMinLength() == 0);
+                okButton.setEnabled(pinSpec.getMinLength() <= 0);
                 okButton.setActionCommand(okCommand);
                 okButton.addActionListener(okListener);
 
@@ -334,7 +442,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                   repeatPinLabel.setText(MessageFormat.format(repeatPinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
 
                   repeatPinField.setText("");
-                  repeatPinField.setDocument(new PINDocument(pinSpec, okButton, pinField.getDocument()));
+//                  repeatPinField.setDocument(new PINDocument(pinSpec, okButton, pinField.getDocument()));
                   repeatPinField.setActionCommand(okCommand);
                   repeatPinField.addActionListener(new ActionListener() {
 
@@ -365,7 +473,15 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                             }
                         }
                     });
-                  } // else -> ACTIVATE (not verify, not change)
+
+                    repeatPinField.setDocument(new PINDocument(
+                            pinSpec, okButton,
+                            pinField.getDocument(), oldPinField.getDocument()));
+                  } else {
+                    // else -> ACTIVATE (not verify, not change)
+                    repeatPinField.setDocument(new PINDocument(
+                            pinSpec, okButton, pinField.getDocument()));
+                  }
                 } else {
                   pinField.setDocument(new PINDocument(pinSpec, okButton));
                 }
@@ -373,30 +489,14 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                 JLabel pinsizeLabel = new JLabel();
                 pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~Font.BOLD, pinsizeLabel.getFont().getSize()-2));
                 String pinsizePattern = getMessage(LABEL_PINSIZE);
-                String pinSize = String.valueOf(pinSpec.getMinLength());
-                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-                    pinSize += "-" + pinSpec.getMaxLength();
-                }
                 pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
 
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
-                          .addComponent(mgmtLabel);
-                GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                          .addComponent(mgmtLabel);
-
-                if (!renderHeaderPanel) {
-                  infoHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel);
-                  infoVertical
-                          .addComponent(helpLabel);
-                }
+                ////////////////////////////////////////////////////////////////
+                // NON-PINPAD SPECIFIC LAYOUT SECTION
+                ////////////////////////////////////////////////////////////////
 
-                GroupLayout.ParallelGroup pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
-                GroupLayout.SequentialGroup pinVertical = mainPanelLayout.createSequentialGroup();
+                pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+                pinVertical = mainPanelLayout.createSequentialGroup();
 
 //                if (pinLabelPos == PinLabelPosition.ABOVE) {
 //                  if (changePin) {
@@ -495,7 +595,38 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                             .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
                   pinVertical
                           .addComponent(pinsizeLabel);
-//                }
+
+                  GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                  buttonPanel.setLayout(buttonPanelLayout);
+
+                  GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
+                          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                          .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                  GroupLayout.Group buttonVertical;
+
+                  JButton cancelButton = new JButton();
+                  cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  cancelButton.setText(getMessage(BUTTON_CANCEL));
+                  cancelButton.setActionCommand(cancelCommand);
+                  cancelButton.addActionListener(cancelListener);
+
+                  buttonHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                  buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                          .addComponent(okButton)
+                          .addComponent(cancelButton);
+
+                  buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
+                  buttonPanelLayout.setVerticalGroup(buttonVertical);
+
+                  if (oldPinField != null) {
+                    oldPinField.requestFocusInWindow();
+                  } else {
+                    pinField.requestFocusInWindow();
+                  }
+
+                } // END NON-PINPAD SECTION
 
                 mainPanelLayout.setHorizontalGroup(
                   mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -508,132 +639,12 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                     .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                     .addGroup(pinVertical));
 
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
-
-                GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
-                GroupLayout.Group buttonVertical;
-
-                JButton cancelButton = new JButton();
-                cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                cancelButton.setText(getMessage(BUTTON_CANCEL));
-                cancelButton.setActionCommand(cancelCommand);
-                cancelButton.addActionListener(cancelListener);
-
-                buttonHorizontal
-                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
-                buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                        .addComponent(okButton)
-                        .addComponent(cancelButton);
-
-                buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
-                buttonPanelLayout.setVerticalGroup(buttonVertical);
-
-                if (oldPinField != null) {
-                  oldPinField.requestFocusInWindow();
-                } else {
-                  pinField.requestFocusInWindow();
-                }
                 contentPanel.validate();
 
             }
         });
   }
 
-  @Override
-  public void showChangePINDialog(final PINSpec pin,
-          final ActionListener okListener, final String okCommand,
-          final ActionListener cancelListener, final String cancelCommand) {
-    
-      log.debug("scheduling change pin dialog");
-      showPINDialog(DIALOG.CHANGE, pin, okListener, okCommand, cancelListener, cancelCommand);
-  }
-
-  @Override
-  public void showUnblockPINDialog(final PINSpec pin,
-          final ActionListener okListener, final String okCommand,
-          final ActionListener cancelListener, final String cancelCommand) {
-
-      log.debug("scheduling unblock PIN dialog");
-
-      SwingUtilities.invokeLater(new Runnable() {
-
-          @Override
-            public void run() {
-
-                log.debug("show unblock PIN dialog");
-
-                log.error("unblock pin not supported");
-
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                if (renderHeaderPanel) {
-                  titleLabel.setText(getMessage(TITLE_ERROR));
-                }
-
-                helpListener.setHelpTopic(HELP_PINMGMT);
-
-                String errorMsgPattern = getMessage(ERR_UNBLOCK);
-                String errorMsg = MessageFormat.format(errorMsgPattern, pin.getLocalizedName());
-
-                JLabel errorMsgLabel = new JLabel();
-                errorMsgLabel.setFont(errorMsgLabel.getFont().deriveFont(errorMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                errorMsgLabel.setText(errorMsg);
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
-                GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
-
-                if (!renderHeaderPanel) {
-                  JLabel errorTitleLabel = new JLabel();
-                  errorTitleLabel.setFont(errorTitleLabel.getFont().deriveFont(errorTitleLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                  errorTitleLabel.setText(getMessage(TITLE_ERROR));
-                  errorTitleLabel.setForeground(ERROR_COLOR);
-
-                  mainHorizontal
-                          .addGroup(mainPanelLayout.createSequentialGroup()
-                            .addComponent(errorTitleLabel)
-                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                            .addComponent(helpLabel));
-                  mainVertical
-                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                            .addComponent(errorTitleLabel)
-                            .addComponent(helpLabel));
-                }
-
-                mainPanelLayout.setHorizontalGroup(mainHorizontal
-                        .addComponent(errorMsgLabel));
-                mainPanelLayout.setVerticalGroup(mainVertical
-                        .addComponent(errorMsgLabel));
-
-                JButton okButton = new JButton();
-                okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                okButton.setText(getMessage(BUTTON_OK));
-                okButton.setActionCommand(cancelCommand);
-                okButton.addActionListener(cancelListener);
-
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
-
-                buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-                buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                    .addComponent(okButton));
-
-                contentPanel.validate();
-            }
-        });
-  }
-
   @Override
   protected int initButtonSize() {
     int bs = super.initButtonSize();
@@ -659,8 +670,4 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
     return bs;
   }
 
-  @Override
-  public void showVerifyPINDialog(PINSpec pin, ActionListener okListener, String okCmd, ActionListener cancelListener, String cancelCmd) {
-    showPINDialog(DIALOG.VERIFY, pin, okListener, okCmd, cancelListener, cancelCmd);
-  }
 }
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
index 9c630431..45313f42 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
@@ -35,13 +35,18 @@ public interface PINManagementGUIFacade extends BKUGUIFacade {
   public static final String TITLE_UNBLOCK_PIN = "title.unblock.pin";
   public static final String TITLE_ACTIVATE_SUCCESS = "title.activate.success";
   public static final String TITLE_CHANGE_SUCCESS = "title.change.success";
-  public static final String MESSAGE_ACTIVATE_SUCCESS = "message.activate.success";
-  public static final String MESSAGE_CHANGE_SUCCESS = "message.change.success";
-  public static final String MESSAGE_PINMGMT = "message.pin.mgmt";
-  public static final String MESSAGE_ACTIVATE_PIN = "message.activate.pin";
-  public static final String MESSAGE_CHANGE_PIN = "message.change.pin";
-  public static final String MESSAGE_VERIFY_PIN = "message.verify.pin";
-  public static final String MESSAGE_UNBLOCK_PIN = "message.unblock.pin";
+
+  // removed message.* prefix to reuse keys as help keys
+  public static final String MESSAGE_ACTIVATE_SUCCESS = "activate.success";
+  public static final String MESSAGE_CHANGE_SUCCESS = "change.success";
+  public static final String MESSAGE_PINMGMT = "pin.mgmt";
+  public static final String MESSAGE_PINPAD = "pinpad";
+  public static final String MESSAGE_CHANGEPIN_PINPAD = "pinpad.change";
+  public static final String MESSAGE_ACTIVATE_PIN = "activate.pin";
+  public static final String MESSAGE_CHANGE_PIN = "change.pin";
+  public static final String MESSAGE_VERIFY_PIN = "verify.pin";
+  public static final String MESSAGE_UNBLOCK_PIN = "unblock.pin";
+  
   public static final String LABEL_OLD_PIN = "label.old.pin";
   public static final String LABEL_NEW_PIN = "label.new.pin";
   public static final String LABEL_REPEAT_PIN = "label.repeat.pin";
@@ -66,26 +71,37 @@ public interface PINManagementGUIFacade extends BKUGUIFacade {
   public static final String STATUS_UNKNOWN = "status.unknown";
 
   public enum STATUS { ACTIV, NOT_ACTIV, BLOCKED, UNKNOWN };
+  public enum DIALOG { VERIFY, ACTIVATE, CHANGE, UNBLOCK };
 
   public void showPINManagementDialog(Map<PINSpec, STATUS> pins,
           ActionListener activateListener, String activateCmd, String changeCmd, String unblockCmd, String verifyCmd,
           ActionListener cancelListener, String cancelCmd);
 
-  public void showActivatePINDialog(PINSpec pin,
+  public void showPINDialog(DIALOG type, PINSpec pin,
           ActionListener okListener, String okCmd,
           ActionListener cancelListener, String cancelCmd);
 
-  public void showChangePINDialog(PINSpec pin,
+  public void showPINDialog(DIALOG type, PINSpec pin, int retries,
           ActionListener okListener, String okCmd,
           ActionListener cancelListener, String cancelCmd);
 
-  public void showUnblockPINDialog(PINSpec pin,
-          ActionListener okListener, String okCmd,
-          ActionListener cancelListener, String cancelCmd);
+  public void showPinpadPINDialog(DIALOG type, PINSpec pin, int retries);
 
-  public void showVerifyPINDialog(PINSpec pin,
-          ActionListener okListener, String okCmd,
-          ActionListener cancelListener, String cancelCmd);
+//  public void showActivatePINDialog(PINSpec pin,
+//          ActionListener okListener, String okCmd,
+//          ActionListener cancelListener, String cancelCmd);
+//
+//  public void showChangePINDialog(PINSpec pin,
+//          ActionListener okListener, String okCmd,
+//          ActionListener cancelListener, String cancelCmd);
+//
+//  public void showUnblockPINDialog(PINSpec pin,
+//          ActionListener okListener, String okCmd,
+//          ActionListener cancelListener, String cancelCmd);
+//
+//  public void showVerifyPINDialog(PINSpec pin,
+//          ActionListener okListener, String okCmd,
+//          ActionListener cancelListener, String cancelCmd);
 
   public char[] getOldPin();
 
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 85892026..81b635f8 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
@@ -42,7 +42,8 @@ public class PINManagementBKUWorker extends AppletBKUWorker {
 
   @Override
   public void run() {
-    gui.showWelcomeDialog();
+    gui.showMessageDialog(BKUGUIFacade.TITLE_WELCOME,
+            BKUGUIFacade.MESSAGE_WELCOME);
 
     try {
       List<STALResponse> responses = handleRequest(Collections.singletonList(new PINManagementRequest()));
@@ -53,7 +54,6 @@ public class PINManagementBKUWorker extends AppletBKUWorker {
           log.debug("PIN management dialog terminated");
         } else if (response instanceof ErrorResponse) {
           log.debug("PIN management dialog terminated with error");
-          showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, null);
         } else {
           throw new RuntimeException("Invalid STAL response: " + response.getClass().getName());
         }
@@ -62,7 +62,11 @@ public class PINManagementBKUWorker extends AppletBKUWorker {
       }
 
     } catch (RuntimeException ex) {
-      log.error("unexpected error: " + ex.getMessage(), ex);
+      log.error(ex.getMessage());
+      Throwable cause = ex.getCause();
+      if (cause != null) { // && cause instanceof InterruptedException) {
+        log.info(cause.getMessage());
+      }
       showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, null);
     } catch (Exception ex) {
       log.error(ex.getMessage(), ex);
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java
new file mode 100644
index 00000000..b0dd8766
--- /dev/null
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.smccstal.ext;
+
+import at.gv.egiz.smcc.ChangePINProvider;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade;
+import at.gv.egiz.smcc.PINProvider;
+import at.gv.egiz.smcc.SignatureCard;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public abstract class ManagementPINProviderFactory {
+//        extends at.gv.egiz.bku.smccstal.PINProviderFactory {
+
+  PINManagementGUIFacade gui;
+  
+  public static ManagementPINProviderFactory getInstance(SignatureCard forCard,
+          PINManagementGUIFacade gui) {
+//    if (forCard.ifdSupportsFeature(SignatureCard.FEATURE_VERIFY_PIN_DIRECT)) {
+////      forCard.ifdSupportsFeature(SignatureCard.FEATURE_MODIFY_PIN_DIRECT)
+//      return new PinpadPINProviderFactory(gui);
+//
+//    } else {
+      return new SoftwarePINProviderFactory(gui);
+//    }
+  }
+
+  public abstract PINProvider getVerifyPINProvider();
+
+  public abstract PINProvider getActivatePINProvider();
+
+  public abstract ChangePINProvider getChangePINProvider();
+
+  public abstract PINProvider getUnblockPINProvider();
+
+}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
index 66db0484..6b565b26 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
@@ -18,13 +18,19 @@ package at.gv.egiz.bku.smccstal.ext;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.PINManagementGUIFacade;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade.DIALOG;
 import at.gv.egiz.bku.gui.PINManagementGUIFacade.STATUS;
 import at.gv.egiz.bku.smccstal.AbstractRequestHandler;
+import at.gv.egiz.bku.smccstal.PINProviderFactory;
+import at.gv.egiz.smcc.CancelledException;
 import at.gv.egiz.smcc.LockedException;
 import at.gv.egiz.smcc.NotActivatedException;
+import at.gv.egiz.smcc.PINProvider;
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.smcc.STARCOSCard;
+import at.gv.egiz.smcc.SignatureCard;
 import at.gv.egiz.smcc.SignatureCardException;
+import at.gv.egiz.smcc.TimeoutException;
 import at.gv.egiz.smcc.VerificationFailedException;
 import at.gv.egiz.smcc.util.SMCCHelper;
 import at.gv.egiz.stal.ErrorResponse;
@@ -35,8 +41,6 @@ import at.gv.egiz.stal.ext.PINManagementResponse;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.smartcardio.Card;
 import javax.smartcardio.CardChannel;
 import javax.smartcardio.CardException;
@@ -53,7 +57,8 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
 
   protected static final Log log = LogFactory.getLog(PINManagementRequestHandler.class);
 
-  Map<PINSpec, STATUS> pinStatuses;
+  protected Map<PINSpec, STATUS> pinStatuses;
+  private ManagementPINProviderFactory pinProviderFactory;
 
   @Override
   public STALResponse handleRequest(STALRequest request) throws InterruptedException {
@@ -61,9 +66,12 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
 
       PINManagementGUIFacade gui = (PINManagementGUIFacade) this.gui;
 
+      PINSpec selectedPIN = null;
+
       try {
-      pinStatuses = getPINStatuses();
 
+      pinStatuses = getPINStatuses();
+      
       gui.showPINManagementDialog(pinStatuses,
               this, "activate_enterpin", "change_enterpin", "unblock_enterpuk", "verify_enterpin",
               this, "cancel");
@@ -74,175 +82,100 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
 
         if ("cancel".equals(actionCommand)) {
           return new PINManagementResponse();
-        } else if ("back".equals(actionCommand)) {
-          gui.showPINManagementDialog(pinStatuses,
-              this, "activate_enterpin", "change_enterpin", "unblock_enterpuk", "verify_enterpin",
-              this, "cancel");
         } else {
-          PINSpec selectedPIN = gui.getSelectedPINSpec();
+          selectedPIN = gui.getSelectedPINSpec();
 
           if (selectedPIN == null) {
-            throw new RuntimeException("no PIN selected for activation/change");
+            throw new NullPointerException("no PIN selected for activation/change");
           }
 
-          if ("activate_enterpin".equals(actionCommand)) {
-            gui.showActivatePINDialog(selectedPIN,
-                    this, "activate", this, "back");
-          } else if ("change_enterpin".equals(actionCommand)) {
-            gui.showChangePINDialog(selectedPIN,
-                    this, "change", this, "back");
-          } else if ("unblock_enterpuk".equals(actionCommand)) {
-            gui.showUnblockPINDialog(selectedPIN,
-                    this, "unblock", this, "back");
-          } else if ("verify_enterpin".equals(actionCommand)) {
-            gui.showVerifyPINDialog(selectedPIN,
-                    this, "verify", this, "back");
-          } else if ("activate".equals(actionCommand)) {
-            try {
-              log.debug("activate " + selectedPIN.getLocalizedName());
-              card.activatePIN(selectedPIN,
-                      String.valueOf(gui.getPin()));
+          if (pinProviderFactory == null) {
+            pinProviderFactory =
+                    ManagementPINProviderFactory.getInstance(card, gui);
+          }
+
+          try {
+            if ("activate_enterpin".equals(actionCommand)) {
+              log.info("activate " + selectedPIN.getLocalizedName());
+              card.activatePIN(selectedPIN, 
+                      pinProviderFactory.getActivatePINProvider());
               updatePINStatus(selectedPIN, STATUS.ACTIV);
               gui.showMessageDialog(PINManagementGUIFacade.TITLE_ACTIVATE_SUCCESS,
                       PINManagementGUIFacade.MESSAGE_ACTIVATE_SUCCESS,
                       new Object[] {selectedPIN.getLocalizedName()},
-                      this, "ok");
+                      BKUGUIFacade.BUTTON_OK, this, "ok");
               waitForAction();
-              gui.showPINManagementDialog(pinStatuses,
-                this, "activate_enterpin", "change_enterpin", "unblock_enterpuk", "verify_enterpin",
-                this, "cancel");
-            } catch (GetPINStatusException ex) {
-              log.error("failed to get " +  selectedPIN.getLocalizedName() +
-                      " status: " + ex.getMessage());
-              gui.showErrorDialog(PINManagementGUIFacade.ERR_STATUS, null,
-                      this, "cancel");
-            } catch (SignatureCardException ex) {
-              log.error("failed to activate " + selectedPIN.getLocalizedName() +
-                      ": " + ex.getMessage());
-              gui.showErrorDialog(PINManagementGUIFacade.ERR_ACTIVATE, 
-                      new Object[] {selectedPIN.getLocalizedName()},
-                      this, "cancel");
-            }
-          } else if ("change".equals(actionCommand)) {
-            log.info("change " + selectedPIN.getLocalizedName());
-            try {
-              card.changePIN(selectedPIN,
-                      String.valueOf(gui.getOldPin()),
-                      String.valueOf(gui.getPin()));
+            } else if ("change_enterpin".equals(actionCommand)) {
+              log.info("change " + selectedPIN.getLocalizedName());
+              card.changePIN(selectedPIN, 
+                      pinProviderFactory.getChangePINProvider());
               updatePINStatus(selectedPIN, STATUS.ACTIV);
               gui.showMessageDialog(PINManagementGUIFacade.TITLE_CHANGE_SUCCESS,
                       PINManagementGUIFacade.MESSAGE_CHANGE_SUCCESS,
                       new Object[] {selectedPIN.getLocalizedName()},
-                      this, "ok");
-              waitForAction();
-              gui.showPINManagementDialog(pinStatuses,
-                this, "activate_enterpin", "change_enterpin", "unblock_enterpuk", "verify_enterpin",
-                this, "cancel");
-            } catch (GetPINStatusException ex) {
-              log.error("failed to get " +  selectedPIN.getLocalizedName() +
-                      " status: " + ex.getMessage());
-              gui.showErrorDialog(PINManagementGUIFacade.ERR_STATUS, null,
-                      this, "cancel");
-            } catch (LockedException ex) {
-              log.error("failed to change " + selectedPIN.getLocalizedName() +
-                      ": PIN locked");
-              updatePINStatus(selectedPIN, STATUS.BLOCKED);
-              gui.showErrorDialog(PINManagementGUIFacade.ERR_LOCKED,
-                      new Object[] {selectedPIN.getLocalizedName()},
-                      this, "ok");
-              waitForAction();
-              gui.showPINManagementDialog(pinStatuses,
-                this, "activate_enterpin", "change_enterpin", "unblock_enterpuk", "verify_enterpin",
-                this, "cancel");
-            } catch (VerificationFailedException ex) {
-              log.error("failed to change " + selectedPIN.getLocalizedName() +
-                      ": " + ex.getMessage());
-              gui.showErrorDialog(PINManagementGUIFacade.ERR_RETRIES,
-                      new Object[] {selectedPIN.getLocalizedName(), ex.getRetries()},
-                      this, "change_enterpin");
-            } catch (NotActivatedException ex) {
-              log.error("failed to change " + selectedPIN.getLocalizedName() +
-                      ": PIN not active");
-              updatePINStatus(selectedPIN, STATUS.NOT_ACTIV);
-              gui.showErrorDialog(PINManagementGUIFacade.ERR_NOT_ACTIVE,
-                      new Object[] {selectedPIN.getLocalizedName()},
-                      this, "ok");
+                      BKUGUIFacade.BUTTON_OK, this, "ok");
               waitForAction();
-              gui.showPINManagementDialog(pinStatuses,
-                this, "activate_enterpin", "change_enterpin", "unblock_enterpuk", "verify_enterpin",
-                this, "cancel");
-            } catch (SignatureCardException ex) {
-              log.error("failed to change " + selectedPIN.getLocalizedName() +
-                      ": " + ex.getMessage());
-              gui.showErrorDialog(PINManagementGUIFacade.ERR_CHANGE, 
-                      new Object[] {selectedPIN.getLocalizedName()},
-                      this, "cancel");
-            }
-          } else if ("unblock".equals(actionCommand)) {
-            log.info("unblock " + selectedPIN.getLocalizedName());
-            log.error("unblock PIN not implemented");
-            gui.showErrorDialog(PINManagementGUIFacade.ERR_UNBLOCK, null, this, "cancel");
-          } else if ("verify".equals(actionCommand)) {
-            try {
+
+            } else if ("unblock_enterpuk".equals(actionCommand)) {
+              log.info("unblock " + selectedPIN.getLocalizedName());
+              card.unblockPIN(selectedPIN,
+                      pinProviderFactory.getUnblockPINProvider());
+            } else if ("verify_enterpin".equals(actionCommand)) {
               log.info("verify " + selectedPIN.getLocalizedName());
-              int retries = card.verifyPIN(selectedPIN, String.valueOf(gui.getPin()));
-              log.trace(retries + " retries");
-              if (retries < 0) {
-                updatePINStatus(selectedPIN, STATUS.ACTIV);
-                gui.showPINManagementDialog(pinStatuses,
-                        this, "activate_enterpin", "change_enterpin", "unblock_enterpuk", "verify_enterpin",
-                        this, "cancel");
-              } else {
-                log.error("failed to verify " + selectedPIN.getLocalizedName() +
-                      ": " + retries + " retries left");
-                gui.showErrorDialog(PINManagementGUIFacade.ERR_RETRIES,
-                      new Object[] {selectedPIN.getLocalizedName(), retries},
-                      this, "verify_enterpin");
-              }
-            } catch (GetPINStatusException ex) {
-              log.error("failed to get " +  selectedPIN.getLocalizedName() +
-                      " status: " + ex.getMessage());
-              gui.showErrorDialog(PINManagementGUIFacade.ERR_STATUS, null,
-                      this, "cancel");
-            } catch (LockedException ex) {
-              log.error("failed to verify " + selectedPIN.getLocalizedName() +
-                      ": PIN locked");
-              updatePINStatus(selectedPIN, STATUS.BLOCKED);
-              gui.showPINManagementDialog(pinStatuses,
-                      this, "activate_enterpin", "change_enterpin", "unblock_enterpuk", "verify_enterpin",
-                      this, "cancel");
-            } catch (NotActivatedException ex) {
-              log.error("failed to verify " + selectedPIN.getLocalizedName() +
-                      ": PIN not active");
-              updatePINStatus(selectedPIN, STATUS.NOT_ACTIV);
-              gui.showPINManagementDialog(pinStatuses,
-                      this, "activate_enterpin", "change_enterpin", "unblock_enterpuk", "verify_enterpin",
-                      this, "cancel");
-            } catch (SignatureCardException ex) {
-              log.error("failed to verify " + selectedPIN.getLocalizedName() +
-                      ": " + ex.getMessage());
-              gui.showErrorDialog(PINManagementGUIFacade.ERR_STATUS,
-                      new Object[] {selectedPIN.getLocalizedName()},
-                      this, "cancel");
+              card.verifyPIN(selectedPIN,
+                      pinProviderFactory.getVerifyPINProvider());
+              updatePINStatus(selectedPIN, STATUS.ACTIV);
             }
-
-          } else {
-            throw new RuntimeException("unsupported action " + actionCommand);
+          } catch (CancelledException ex) {
+            log.trace("cancelled");
+          } catch (TimeoutException ex) {
+            log.error("Timeout during pin entry");
+            gui.showMessageDialog(BKUGUIFacade.TITLE_ENTRY_TIMEOUT,
+                    BKUGUIFacade.ERR_PIN_TIMEOUT, 
+                    new Object[] {selectedPIN.getLocalizedName()},
+                    BKUGUIFacade.BUTTON_OK, this, null);
+            waitForAction();
+          } catch (LockedException ex) {
+            log.error(selectedPIN.getLocalizedName() + " locked");
+            updatePINStatus(selectedPIN, STATUS.BLOCKED);
+            gui.showErrorDialog(PINManagementGUIFacade.ERR_LOCKED,
+                    new Object[] {selectedPIN.getLocalizedName()},
+                    this, null);
+            waitForAction();
+          } catch (NotActivatedException ex) {
+            log.error(selectedPIN.getLocalizedName() + " not active");
+            updatePINStatus(selectedPIN, STATUS.NOT_ACTIV);
+            gui.showErrorDialog(PINManagementGUIFacade.ERR_NOT_ACTIVE,
+                    new Object[] {selectedPIN.getLocalizedName()},
+                    this, null);
+            waitForAction();
           }
-        }
-      }
+        } // end if
+
+        selectedPIN = null;
+        gui.showPINManagementDialog(pinStatuses,
+                this, "activate_enterpin", "change_enterpin", "unblock_enterpuk", "verify_enterpin",
+                this, "cancel");
+      } // end while
+
       } catch (GetPINStatusException ex) {
-        log.error("Failed to get PIN statuses: " + ex.getMessage());
+        String pin = (selectedPIN != null) ? selectedPIN.getLocalizedName() : "pin";
+        log.error("failed to get " +  pin + " status: " + ex.getMessage());
         gui.showErrorDialog(PINManagementGUIFacade.ERR_STATUS, null,
                 this, "ok");
         waitForAction();
         return new ErrorResponse(1000);
+      } catch (SignatureCardException ex) {
+        log.error(ex.getMessage(), ex);
+        gui.showErrorDialog(PINManagementGUIFacade.ERR_UNKNOWN, null,
+                this, "ok");
+        waitForAction();
+        return new ErrorResponse(1000);
       }
     } else {
       log.error("Got unexpected STAL request: " + request);
       return new ErrorResponse(1000);
     }
-
   }
 
   @Override
@@ -375,4 +308,100 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
       pinStatuses.put(pinSpec, status);
     }
   }
+
+//  /**
+//   * provides oldPin and newPin from one dialog,
+//   * and don't know whether providePIN() or provideOldPIN() is called first.
+//   */
+//  class SoftwarePinProvider implements PINProvider {
+//
+//    private PINManagementGUIFacade.DIALOG type;
+//    private boolean retry = false;
+//
+//    private char[] newPin;
+//    private char[] oldPin;
+//
+//    public SoftwarePinProvider(DIALOG type) {
+//      this.type = type;
+//    }
+//
+//    @Override
+//    public char[] providePIN(PINSpec spec, int retries)
+//            throws CancelledException, InterruptedException {
+//      if (newPin == null) {
+//        getPINs(spec, retries);
+//      }
+//      char[] pin = newPin;
+//      newPin = null;
+//      return pin;
+//    }
+//
+//    @Override
+//    public char[] provideOldPIN(PINSpec spec, int retries)
+//            throws CancelledException, InterruptedException {
+//      if (oldPin == null) {
+//        getPINs(spec, retries);
+//      }
+//      char[] pin = oldPin;
+//      oldPin = null;
+//      return pin;
+//    }
+//
+//    private void getPINs(PINSpec spec, int retries)
+//            throws InterruptedException, CancelledException {
+//      PINManagementGUIFacade gui =
+//              (PINManagementGUIFacade) PINManagementRequestHandler.this.gui;
+//
+//      if (retry) {
+//        gui.showPINDialog(type, spec, retries,
+//              PINManagementRequestHandler.this, "exec",
+//              PINManagementRequestHandler.this, "back");
+//      } else {
+//        gui.showPINDialog(type, spec,
+//              PINManagementRequestHandler.this, "exec",
+//              PINManagementRequestHandler.this, "back");
+//      }
+//      waitForAction();
+//
+//      if (actionCommand.equals("exec")) {
+//        gui.showWaitDialog(null);
+//        retry = true;
+//        oldPin = gui.getOldPin();
+//        newPin = gui.getPin();
+//      } else if (actionCommand.equals("back")) {
+//        throw new CancelledException();
+//      } else {
+//        log.error("unsupported command " + actionCommand);
+//        throw new CancelledException();
+//      }
+//    }
+//  }
+//
+//
+//  class PinpadPinProvider implements PINProvider {
+//
+//    private PINManagementGUIFacade.DIALOG type;
+//    private boolean retry = false;
+//
+//    public PinpadPinProvider(DIALOG type) {
+//      this.type = type;
+//    }
+//
+//    @Override
+//    public char[] providePIN(PINSpec spec, int retries) {
+//      log.debug("provide pin for " + type);
+//      if (retry) {
+//        ((PINManagementGUIFacade) gui).showPinpadPINDialog(type, spec, retries);
+//      } else {
+//        ((PINManagementGUIFacade) gui).showPinpadPINDialog(type, spec, -1);
+//        retry = true;
+//      }
+//      return null;
+//    }
+//
+//    @Override
+//    public char[] provideOldPIN(PINSpec spec, int retries) {
+//      return null;
+//    }
+//  }
 }
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PinpadPINProviderFactory.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PinpadPINProviderFactory.java
new file mode 100644
index 00000000..4176e0a9
--- /dev/null
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PinpadPINProviderFactory.java
@@ -0,0 +1,126 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.smccstal.ext;
+
+import at.gv.egiz.smcc.ChangePINProvider;
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade.DIALOG;
+import at.gv.egiz.bku.smccstal.AbstractPINProvider;
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINProvider;
+import at.gv.egiz.smcc.PINSpec;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PinpadPINProviderFactory extends ManagementPINProviderFactory {
+
+  protected PinpadPINProviderFactory(PINManagementGUIFacade gui) {
+    this.gui = gui;
+  }
+
+  @Override
+  public PINProvider getVerifyPINProvider() {
+    return new SimplePinProvider(DIALOG.VERIFY);
+  }
+
+  @Override
+  public PINProvider getActivatePINProvider() {
+    return new SimplePinProvider(DIALOG.ACTIVATE);
+  }
+
+  @Override
+  public ChangePINProvider getChangePINProvider() {
+    return new SimplePinProvider(DIALOG.CHANGE);
+  }
+
+  @Override
+  public PINProvider getUnblockPINProvider() {
+    return new SimplePinProvider(DIALOG.UNBLOCK);
+  }
+
+
+  class SimplePinProvider extends AbstractPINProvider
+          implements ChangePINProvider {
+
+//    protected PINManagementGUIFacade gui;
+    protected PINManagementGUIFacade.DIALOG type;
+
+    private SimplePinProvider(PINManagementGUIFacade.DIALOG type) {
+      this.type = type;
+    }
+
+    @Override
+    public char[] providePIN(PINSpec spec, int retries)
+            throws CancelledException, InterruptedException {
+
+      showPinpadPINDialog(retries, spec);
+      retry = true;
+      return null;
+
+//      gui.showPINDialog(type, spec, (retry) ? retries : -1,
+//              this, "exec",
+//              this, "back");
+//
+//      waitForAction();
+//
+//      if ("exec".equals(action)) {
+//        gui.showWaitDialog(null);
+//        retry = true;
+//        return gui.getPin();
+//      } else if ("back".equals(action)) {
+//        throw new CancelledException();
+//      } else {
+//        log.error("unsupported command " + action);
+//        throw new CancelledException();
+//      }
+    }
+
+    /**
+     * do not call this method without calling providePIN()
+     * (no message is displayed)
+     * @param spec
+     * @param retries
+     * @return
+     */
+    @Override
+    public char[] provideOldPIN(PINSpec spec, int retries) {
+      return null;
+    }
+
+    private void showPinpadPINDialog(int retries, PINSpec pinSpec) {
+      String title, message;
+      Object[] params;
+      if (retry) {
+        title = BKUGUIFacade.TITLE_RETRY;
+        message = BKUGUIFacade.MESSAGE_RETRIES;
+        params = new Object[]{String.valueOf(retries)};
+      } else {
+        title = BKUGUIFacade.TITLE_SIGN;
+        message = BKUGUIFacade.MESSAGE_ENTERPIN_PINPAD;
+        String pinSize = String.valueOf(pinSpec.getMinLength());
+        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+          pinSize += "-" + pinSpec.getMaxLength();
+        }
+        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
+      }
+      gui.showMessageDialog(title, message, params);
+    }
+  }
+}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/SoftwarePINProviderFactory.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/SoftwarePINProviderFactory.java
new file mode 100644
index 00000000..e87512d0
--- /dev/null
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/SoftwarePINProviderFactory.java
@@ -0,0 +1,148 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.smccstal.ext;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.smcc.ChangePINProvider;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade.DIALOG;
+import at.gv.egiz.bku.smccstal.AbstractPINProvider;
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINProvider;
+import at.gv.egiz.smcc.PINSpec;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class SoftwarePINProviderFactory extends ManagementPINProviderFactory {
+
+  protected SoftwarePINProviderFactory(PINManagementGUIFacade gui) {
+    this.gui = gui;
+  }
+
+  @Override
+  public PINProvider getVerifyPINProvider() {
+    return new SimplePinProvider(DIALOG.VERIFY);
+  }
+
+  @Override
+  public PINProvider getActivatePINProvider() {
+    return new SimplePinProvider(DIALOG.ACTIVATE);
+  }
+
+  @Override
+  public ChangePINProvider getChangePINProvider() {
+    return new ChangePinProvider();
+  }
+
+  @Override
+  public PINProvider getUnblockPINProvider() {
+    return new SimplePinProvider(DIALOG.UNBLOCK);
+  }
+
+  class SimplePinProvider extends AbstractPINProvider {
+
+//    protected PINManagementGUIFacade gui;
+    protected PINManagementGUIFacade.DIALOG type;
+
+    private SimplePinProvider(DIALOG type) {
+      this.type = type;
+    }
+
+    @Override
+    public char[] providePIN(PINSpec spec, int retries)
+            throws CancelledException, InterruptedException {
+
+      gui.showPINDialog(type, spec, (retry) ? retries : -1,
+              this, "exec",
+              this, "back");
+
+      waitForAction();
+
+      if ("exec".equals(action)) {
+        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                BKUGUIFacade.MESSAGE_WAIT);
+        retry = true;
+        return gui.getPin();
+      } else if ("back".equals(action)) {
+        throw new CancelledException();
+      } else {
+        log.error("unsupported command " + action);
+        throw new CancelledException();
+      }
+    }
+  }
+
+  class ChangePinProvider extends AbstractPINProvider
+          implements ChangePINProvider {
+
+//    protected PINManagementGUIFacade gui;
+
+    private char[] oldPin;
+    private char[] newPin;
+
+    private ChangePinProvider() {
+    }
+
+    @Override
+    public char[] providePIN(PINSpec spec, int retries)
+            throws CancelledException, InterruptedException {
+      if (newPin == null) {
+        getPINs(spec, retries);
+      }
+      char[] pin = newPin;
+      newPin = null;
+      return pin;
+    }
+
+    @Override
+    public char[] provideOldPIN(PINSpec spec, int retries)
+            throws CancelledException, InterruptedException {
+      if (oldPin == null) {
+        getPINs(spec, retries);
+      }
+      char[] pin = oldPin;
+      oldPin = null;
+      return pin;
+    }
+
+    private void getPINs(PINSpec spec, int retries)
+            throws InterruptedException, CancelledException {
+
+      gui.showPINDialog(PINManagementGUIFacade.DIALOG.CHANGE, spec,
+              (retry) ? retries : -1,
+              this, "exec",
+              this, "back");
+
+      waitForAction();
+
+      if ("exec".equals(action)) {
+        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                BKUGUIFacade.MESSAGE_WAIT);
+        retry = true;
+        oldPin = gui.getOldPin();
+        newPin = gui.getPin();
+      } else if ("back".equals(action)) {
+        throw new CancelledException();
+      } else {
+        log.error("unsupported command " + action);
+        throw new CancelledException();
+      }
+    }
+  }
+}
diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
index 69d231f7..4ceacb21 100644
--- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
+++ b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
@@ -22,13 +22,16 @@ title.verify.pin=<html>PIN Eingeben</html>
 title.activate.success=<html>Erfolg</html>
 title.change.success=<html>Erfolg</html>
 
-message.pin.mgmt=<html>Die Karte verf\u00FCgt \u00FCber {0} PINs</html>
-message.activate.pin=<html>{0} eingeben und best\u00E4tigen</html>
-message.change.pin=<html>{0} eingeben und best\u00E4tigen</html>
-message.unblock.pin=<html>PUK zu {0} eingeben</html>
-message.verify.pin=<html>{0} eingeben (TODO: Warning not activated)</html>
-message.activate.success=<html>{0} wurde erfolgreich aktiviert.</html>
-message.change.success=<html>{0} wurde erfolgreich ge\u00E4ndert.</html>
+# removed message.* prefix to reuse keys as help keys
+pin.mgmt=<html>Die Karte verf\u00FCgt \u00FCber {0} PINs</html>
+pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben und best\u00E4tigen.</html>
+pinpad.change=<html>{0} ({1} stellig) am Kartenleser eingeben und best\u00E4tigen.</html>
+activate.pin=<html>{0} eingeben und best\u00E4tigen</html>
+change.pin=<html>{0} eingeben und best\u00E4tigen</html>
+unblock.pin=<html>PUK zu {0} eingeben</html>
+verify.pin=<html>{0} eingeben (TODO: Warning not activated)</html>
+activate.success=<html>{0} wurde erfolgreich aktiviert.</html>
+change.success=<html>{0} wurde erfolgreich ge\u00E4ndert.</html>
 
 label.activation=<html>e-card Aktivierungsprozess</html>
 label.activation.step=<html>Schritt {0}</html>
diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
index 920f7d5b..9178d65c 100644
--- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
+++ b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
@@ -21,12 +21,15 @@ title.unblock.pin=<html>Unblock PIN</html>
 title.activate.success=<html>Success</html>
 title.change.success=<html>Success</html>
 
-message.pin.mgmt=<html>The smartcard has {0} PINs</html>
-message.activate.pin=<html>Enter and confirm {0}</html>
-message.change.pin=<html>Enter and confirm {0}</html>
-message.unblock.pin=<html>Enter PUK for {0}</html>
-message.activate.success=<html>{0} successfully activated</html>
-message.change.success=<html>{0} successfully changed</html>
+# removed message.* prefix to reuse keys as help keys
+pin.mgmt=<html>The smartcard has {0} PINs</html>
+pinpad=<html>Enter {0} ({1} digits) on pinpad and confirm.</html>
+pinpad.change=<html>Enter {0} ({1} digits) on pinpad and confirm.</html>
+activate.pin=<html>Enter and confirm {0}</html>
+change.pin=<html>Enter and confirm {0}</html>
+unblock.pin=<html>Enter PUK for {0}</html>
+activate.success=<html>{0} successfully activated</html>
+change.success=<html>{0} successfully changed</html>
 
 label.activation=<html>e-card activation process</html>
 label.activation.step=<html>Step {0}</html>
diff --git a/BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java b/BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
index ef8c87e4..b01abe72 100644
--- a/BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
+++ b/BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
@@ -74,7 +74,7 @@ public class BKUGUIWorker implements Runnable {
 
           @Override
           public void actionPerformed(ActionEvent e) {
-            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", null, "hashdata");
+            gui.showSignaturePINDialog(signPinSpec, -1, signListener, "sign", cancelListener, "cancel", null, "hashdata");
           }
         };
         HashDataInput signedRef1 = new ByteArrayHashDataInput(
@@ -112,7 +112,7 @@ public class BKUGUIWorker implements Runnable {
 //                    signedRefs.add(signedRef4);
 //                    signedRefs.add(signedRef4);
 //                    signedRefs = Collections.singletonList(signedRef1);
-        gui.showHashDataInputDialog(signedRefs, returnListener, "return");
+        gui.showSecureViewer(signedRefs, returnListener, "return");
       }
     };
 
diff --git a/BKUAppletExt/src/test/java/at/gv/egiz/bku/smccstal/ext/FileSystemTest.java b/BKUAppletExt/src/test/java/at/gv/egiz/bku/smccstal/ext/FileSystemTest.java
deleted file mode 100644
index 5fa3cbd7..00000000
--- a/BKUAppletExt/src/test/java/at/gv/egiz/bku/smccstal/ext/FileSystemTest.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.smccstal.ext;
-
-import at.gv.egiz.smcc.FileNotFoundException;
-import at.gv.egiz.smcc.LockedException;
-import at.gv.egiz.smcc.NotActivatedException;
-import at.gv.egiz.smcc.PINProvider;
-import at.gv.egiz.smcc.PINSpec;
-import at.gv.egiz.smcc.SignatureCard;
-import at.gv.egiz.smcc.SignatureCardException;
-import at.gv.egiz.smcc.util.SMCCHelper;
-import at.gv.egiz.smcc.util.SmartCardIO;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.Map;
-import javax.smartcardio.Card;
-import javax.smartcardio.CardChannel;
-import javax.smartcardio.CardException;
-import javax.smartcardio.CardTerminal;
-import javax.smartcardio.CommandAPDU;
-import javax.smartcardio.ResponseAPDU;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-@Ignore
-public class FileSystemTest {
-
-  /** asign premium */
-  public static final byte[] AID_DEC = new byte[] { (byte) 0xA0, (byte) 0x00,
-      (byte) 0x00, (byte) 0x01, (byte) 0x18, (byte) 0x45, (byte) 0x4E };
-  
-  @Test
-//  @Ignore
-  public void testCard() throws CardException, SignatureCardException, InterruptedException {
-
-    SMCCHelper smccHelper = new SMCCHelper();
-    switch (smccHelper.getResultCode()) {
-      case SMCCHelper.CARD_FOUND:
-        System.out.println("card found ");
-    }
-    SignatureCard signatureCard = smccHelper.getSignatureCard(new Locale("de"));
-    Card card = signatureCard.getCard();
-
-//    SmartCardIO scIO = new SmartCardIO();
-//    Map<CardTerminal, Card> terminalCardMap = scIO.getCards();
-//
-//    for (CardTerminal ct : terminalCardMap.keySet()) {
-//      Card card = terminalCardMap.get(ct);
-//      System.out.println("found card (" + ct.getName() + "): " + Formatter.byteArrayToHexString(card.getATR().getBytes()));
-
-    System.out.println("found card " + Formatter.byteArrayToHexString(card.getATR().getBytes()));
-
-    CardChannel cardchannel;
-
-    //RESET
-    System.out.println("RESET");
-    signatureCard.reset();
-    card = signatureCard.getCard();
-//      card.disconnect(true);
-//      card = ct.connect("*");
-
-    System.out.println("begin exclusive");
-    card.beginExclusive();
-    System.out.println("get cardchannel");
-    cardchannel = card.getBasicChannel();
-
-    testECard(cardchannel, signatureCard, card);
-//    testASignPremium(cardchannel, signatureCard, card);
-
-//    }
-
-  }
-
-  public static class TestCard {
-
-    protected CardChannel channel;
-    protected int ifs_ = 254;
-
-    public TestCard(CardChannel channel) {
-      this.channel = channel;
-    }
-
-    protected byte[] readTLVFile(byte[] aid, byte[] ef, String pin, byte kid, int maxLength)
-            throws SignatureCardException, InterruptedException, CardException {
-
-
-      // SELECT FILE (AID)
-      selectFileAID(aid);
-
-      // SELECT FILE (EF)
-      ResponseAPDU resp = selectFileFID(ef);
-      if (resp.getSW() == 0x6a82) {
-        // EF not found
-        throw new FileNotFoundException("EF " + toString(ef) + " not found.");
-      } else if (resp.getSW() != 0x9000) {
-        throw new SignatureCardException("SELECT FILE with " + "FID=" + toString(ef) + " failed (" + "SW=" + Integer.toHexString(resp.getSW()) + ").");
-      }
-
-      // VERIFY
-      if (pin != null) {
-        int retries = verifyPIN(pin, kid);
-        if (retries != -1) {
-          throw new at.gv.egiz.smcc.VerificationFailedException(retries);
-        }
-      }
-
-      return readBinaryTLV(maxLength, (byte) 0x30);
-    }
-
-    protected byte[] readBinary(CardChannel channel, int offset, int len)
-            throws CardException, SignatureCardException {
-
-      //transmit(channel,apdu)
-      ResponseAPDU resp = channel.transmit(new CommandAPDU(0x00, 0xB0,
-              0x7F & (offset >> 8), offset & 0xFF, len));
-      if (resp.getSW() == 0x9000) {
-        return resp.getData();
-      } else if (resp.getSW() == 0x6982) {
-        throw new at.gv.egiz.smcc.SecurityStatusNotSatisfiedException();
-      } else {
-        throw new SignatureCardException("Failed to read bytes (" + offset + "+" + len + "): SW=" + Integer.toHexString(resp.getSW()));
-      }
-
-    }
-
-    protected byte[] readBinaryTLV(int maxSize, byte expectedType) throws CardException,
-            SignatureCardException {
-
-//      CardChannel channel = getCardChannel();
-
-      // read first chunk
-      int len = Math.min(maxSize, ifs_);
-      byte[] chunk = readBinary(channel, 0, len);
-      if (chunk.length > 0 && chunk[0] != expectedType) {
-        return null;
-      }
-      int offset = chunk.length;
-      int actualSize = maxSize;
-      if (chunk.length > 3) {
-        if ((chunk[1] & 0x80) > 0) {
-          int octets = (0x0F & chunk[1]);
-          actualSize = 2 + octets;
-          for (int i = 1; i <= octets; i++) {
-            actualSize += (0xFF & chunk[i + 1]) << ((octets - i) * 8);
-          }
-        } else {
-          actualSize = 2 + chunk[1];
-        }
-      }
-      ByteBuffer buffer = ByteBuffer.allocate(actualSize);
-      buffer.put(chunk, 0, Math.min(actualSize, chunk.length));
-      while (offset < actualSize) {
-        len = Math.min(ifs_, actualSize - offset);
-        chunk = readBinary(channel, offset, len);
-        buffer.put(chunk);
-        offset += chunk.length;
-      }
-      return buffer.array();
-
-    }
-
-    protected byte[] selectFileAID(byte[] dfName) throws CardException, SignatureCardException {
-//      CardChannel channel = getCardChannel();
-      ResponseAPDU resp = channel.transmit(new CommandAPDU(0x00, 0xA4, 0x04,
-              0x00, dfName, 256));
-      if (resp.getSW() != 0x9000) {
-        throw new SignatureCardException("Failed to select application AID=" + toString(dfName) + ": SW=" + Integer.toHexString(resp.getSW()) + ".");
-      } else {
-        return resp.getBytes();
-      }
-    }
-
-    protected ResponseAPDU selectFileFID(byte[] fid) throws CardException, SignatureCardException {
-//      CardChannel channel = getCardChannel();
-      return channel.transmit(new CommandAPDU(0x00, 0xA4, 0x02,
-              0x04, fid, 256));
-    }
-
-    protected String toString(byte[] b) {
-      StringBuffer sb = new StringBuffer();
-      if (b != null && b.length > 0) {
-        sb.append(Integer.toHexString((b[0] & 240) >> 4));
-        sb.append(Integer.toHexString(b[0] & 15));
-      }
-      for (int i = 1; i < b.length; i++) {
-        sb.append(':');
-        sb.append(Integer.toHexString((b[i] & 240) >> 4));
-        sb.append(Integer.toHexString(b[i] & 15));
-      }
-      return sb.toString();
-    }
-
-    protected int verifyPIN(String pin, byte kid) throws CardException, SignatureCardException {
-
-//      CardChannel channel = getCardChannel();
-
-      ResponseAPDU resp;
-      if (pin == null) {
-        //
-        resp = channel.transmit(new CommandAPDU(0x00, 0x20, 0x00, kid));
-      } else {
-        // PIN length in bytes
-        int len = (int) Math.ceil(pin.length() / 2);
-
-        // BCD encode PIN and marshal PIN block
-        byte[] pinBytes = new BigInteger(pin, 16).toByteArray();
-        byte[] pinBlock = new byte[8];
-        if (len < pinBytes.length) {
-          System.arraycopy(pinBytes, pinBytes.length - len, pinBlock, 1, len);
-        } else {
-          System.arraycopy(pinBytes, 0, pinBlock, len - pinBytes.length + 1,
-                  pinBytes.length);
-        }
-        pinBlock[0] = (byte) (0x20 + len * 2);
-        Arrays.fill(pinBlock, len + 1, 8, (byte) 0xff);
-
-        resp = channel.transmit(new CommandAPDU(0x00, 0x20, 0x00, kid, pinBlock));//, false);
-
-      }
-
-      if (resp.getSW() == 0x63c0) {
-        throw new LockedException("PIN locked.");
-      } else if (resp.getSW1() == 0x63 && resp.getSW2() >> 4 == 0xc) {
-        // return number of possible retries
-        return resp.getSW2() & 0x0f;
-      } else if (resp.getSW() == 0x6983) {
-        throw new LockedException();
-      } else if (resp.getSW() == 0x6984) {
-        // PIN LCS = "Initialized" (-> not activated)
-        throw new NotActivatedException("PIN not set.");
-      } else if (resp.getSW() == 0x9000) {
-        return -1; // success
-      } else {
-        throw new SignatureCardException("Failed to verify pin: SW=" + Integer.toHexString(resp.getSW()));
-      }
-    }
-  }
-
-  public static class Formatter {
-
-    private static String[] alphabet = {"0", "1", "2",
-      "3", "4", "5", "6", "7", "8",
-      "9", "A", "B", "C", "D", "E",
-      "F"};
-
-    public static String byteArrayToHexString(byte[] bytes) {
-
-      if (bytes == null || bytes.length <= 0) {
-        return null;
-      }
-
-      StringBuffer buf = new StringBuffer(2 * bytes.length);
-
-      byte c = 0x00;
-
-      for (int i = 0; i < bytes.length; i++) {
-
-        // high nibble
-        c = (byte) (bytes[i] & 0xf0);
-
-        // shift down
-        c = (byte) (c >>> 4);
-
-        // cut high order bits
-        c = (byte) (c & 0x0f);
-
-        buf.append(alphabet[(int) c]);
-
-        // low nibble
-        c = (byte) (bytes[i] & 0x0f);
-
-        buf.append(alphabet[(int) c]);
-        if (i < bytes.length - 1) {
-          buf.append(':');
-        }
-      }
-
-      return buf.toString();
-
-    }
-  }
-
-  protected void testASignPremium(CardChannel cardchannel, SignatureCard signatureCard, Card card) throws CardException {
-    byte[] selectMF = new byte[]{(byte) 0x00, (byte) 0xA4, (byte) 0x00, (byte) 0x0C, (byte) 0x02, (byte) 0x3F, (byte) 0x00};
-    byte[] selectDF_DEC = new byte[] { (byte) 0x00, (byte) 0xA4, (byte) 0x00, (byte) 0x0C, (byte) 0x02, (byte) 0xdf, (byte) 0x71 };
-    byte[] selectAID_DEC = new byte[] { (byte) 0x00, (byte) 0xA4, (byte) 0x04, (byte) 0x00, (byte) 0x07, (byte) 0xA0, (byte) 0x00,
-      (byte) 0x00, (byte) 0x01, (byte) 0x18, (byte) 0x45, (byte) 0x4E  };
-
-    CommandAPDU cAPDU;
-    ResponseAPDU rAPDU;
-    byte[] sw;
-
-    cAPDU = new CommandAPDU(selectMF);
-    rAPDU = cardchannel.transmit(cAPDU);
-    sw = new byte[]{(byte) (0xFF & rAPDU.getSW1()), (byte) (0xFF & rAPDU.getSW2())};
-    System.out.println("cAPDU: " + Formatter.byteArrayToHexString(cAPDU.getBytes()));
-    System.out.println("rAPDU (sw=" + Formatter.byteArrayToHexString(sw) + "): " + Formatter.byteArrayToHexString(rAPDU.getData()));
-
-    cAPDU = new CommandAPDU(selectAID_DEC);
-    rAPDU = cardchannel.transmit(cAPDU);
-    sw = new byte[]{(byte) (0xFF & rAPDU.getSW1()), (byte) (0xFF & rAPDU.getSW2())};
-    System.out.println("cAPDU: " + Formatter.byteArrayToHexString(cAPDU.getBytes()));
-    System.out.println("rAPDU (sw=" + Formatter.byteArrayToHexString(sw) + "): " + Formatter.byteArrayToHexString(rAPDU.getData()));
-
-    cAPDU = new CommandAPDU(selectDF_DEC);
-    rAPDU = cardchannel.transmit(cAPDU);
-    sw = new byte[]{(byte) (0xFF & rAPDU.getSW1()), (byte) (0xFF & rAPDU.getSW2())};
-    System.out.println("cAPDU: " + Formatter.byteArrayToHexString(cAPDU.getBytes()));
-    System.out.println("rAPDU (sw=" + Formatter.byteArrayToHexString(sw) + "): " + Formatter.byteArrayToHexString(rAPDU.getData()));
-
-
-  }
-
-  protected void testECard(CardChannel cardchannel, SignatureCard signatureCard, Card card) throws CardException, InterruptedException, SignatureCardException {
-//      if (cardTerminal != null) {
-//        card_ = cardTerminal.connect("*");
-//      }
-    byte[] selectMF = new byte[]{(byte) 0x00, (byte) 0xA4, (byte) 0x00, (byte) 0x0C, (byte) 0x02, (byte) 0x3F, (byte) 0x00};
-    byte[] readEF_GDO = new byte[]{(byte) 0x00, (byte) 0xB0, (byte) 0x82, (byte) 0x00, (byte) 0x00};
-    CommandAPDU cAPDU;
-    ResponseAPDU rAPDU;
-    byte[] sw;
-    cAPDU = new CommandAPDU(selectMF);
-    rAPDU = cardchannel.transmit(cAPDU);
-    sw = new byte[]{(byte) (0xFF & rAPDU.getSW1()), (byte) (0xFF & rAPDU.getSW2())};
-    System.out.println("cAPDU: " + Formatter.byteArrayToHexString(cAPDU.getBytes()));
-    System.out.println("rAPDU (sw=" + Formatter.byteArrayToHexString(sw) + "): " + Formatter.byteArrayToHexString(rAPDU.getData()));
-    cAPDU = new CommandAPDU(readEF_GDO);
-    rAPDU = cardchannel.transmit(cAPDU);
-    sw = new byte[]{(byte) (0xFF & rAPDU.getSW1()), (byte) (0xFF & rAPDU.getSW2())};
-    System.out.println("cAPDU: " + Formatter.byteArrayToHexString(cAPDU.getBytes()));
-    System.out.println("rAPDU (sw=" + Formatter.byteArrayToHexString(sw) + "): " + Formatter.byteArrayToHexString(rAPDU.getData()));
-    byte[] EF_GDO = rAPDU.getData();
-    //RESET
-    System.out.println("RESET");
-    signatureCard.reset();
-    card = signatureCard.getCard();
-//      card.disconnect(true);
-//      card = ct.connect("*");
-    System.out.println("begin exclusive");
-    card.beginExclusive();
-    System.out.println("get cardchannel");
-    cardchannel = card.getBasicChannel();
-    byte[] getCLC = new byte[]{(byte) 0x00, (byte) 0xCA, (byte) 0xDF, (byte) 0x20, (byte) 0x00};
-    byte[] verifyKartenPIN = new byte[]{(byte) 0x00, (byte) 0x20, (byte) 0x00, (byte) 0x01};
-    byte[] selectDF_SichereSignatur = new byte[]{(byte) 0x00, (byte) 0xA4, (byte) 0x04, (byte) 0x00, (byte) 0x08, (byte) 0xD0, (byte) 0x40, (byte) 0x00, (byte) 0x00, (byte) 0x17, (byte) 0x00, (byte) 0x12, (byte) 0x01, (byte) 0x00};
-    byte[] verifySignaturPIN = new byte[]{(byte) 0x00, (byte) 0x20, (byte) 0x00, (byte) 0x81};
-    cAPDU = new CommandAPDU(getCLC);
-    rAPDU = cardchannel.transmit(cAPDU);
-    sw = new byte[]{(byte) (0xFF & rAPDU.getSW1()), (byte) (0xFF & rAPDU.getSW2())};
-    System.out.println("cAPDU: " + Formatter.byteArrayToHexString(cAPDU.getBytes()));
-    System.out.println("rAPDU (sw=" + Formatter.byteArrayToHexString(sw) + "): " + Formatter.byteArrayToHexString(rAPDU.getData()));
-    byte[] clc = rAPDU.getData();
-    cAPDU = new CommandAPDU(verifyKartenPIN);
-    rAPDU = cardchannel.transmit(cAPDU);
-    sw = new byte[]{(byte) (0xFF & rAPDU.getSW1()), (byte) (0xFF & rAPDU.getSW2())};
-    System.out.println("cAPDU: " + Formatter.byteArrayToHexString(cAPDU.getBytes()));
-    System.out.println("rAPDU (sw=" + Formatter.byteArrayToHexString(sw) + "): " + Formatter.byteArrayToHexString(rAPDU.getData()));
-    cAPDU = new CommandAPDU(selectDF_SichereSignatur);
-    rAPDU = cardchannel.transmit(cAPDU);
-    sw = new byte[]{(byte) (0xFF & rAPDU.getSW1()), (byte) (0xFF & rAPDU.getSW2())};
-    System.out.println("cAPDU: " + Formatter.byteArrayToHexString(cAPDU.getBytes()));
-    System.out.println("rAPDU (sw=" + Formatter.byteArrayToHexString(sw) + "): " + Formatter.byteArrayToHexString(rAPDU.getData()));
-    cAPDU = new CommandAPDU(verifySignaturPIN);
-    rAPDU = cardchannel.transmit(cAPDU);
-    sw = new byte[]{(byte) (0xFF & rAPDU.getSW1()), (byte) (0xFF & rAPDU.getSW2())};
-    System.out.println("cAPDU: " + Formatter.byteArrayToHexString(cAPDU.getBytes()));
-    System.out.println("rAPDU (sw=" + Formatter.byteArrayToHexString(sw) + "): " + Formatter.byteArrayToHexString(rAPDU.getData()));
-    //RESET
-    System.out.println("RESET");
-    signatureCard.reset();
-    card = signatureCard.getCard();
-    System.out.println("InfoboxReadRequests...");
-    PINProvider pinProvider = new PINProvider() {
-
-      @Override
-      public String providePIN(PINSpec spec, int retries) throws InterruptedException {
-        if (retries >= 3) {
-          return "2540";
-        } else {
-          throw new InterruptedException("TOO FEW PIN RETRIES LEFT, ABORTING");
-        }
-      }
-    };
-    byte[] ehic = signatureCard.getInfobox("EHIC", pinProvider, null);
-    System.out.println("EHIC: " + Formatter.byteArrayToHexString(ehic));
-    byte[] grunddaten = signatureCard.getInfobox("Grunddaten", pinProvider, null);
-    System.out.println("Grunddaten: " + Formatter.byteArrayToHexString(grunddaten));
-    //RESET
-    System.out.println("RESET");
-    signatureCard.reset();
-    card = signatureCard.getCard();
-//      card.disconnect(true);
-//      card = ct.connect("*");
-    System.out.println("begin exclusive");
-    card.beginExclusive();
-    System.out.println("get cardchannel");
-    cardchannel = card.getBasicChannel();
-    cAPDU = new CommandAPDU(getCLC);
-    rAPDU = cardchannel.transmit(cAPDU);
-    sw = new byte[]{(byte) (0xFF & rAPDU.getSW1()), (byte) (0xFF & rAPDU.getSW2())};
-    System.out.println("cAPDU: " + Formatter.byteArrayToHexString(cAPDU.getBytes()));
-    System.out.println("rAPDU (sw=" + Formatter.byteArrayToHexString(sw) + "): " + Formatter.byteArrayToHexString(rAPDU.getData()));
-    assertTrue(Arrays.equals(clc, rAPDU.getData()));
-    cAPDU = new CommandAPDU(readEF_GDO);
-    rAPDU = cardchannel.transmit(cAPDU);
-    sw = new byte[]{(byte) (0xFF & rAPDU.getSW1()), (byte) (0xFF & rAPDU.getSW2())};
-    System.out.println("cAPDU: " + Formatter.byteArrayToHexString(cAPDU.getBytes()));
-    System.out.println("rAPDU (sw=" + Formatter.byteArrayToHexString(sw) + "): " + Formatter.byteArrayToHexString(rAPDU.getData()));
-    assertTrue(Arrays.equals(EF_GDO, rAPDU.getData()));
-//    }
-  }
-}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index be5e3fc8..1043b6a1 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -36,6 +36,7 @@ public interface BKUGUIFacade {
   public static final String ERR_INVALID_HASH = "error.invalid.hash";
   public static final String ERR_CARD_LOCKED = "error.card.locked";
   public static final String ERR_CARD_NOTACTIVATED = "error.card.notactivated";
+  public static final String ERR_PIN_TIMEOUT = "error.pin.timeout";
   public static final String ERR_VIEWER = "error.viewer";
   public static final String ERR_EXTERNAL_LINK = "error.external.link";
   public static final String ERR_CONFIG = "error.config";
@@ -52,6 +53,7 @@ public interface BKUGUIFacade {
   public static final String TITLE_CARDPIN = "title.cardpin";
   public static final String TITLE_SIGN = "title.sign";
   public static final String TITLE_ERROR = "title.error";
+  public static final String TITLE_ENTRY_TIMEOUT = "title.entry.timeout";
   public static final String TITLE_RETRY = "title.retry";
   public static final String TITLE_WAIT = "title.wait";
   public static final String TITLE_HASHDATA = "title.hashdata";
@@ -60,17 +62,22 @@ public interface BKUGUIFacade {
   public static final String WINDOWTITLE_OVERWRITE = "windowtitle.overwrite";
   public static final String WINDOWTITLE_VIEWER = "windowtitle.viewer";
   public static final String WINDOWTITLE_HELP = "windowtitle.help";
-  public static final String MESSAGE_WAIT = "message.wait";
-  public static final String MESSAGE_INSERTCARD = "message.insertcard";
-  public static final String MESSAGE_ENTERPIN = "message.enterpin";
-  public static final String MESSAGE_HASHDATALINK = "message.hashdatalink";
-  public static final String MESSAGE_HASHDATALINK_TINY = "message.hashdatalink.tiny";
-//  public static final String MESSAGE_HASHDATA = "message.hashdata";
-  public static final String MESSAGE_HASHDATALIST = "message.hashdatalist";
-  public static final String MESSAGE_RETRIES = "message.retries";
-  public static final String MESSAGE_LAST_RETRY = "message.retries.last";
-  public static final String MESSAGE_OVERWRITE = "message.overwrite";
-  public static final String MESSAGE_HELP = "message.help";
+
+  // removed message.* prefix to reuse keys as help keys
+  public static final String MESSAGE_WELCOME = "welcome";
+  public static final String MESSAGE_WAIT = "wait";
+  public static final String MESSAGE_INSERTCARD = "insertcard";
+  public static final String MESSAGE_CARD_NOT_SUPPORTED = "cardnotsupported";
+  public static final String MESSAGE_ENTERPIN = "enterpin";
+  public static final String MESSAGE_ENTERPIN_PINPAD = "enterpin.pinpad";
+  public static final String MESSAGE_HASHDATALINK = "hashdatalink";
+  public static final String MESSAGE_HASHDATALINK_TINY = "hashdatalink.tiny";
+  public static final String MESSAGE_HASHDATALIST = "hashdatalist";
+  public static final String MESSAGE_RETRIES = "retries";
+  public static final String MESSAGE_LAST_RETRY = "retries.last";
+  public static final String MESSAGE_OVERWRITE = "overwrite";
+  public static final String MESSAGE_HELP = "help";
+
   public static final String WARNING_XHTML = "warning.xhtml";
   public static final String LABEL_PIN = "label.pin";
   public static final String LABEL_PINSIZE = "label.pinsize";
@@ -103,33 +110,48 @@ public interface BKUGUIFacade {
    */
   public Locale getLocale();
 
-  public void showWelcomeDialog();
+//  public void showWelcomeDialog();
 
   /**
    * 
    * @param waitMessage if null, a simple 'please wait' text is displayed
    */
-  public void showWaitDialog(String waitMessage);
+//  public void showWaitDialog(String waitMessage);
+
+//  public void showInsertCardDialog(ActionListener cancelListener, String actionCommand);
 
-  public void showInsertCardDialog(ActionListener cancelListener, String actionCommand);
+//  public void showCardNotSupportedDialog(ActionListener cancelListener, String actionCommand);
 
-  public void showCardNotSupportedDialog(ActionListener cancelListener, String actionCommand);
+  public void showCardPINDialog(PINSpec pinSpec, int numRetries,
+          ActionListener okListener, String okCommand,
+          ActionListener cancelListener, String cancelCommand);
 
-  public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand);
+//  public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand);
 
-  public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand);
+  public void showSignaturePINDialog(PINSpec pinSpec, int numRetries, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand);
 
-  public void showSignaturePINDialog(PINSpec pinSpec, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand);
+//  public void showSignaturePINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand);
 
-  public void showSignaturePINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand);
+//  public void showPinpadSignaturePINDialog(PINSpec pinSpec, int retries);
 
   public char[] getPin();
 
-  public void showHashDataInputDialog(List<HashDataInput> signedReferences, ActionListener okListener, String okCommand);
+  public void showSecureViewer(List<HashDataInput> signedReferences,
+          ActionListener okListener, String okCommand);
 
-  public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams, ActionListener okListener, String okCommand);
+  public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams,
+          ActionListener okListener, String okCommand);
 
   public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams);
 
-  public void showMessageDialog(String titleKey, String msgKey, Object[] msgParams, ActionListener okListener, String okCommand);
+  public void showMessageDialog(String titleKey, 
+          String msgKey, Object[] msgParams,
+          String buttonKey,
+          ActionListener okListener, String okCommand);
+
+  public void showMessageDialog(String titleKey,
+          String msgKey, Object[] msgParams);
+
+  public void showMessageDialog(String titleKey,
+          String msgKey);
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 76b1d795..928be249 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -315,200 +315,204 @@ public class BKUGUIImpl implements BKUGUIFacade {
       return messages.containsKey(key);
     }
 
-    @Override
-    public void showWelcomeDialog() {
-      
-      log.debug("scheduling welcome dialog");
-      
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-              
-              log.debug("show welcome dialog");
-              
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                helpListener.setHelpTopic(HELP_WELCOME);
-                
-                JLabel welcomeMsgLabel = new JLabel();
-                welcomeMsgLabel.setFont(welcomeMsgLabel.getFont().deriveFont(welcomeMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                
-                if (renderHeaderPanel) {
-                  titleLabel.setText(getMessage(TITLE_WELCOME));
-                  welcomeMsgLabel.setText(getMessage(MESSAGE_WAIT));
-                } else {
-                  welcomeMsgLabel.setText(getMessage(TITLE_WELCOME));
-                }
-                
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
-                        .addComponent(welcomeMsgLabel);
-                GroupLayout.Group messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                        .addComponent(welcomeMsgLabel);
-                if (!renderHeaderPanel) {
-                  messageHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel); 
-                  messageVertical
-                          .addComponent(helpLabel);
-                }
-
-                mainPanelLayout.setHorizontalGroup(messageHorizontal);
-                mainPanelLayout.setVerticalGroup(messageVertical);
-                
-                contentPanel.validate();
-
-            }
-        });
-    }
-
-    @Override
-    public void showInsertCardDialog(final ActionListener cancelListener, final String cancelCommand) {
-      
-      log.debug("scheduling insert card dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-              
-              log.debug("show insert card dialog");
-      
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                if (renderHeaderPanel) {
-                  titleLabel.setText(getMessage(TITLE_INSERTCARD));
-                }
-                
-                helpListener.setHelpTopic(HELP_INSERTCARD);
-
-                JLabel insertCardMsgLabel = new JLabel();
-                insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                insertCardMsgLabel.setText(getMessage(MESSAGE_INSERTCARD));
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
-                        .addComponent(insertCardMsgLabel);
-                GroupLayout.ParallelGroup messageVertical = mainPanelLayout.createParallelGroup()
-                        .addComponent(insertCardMsgLabel);
-                
-                if (!renderHeaderPanel) {
-                  messageHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel);    
-                  messageVertical
-                          .addComponent(helpLabel);
-                }
-                
-                mainPanelLayout.setHorizontalGroup(messageHorizontal);
-                mainPanelLayout.setVerticalGroup(messageVertical);
-                
-                if (renderCancelButton) {
-                  JButton cancelButton = new JButton();
-                  cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                  cancelButton.setText(getMessage(BUTTON_CANCEL));
-                  cancelButton.addActionListener(cancelListener);
-                  cancelButton.setActionCommand(cancelCommand);
-
-                  GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                  buttonPanel.setLayout(buttonPanelLayout);
-
-                  buttonPanelLayout.setHorizontalGroup(
-                    buttonPanelLayout.createSequentialGroup()
-                          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-                  buttonPanelLayout.setVerticalGroup(
-                    buttonPanelLayout.createSequentialGroup()
-                      .addComponent(cancelButton));
-                }
-
-                contentPanel.validate();
-            }
-        });
-    }
+//    @Override
+//    public void showWelcomeDialog() {
+//
+//      log.debug("scheduling welcome dialog");
+//
+//        SwingUtilities.invokeLater(new Runnable() {
+//
+//            @Override
+//            public void run() {
+//
+//              log.debug("show welcome dialog");
+//
+//                mainPanel.removeAll();
+//                buttonPanel.removeAll();
+//
+//                helpListener.setHelpTopic(HELP_WELCOME);
+//
+//                JLabel welcomeMsgLabel = new JLabel();
+//                welcomeMsgLabel.setFont(welcomeMsgLabel.getFont().deriveFont(welcomeMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+//
+//                if (renderHeaderPanel) {
+//                  titleLabel.setText(getMessage(TITLE_WELCOME));
+//                  welcomeMsgLabel.setText(getMessage(MESSAGE_WAIT));
+//                } else {
+//                  welcomeMsgLabel.setText(getMessage(TITLE_WELCOME));
+//                }
+//
+//                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+//                mainPanel.setLayout(mainPanelLayout);
+//
+//                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
+//                        .addComponent(welcomeMsgLabel);
+//                GroupLayout.Group messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//                        .addComponent(welcomeMsgLabel);
+//                if (!renderHeaderPanel) {
+//                  messageHorizontal
+//                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+//                          .addComponent(helpLabel);
+//                  messageVertical
+//                          .addComponent(helpLabel);
+//                }
+//
+//                mainPanelLayout.setHorizontalGroup(messageHorizontal);
+//                mainPanelLayout.setVerticalGroup(messageVertical);
+//
+//                contentPanel.validate();
+//
+//            }
+//        });
+//    }
+
+//    @Override
+//    public void showInsertCardDialog(
+//            final ActionListener cancelListener, final String cancelCommand) {
+//
+//      log.debug("scheduling insert card dialog");
+//
+//      SwingUtilities.invokeLater(new Runnable() {
+//
+//            @Override
+//            public void run() {
+//
+//              log.debug("show insert card dialog");
+//
+//                mainPanel.removeAll();
+//                buttonPanel.removeAll();
+//
+//                if (renderHeaderPanel) {
+//                  titleLabel.setText(getMessage(TITLE_INSERTCARD));
+//                }
+//
+//                helpListener.setHelpTopic(HELP_INSERTCARD);
+//
+//                JLabel insertCardMsgLabel = new JLabel();
+//                insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+//                insertCardMsgLabel.setText(getMessage(MESSAGE_INSERTCARD));
+//
+//                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+//                mainPanel.setLayout(mainPanelLayout);
+//
+//                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
+//                        .addComponent(insertCardMsgLabel);
+//                GroupLayout.ParallelGroup messageVertical = mainPanelLayout.createParallelGroup()
+//                        .addComponent(insertCardMsgLabel);
+//
+//                if (!renderHeaderPanel) {
+//                  messageHorizontal
+//                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+//                          .addComponent(helpLabel);
+//                  messageVertical
+//                          .addComponent(helpLabel);
+//                }
+//
+//                mainPanelLayout.setHorizontalGroup(messageHorizontal);
+//                mainPanelLayout.setVerticalGroup(messageVertical);
+//
+//                if (renderCancelButton) {
+//                  JButton cancelButton = new JButton();
+//                  cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+//                  cancelButton.setText(getMessage(BUTTON_CANCEL));
+//                  cancelButton.addActionListener(cancelListener);
+//                  cancelButton.setActionCommand(cancelCommand);
+//
+//                  GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+//                  buttonPanel.setLayout(buttonPanelLayout);
+//
+//                  buttonPanelLayout.setHorizontalGroup(
+//                    buttonPanelLayout.createSequentialGroup()
+//                          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+//                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+//                  buttonPanelLayout.setVerticalGroup(
+//                    buttonPanelLayout.createSequentialGroup()
+//                      .addComponent(cancelButton));
+//                }
+//
+//                contentPanel.validate();
+//            }
+//        });
+//    }
 
     /**
      * only difference to showInsertCard: title text: card not supported
      * @param cancelListener
      * @param cancelCommand
      */
-    @Override
-    public void showCardNotSupportedDialog(final ActionListener cancelListener, final String cancelCommand) {
-        
-      log.debug("scheduling card not supported dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                
-              log.debug("show card not supported dialog");
-                
-              mainPanel.removeAll();
-              buttonPanel.removeAll();
-
-              JLabel insertCardMsgLabel = new JLabel();
-              insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-
-              if (renderHeaderPanel) {
-                titleLabel.setText(getMessage(TITLE_CARD_NOT_SUPPORTED));
-                insertCardMsgLabel.setText(getMessage(MESSAGE_INSERTCARD));
-              } else {
-                insertCardMsgLabel.setText(getMessage(TITLE_CARD_NOT_SUPPORTED));
-              }
-
-              helpListener.setHelpTopic(HELP_CARDNOTSUPPORTED);
-              
-              GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-              mainPanel.setLayout(mainPanelLayout);
-
-              GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
-                      .addComponent(insertCardMsgLabel);
-              GroupLayout.Group messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                      .addComponent(insertCardMsgLabel);
-              if (!renderHeaderPanel) {
-                messageHorizontal
-                        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                        .addComponent(helpLabel);
-                messageVertical
-                        .addComponent(helpLabel);
-              } 
-              
-              mainPanelLayout.setHorizontalGroup(messageHorizontal);
-              mainPanelLayout.setVerticalGroup(messageVertical);
-                
-              if (renderCancelButton) {
-                JButton cancelButton = new JButton();
-                cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                cancelButton.setText(getMessage(BUTTON_CANCEL));
-                cancelButton.addActionListener(cancelListener);
-                cancelButton.setActionCommand(cancelCommand);
-
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
-
-                buttonPanelLayout.setHorizontalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-                buttonPanelLayout.setVerticalGroup(
-                  buttonPanelLayout.createSequentialGroup()
-                    .addComponent(cancelButton));
-              }
-              
-              contentPanel.validate();
-            }
-        });
-    }
-
-    private void showCardPINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener okListener, final String okCommand, final ActionListener cancelListener, final String cancelCommand) {
+//    @Override
+//    public void showCardNotSupportedDialog(final ActionListener cancelListener, final String cancelCommand) {
+//
+//      log.debug("scheduling card not supported dialog");
+//
+//      SwingUtilities.invokeLater(new Runnable() {
+//
+//            @Override
+//            public void run() {
+//
+//              log.debug("show card not supported dialog");
+//
+//              mainPanel.removeAll();
+//              buttonPanel.removeAll();
+//
+//              JLabel insertCardMsgLabel = new JLabel();
+//              insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+//
+//              if (renderHeaderPanel) {
+//                titleLabel.setText(getMessage(TITLE_CARD_NOT_SUPPORTED));
+//                insertCardMsgLabel.setText(getMessage(MESSAGE_INSERTCARD));
+//              } else {
+//                insertCardMsgLabel.setText(getMessage(TITLE_CARD_NOT_SUPPORTED));
+//              }
+//
+//              helpListener.setHelpTopic(HELP_CARDNOTSUPPORTED);
+//
+//              GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+//              mainPanel.setLayout(mainPanelLayout);
+//
+//              GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
+//                      .addComponent(insertCardMsgLabel);
+//              GroupLayout.Group messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//                      .addComponent(insertCardMsgLabel);
+//              if (!renderHeaderPanel) {
+//                messageHorizontal
+//                        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+//                        .addComponent(helpLabel);
+//                messageVertical
+//                        .addComponent(helpLabel);
+//              }
+//
+//              mainPanelLayout.setHorizontalGroup(messageHorizontal);
+//              mainPanelLayout.setVerticalGroup(messageVertical);
+//
+//              if (renderCancelButton) {
+//                JButton cancelButton = new JButton();
+//                cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+//                cancelButton.setText(getMessage(BUTTON_CANCEL));
+//                cancelButton.addActionListener(cancelListener);
+//                cancelButton.setActionCommand(cancelCommand);
+//
+//                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+//                buttonPanel.setLayout(buttonPanelLayout);
+//
+//                buttonPanelLayout.setHorizontalGroup(
+//                  buttonPanelLayout.createSequentialGroup()
+//                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+//                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+//                buttonPanelLayout.setVerticalGroup(
+//                  buttonPanelLayout.createSequentialGroup()
+//                    .addComponent(cancelButton));
+//              }
+//
+//              contentPanel.validate();
+//            }
+//        });
+//    }
+
+  @Override
+  public void showCardPINDialog(final PINSpec pinSpec, final int numRetries,
+          final ActionListener okListener, final String okCommand,
+          final ActionListener cancelListener, final String cancelCommand) {
         
       log.debug("scheduling card-pin dialog");
       
@@ -534,7 +538,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 JButton okButton = new JButton();
                 okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
                 okButton.setText(getMessage(BUTTON_OK));
-                okButton.setEnabled(false);
+                okButton.setEnabled(pinSpec.getMinLength() <= 0);
                 okButton.setActionCommand(okCommand);
                 okButton.addActionListener(okListener);
 
@@ -681,27 +685,30 @@ public class BKUGUIImpl implements BKUGUIFacade {
         });
     }
 
-    @Override
-    public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
-        showCardPINDialog(pinSpec, -1, okListener, okCommand, cancelListener, cancelCommand);
-    }
-
-    @Override
-    public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
-        showCardPINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand);
-    }
-
-    @Override
-    public void showSignaturePINDialog(PINSpec pinSpec, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
-        showSignaturePINDialog(pinSpec, -1, signListener, signCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
-    }
+//    @Override
+//    public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
+//        showCardPINDialog(pinSpec, -1, okListener, okCommand, cancelListener, cancelCommand);
+//    }
+//
+//    @Override
+//    public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
+//        showCardPINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand);
+//    }
+
+//    @Override
+//    public void showSignaturePINDialog(PINSpec pinSpec, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
+//        showSignaturePINDialog(pinSpec, -1, signListener, signCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
+//    }
 
     @Override
-    public void showSignaturePINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
-        showSignaturePINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
-    }
-
-    private void showSignaturePINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener signListener, final String signCommand, final ActionListener cancelListener, final String cancelCommand, final ActionListener hashdataListener, final String hashdataCommand) {
+    public void showSignaturePINDialog(final PINSpec pinSpec, final int numRetries,
+            final ActionListener signListener, final String signCommand,
+            final ActionListener cancelListener, final String cancelCommand,
+            final ActionListener hashdataListener, final String hashdataCommand) {
+//        showSignaturePINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
+//    }
+//
+//    private void showSignaturePINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener signListener, final String signCommand, final ActionListener cancelListener, final String cancelCommand, final ActionListener hashdataListener, final String hashdataCommand) {
 
       log.debug("scheduling signature-pin dialog");
       
@@ -726,7 +733,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 JButton signButton = new JButton();
                 signButton.setFont(signButton.getFont().deriveFont(signButton.getFont().getStyle() & ~java.awt.Font.BOLD));
                 signButton.setText(getMessage(BUTTON_SIGN));
-                signButton.setEnabled(false);
+                signButton.setEnabled(pinSpec.getMinLength() <= 0);
                 signButton.setActionCommand(signCommand);
                 signButton.addActionListener(signListener);
 
@@ -888,7 +895,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
             final ActionListener okListener, final String okCommand) {
         
       showMessageDialog(TITLE_ERROR, ERROR_COLOR,
-              errorMsgKey, errorMsgParams, okListener, okCommand);
+              errorMsgKey, errorMsgParams, BUTTON_OK, okListener, okCommand);
     }
 
     @Override
@@ -896,22 +903,45 @@ public class BKUGUIImpl implements BKUGUIFacade {
             final String errorMsgKey, final Object[] errorMsgParams) {
 
       showMessageDialog(TITLE_ERROR, ERROR_COLOR,
-              errorMsgKey, errorMsgParams, null, null);
+              errorMsgKey, errorMsgParams, null, null, null);
     }
 
     @Override
     public void showMessageDialog(
             final String titleKey,
             final String msgKey, final Object[] msgParams,
+            final String buttonKey,
             final ActionListener okListener, final String okCommand) {
 
       showMessageDialog(titleKey, null, 
-              msgKey, msgParams, okListener, okCommand);
+              msgKey, msgParams, buttonKey, okListener, okCommand);
+    }
+
+    @Override
+    public void showMessageDialog(
+            final String titleKey,
+            final String msgKey, final Object[] msgParams) {
+
+      showMessageDialog(titleKey, null,
+              msgKey, msgParams, null, null, null);
+    }
+
+    @Override
+    public void showMessageDialog(
+            final String titleKey, final String msgKey) {
+
+      showMessageDialog(titleKey, null,
+              msgKey, null, null, null, null);
     }
 
+    /**
+     *
+     * @param buttonKey if null defaults to BUTTON_OK
+     */
     private void showMessageDialog(
             final String titleKey, final Color titleColor,
             final String msgKey, final Object[] msgParams,
+            final String buttonKey,
             final ActionListener okListener, final String okCommand) {
 
       log.debug("scheduling message dialog");
@@ -972,7 +1002,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 if (okListener != null) {
                   JButton okButton = new JButton();
                   okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                  okButton.setText(getMessage(BUTTON_OK));
+                  okButton.setText(getMessage((buttonKey != null) ? buttonKey : BUTTON_OK));
                   okButton.setActionCommand(okCommand);
                   okButton.addActionListener(okListener);
 
@@ -993,57 +1023,57 @@ public class BKUGUIImpl implements BKUGUIFacade {
         });
     }
 
-    @Override
-    public void showWaitDialog(final String waitMessage) {
-        
-      log.debug("scheduling wait dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-        
-              log.debug("show wait dialog");
-              
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                if (renderHeaderPanel) {
-                  titleLabel.setText(getMessage(TITLE_WAIT));
-                }
-                
-                helpListener.setHelpTopic(HELP_WAIT);
-                
-                JLabel waitMsgLabel = new JLabel();
-                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                if (waitMessage != null) {
-                    waitMsgLabel.setText("<html>" + waitMessage + "</html>");
-                } else {
-                    waitMsgLabel.setText(getMessage(MESSAGE_WAIT));
-                }
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
-                        .addComponent(waitMsgLabel);
-                GroupLayout.ParallelGroup messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                        .addComponent(waitMsgLabel);
-                
-                if (!renderHeaderPanel) {
-                  messageHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel);
-                  messageVertical
-                          .addComponent(helpLabel);
-                }
-                mainPanelLayout.setHorizontalGroup(messageHorizontal);
-                mainPanelLayout.setVerticalGroup(messageVertical);
-                
-                contentPanel.validate();
-            }
-        });
-    }
+//    @Override
+//    public void showWaitDialog(final String waitMessage) {
+//
+//      log.debug("scheduling wait dialog");
+//
+//      SwingUtilities.invokeLater(new Runnable() {
+//
+//            @Override
+//            public void run() {
+//
+//              log.debug("show wait dialog");
+//
+//                mainPanel.removeAll();
+//                buttonPanel.removeAll();
+//
+//                if (renderHeaderPanel) {
+//                  titleLabel.setText(getMessage(TITLE_WAIT));
+//                }
+//
+//                helpListener.setHelpTopic(HELP_WAIT);
+//
+//                JLabel waitMsgLabel = new JLabel();
+//                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+//                if (waitMessage != null) {
+//                    waitMsgLabel.setText("<html>" + waitMessage + "</html>");
+//                } else {
+//                    waitMsgLabel.setText(getMessage(MESSAGE_WAIT));
+//                }
+//
+//                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+//                mainPanel.setLayout(mainPanelLayout);
+//
+//                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
+//                        .addComponent(waitMsgLabel);
+//                GroupLayout.ParallelGroup messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//                        .addComponent(waitMsgLabel);
+//
+//                if (!renderHeaderPanel) {
+//                  messageHorizontal
+//                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+//                          .addComponent(helpLabel);
+//                  messageVertical
+//                          .addComponent(helpLabel);
+//                }
+//                mainPanelLayout.setHorizontalGroup(messageHorizontal);
+//                mainPanelLayout.setVerticalGroup(messageVertical);
+//
+//                contentPanel.validate();
+//            }
+//        });
+//    }
 
     @Override
     public char[] getPin() {
@@ -1062,7 +1092,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
      * @param okCommand
      */
     @Override
-    public void showHashDataInputDialog(final List<HashDataInput> signedReferences, 
+    public void showSecureViewer(final List<HashDataInput> signedReferences,
             final ActionListener okListener, 
             final String okCommand) {
       
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
index 87b636f0..13aaf870 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
@@ -35,6 +35,7 @@ class PINDocument extends PlainDocument {
         protected Pattern pinPattern;
         protected JButton enterButton;
         protected Document compareTo;
+        protected Document oldPin;
 
         public PINDocument(PINSpec pinSpec, JButton enterButton) {
             this.pinSpec = pinSpec;
@@ -46,11 +47,30 @@ class PINDocument extends PlainDocument {
             this.enterButton = enterButton;
         }
 
+        /**
+         *
+         * @param pinSpec
+         * @param enterButton 
+         * @param compareTo enable enterButton iff this pinDocument's pin equals to compareTo's pin. may be null
+         */
         public PINDocument(PINSpec pinSpec, JButton enterButton, Document compareTo) {
           this(pinSpec, enterButton);
           this.compareTo = compareTo;
         }
 
+        /**
+         *
+         * @param pinSpec
+         * @param enterButton may be null
+         * @param compareTo enable enterButton iff this pinDocument's pin equals to compareTo's pin. may be null
+         * @param oldPin enable enterButton iff oldPin meets the pinSpec pin length requirements, may be null
+         */
+        public PINDocument(PINSpec pinSpec, JButton enterButton, Document compareTo, Document oldPin) {
+          this(pinSpec, enterButton);
+          this.compareTo = compareTo;
+          this.oldPin = oldPin;
+        }
+
         @Override
         public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
             if (pinSpec.getMaxLength() < 0 || pinSpec.getMaxLength() >= (getLength() + str.length())) {
@@ -66,7 +86,10 @@ class PINDocument extends PlainDocument {
                 }
             }
             if (enterButton != null) {
-              enterButton.setEnabled(getLength() >= pinSpec.getMinLength() && compare());
+              enterButton.setEnabled(
+                      (oldPin == null || oldPin.getLength() >= pinSpec.getMinLength()) &&
+                      getLength() >= pinSpec.getMinLength() &&
+                      compare());
             }
         }
 
@@ -74,7 +97,10 @@ class PINDocument extends PlainDocument {
         public void remove(int offs, int len) throws BadLocationException {
             super.remove(offs, len);
             if (enterButton != null) {
-              enterButton.setEnabled(getLength() >= pinSpec.getMinLength() && compare());
+              enterButton.setEnabled(
+                      (oldPin == null || oldPin.getLength() >= pinSpec.getMinLength()) &&
+                      getLength() >= pinSpec.getMinLength() &&
+                      compare());
             }
         }
 
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 1e0bc9f5..6d651b2d 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -20,6 +20,7 @@ title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
 title.cardpin=<html>Karte wird gelesen</html>
 title.sign=<html>Signatur erstellen</html>
 title.error=<html>Fehler</html>
+title.entry.timeout=<html>Zeit\u00FCberschreitung</html>
 title.retry=<html>Falsche PIN</html>
 title.wait=<html>Bitte warten</html>
 title.hashdata=<html>Signaturdaten</html>
@@ -28,19 +29,25 @@ windowtitle.savedir=Signaturdaten in Verzeichnis speichern
 windowtitle.overwrite=Datei \u00FCberschreiben?
 windowtitle.viewer=Signaturdaten
 windowtitle.help=Hilfe zur B\u00FCrgerkarte
-message.wait=<html>Bitte warten...</html>
-message.insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
-message.enterpin=<html>{0} eingeben</html>
-message.hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
-message.hashdatalink.tiny=<html><a href=\"anzeige\">Signaturdaten</a></html>
+
+# removed message.* prefix to reuse keys as help keys
+welcome=<html>Bitte warten...</html>
+wait=<html>Bitte warten...</html>
+cardnotsupported=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
+insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
+enterpin=<html>{0} eingeben</html>
+enterpin.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben</html>
+hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
+hashdatalink.tiny=<html><a href=\"anzeige\">Signaturdaten</a></html>
 #message.hashdata=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
 #message.hashdata=<html>Dies ist eine Voransicht des zu signierenden Inhaltes. F\u00FCr Details siehe Hilfe (i).</html> 
 #verwenden sie bitte die von ihrem System zur Verf\u00FCgung gestellte {0} Anwendung. 
-message.hashdatalist=<html>{0} Signaturdaten:</html>
-message.retries.last=<html>Letzter Versuch!</html>
-message.retries=<html>Noch {0} Versuche</html>
-message.overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
-message.help=<html>Hilfe zu {0}</html>
+hashdatalist=<html>{0} Signaturdaten:</html>
+retries.last=<html>Letzter Versuch!</html>
+retries=<html>Noch {0} Versuche</html>
+overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
+help=<html>Hilfe zu {0}</html>
+
 warning.xhtml=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
 label.pin=<html>{0}:</html>
 label.pinsize=<html>({0} stellig)</html>
@@ -73,6 +80,7 @@ error.unknown=<html>Ein Fehler trat auf</html>
 error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
 error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
 error.card.notactivated=<html>B\u00FCrgerkartenfunktion ist nicht aktiviert</html>
+error.pin.timeout=<html>Zeit\u00FCberschreitung bei Eingabe der PIN</html>
 error.viewer=Der Inhalt kann nicht dargestellt werden: {0}
 error.external.link=<html>Externer Link {0} wird nicht ge\u00F6ffnet</html>
 error.config=<html>Fehlerhafte Konfiguration des Systems: {0}</html>
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index 4fbccd5b..2fb66969 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -20,6 +20,7 @@ title.cardnotsupported=<html>This card is not supported</html>
 title.cardpin=<html>Reading card</html>
 title.sign=<html>Create signature</html>
 title.error=<html>Error</html>
+title.entry.timeout=<html>Timeout</html>
 title.retry=<html>Wrong PIN</html>
 title.wait=<html>Please wait</html>
 title.hashdata=<html>Signature data</html>
@@ -28,17 +29,23 @@ windowtitle.savedir=Save signature data to directory
 windowtitle.overwrite=Overwrite file?
 windowtitle.viewer=Signature data
 windowtitle.help=Citizen card help
-message.wait=<html>Please wait...</html>
-message.insertcard=<html>Please insert your citizen card into the reader</html>
-message.enterpin=<html>Enter {0}</html>
-message.hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
-message.hashdatalink.tiny=<html><a href=\"anzeige\">signature data</a></html>
+
+# removed message.* prefix to reuse keys as help keys
+welcome=<html>Please wait...</html>
+wait=<html>Please wait...</html>
+insertcard=<html>Please insert your citizen card into the reader</html>
+cardnotsupported=<html>Please insert your citizen card into the reader</html>
+enterpin=<html>Enter {0}</html>
+enterpin.pinpad=<html>Enter {0} ({1} digits) on card reader pinpad</html>
+hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
+hashdatalink.tiny=<html><a href=\"anzeige\">signature data</a></html>
 #message.hashdata=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
-message.hashdatalist=<html>{0} signature data objects:</html>
-message.retries.last=<html>Last try!</html>
-message.retries=<html>{0} tries left</html>
-message.overwrite=<html>Overwrite {0}?</html>
-message.help=<html>Help topic {0}</html>
+hashdatalist=<html>{0} signature data objects:</html>
+retries.last=<html>Last try!</html>
+retries=<html>{0} tries left</html>
+overwrite=<html>Overwrite {0}?</html>
+help=<html>Help topic {0}</html>
+
 warning.xhtml=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
 label.pin=<html>{0}:</html>
 label.pinsize=<html>({0} digits)</html>
@@ -71,6 +78,7 @@ error.unknown=<html>An error occured</html>
 error.test=<html>Error1 {0} - Error2 {1}</html>
 error.card.locked=<html>Citizen card is locked</html>
 error.card.notactivated=<html>Citizen card not activated</html>
+error.pin.timeout=<html>Timeout during PIN entry</html>
 error.viewer=Failed to display contents: {0}
 error.external.link=<html>Cannot open external link {0}</html>
 error.config=<html>Incorrect system configuration: {0}</html>
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 ef64ac59..194e18b0 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
@@ -78,7 +78,7 @@ public class BKUGUIWorker implements Runnable {
 
           @Override
           public void actionPerformed(ActionEvent e) {
-            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", null, "hashdata");
+            gui.showSignaturePINDialog(signPinSpec, -1, signListener, "sign", cancelListener, "cancel", null, "hashdata");
           }
         };
         HashDataInput signedRef1 = new ByteArrayHashDataInput(
@@ -116,7 +116,7 @@ public class BKUGUIWorker implements Runnable {
 //                    signedRefs.add(signedRef4);
 //                    signedRefs.add(signedRef4);
 //                    signedRefs = Collections.singletonList(signedRef1);
-        gui.showHashDataInputDialog(signedRefs, returnListener, "return");
+        gui.showSecureViewer(signedRefs, returnListener, "return");
       }
     };
 
@@ -149,7 +149,7 @@ public class BKUGUIWorker implements Runnable {
 //            
 //            Thread.sleep(2000);
 //
-            gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+            gui.showSignaturePINDialog(signPinSpec, -1, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
 //
 //            Thread.sleep(4000);
 //
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
index 1714017e..5a0ba84a 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
@@ -40,27 +40,27 @@ public class BKUGuiProxy implements BKUGUIFacade {
     return delegate.getLocale();
   }
 
+//  @Override
+//  public void showCardNotSupportedDialog(ActionListener cancelListener,
+//      String actionCommand) {
+//    showDialog();
+//    delegate.showCardNotSupportedDialog(cancelListener, actionCommand);
+//  }
+//
+//  @Override
+//  public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener,
+//      String okCommand, ActionListener cancelListener, String cancelCommand) {
+//    showDialog();
+//    delegate.showCardPINDialog(pinSpec, okListener, okCommand, cancelListener,
+//        cancelCommand);
+//  }
+//
   @Override
-  public void showCardNotSupportedDialog(ActionListener cancelListener,
-      String actionCommand) {
-    showDialog();
-    delegate.showCardNotSupportedDialog(cancelListener, actionCommand);
-  }
-
-  @Override
-  public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener,
-      String okCommand, ActionListener cancelListener, String cancelCommand) {
-    showDialog();
-    delegate.showCardPINDialog(pinSpec, okListener, okCommand, cancelListener,
-        cancelCommand);
-  }
-
-  @Override
-  public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries,
+  public void showCardPINDialog(PINSpec pinSpec, int numRetries,
       ActionListener okListener, String okCommand,
       ActionListener cancelListener, String cancelCommand) {
     showDialog();
-    delegate.showCardPINRetryDialog(pinSpec, numRetries, okListener, okCommand,
+    delegate.showCardPINDialog(pinSpec, numRetries, okListener, okCommand,
         cancelListener, cancelCommand);
   }
 
@@ -77,57 +77,71 @@ public class BKUGuiProxy implements BKUGUIFacade {
     delegate.showErrorDialog(errorMsgKey, errorMsgParams);
   }
 
+//  @Override
+//  public void showInsertCardDialog(ActionListener cancelListener,
+//      String actionCommand) {
+//    showDialog();
+//    delegate.showInsertCardDialog(cancelListener, actionCommand);
+//  }
+//
+//  @Override
+//  public void showSignaturePINDialog(PINSpec pinSpec,
+//      ActionListener signListener, String signCommand,
+//      ActionListener cancelListener, String cancelCommand,
+//      ActionListener hashdataListener, String hashdataCommand) {
+//    showDialog();
+//    delegate.showSignaturePINDialog(pinSpec, signListener, signCommand,
+//        cancelListener, cancelCommand, hashdataListener, hashdataCommand);
+//  }
+//
   @Override
-  public void showInsertCardDialog(ActionListener cancelListener,
-      String actionCommand) {
-    showDialog();
-    delegate.showInsertCardDialog(cancelListener, actionCommand);
-  }
-
-  @Override
-  public void showSignaturePINDialog(PINSpec pinSpec,
-      ActionListener signListener, String signCommand,
-      ActionListener cancelListener, String cancelCommand,
-      ActionListener hashdataListener, String hashdataCommand) {
-    showDialog();
-    delegate.showSignaturePINDialog(pinSpec, signListener, signCommand,
-        cancelListener, cancelCommand, hashdataListener, hashdataCommand);
-  }
-
-  @Override
-  public void showSignaturePINRetryDialog(PINSpec pinSpec, int numRetries,
+  public void showSignaturePINDialog(PINSpec pinSpec, int numRetries,
       ActionListener okListener, String okCommand,
       ActionListener cancelListener, String cancelCommand,
       ActionListener hashdataListener, String hashdataCommand) {
     showDialog();
-    delegate.showSignaturePINRetryDialog(pinSpec, numRetries, okListener,
+    delegate.showSignaturePINDialog(pinSpec, numRetries, okListener,
         okCommand, cancelListener, cancelCommand, hashdataListener,
         hashdataCommand);
   }
+//
+//  @Override
+//  public void showWaitDialog(String waitMessage) {
+//    showDialog();
+//    delegate.showWaitDialog(waitMessage);
+//  }
+//
+//  @Override
+//  public void showWelcomeDialog() {
+//    showDialog();
+//    delegate.showWelcomeDialog();
+//  }
 
   @Override
-  public void showWaitDialog(String waitMessage) {
+  public void showSecureViewer(List<HashDataInput> signedReferences,
+          ActionListener okListener, 
+          String okCommand) {
     showDialog();
-    delegate.showWaitDialog(waitMessage);
+    delegate.showSecureViewer(signedReferences, okListener, okCommand);
   }
 
   @Override
-  public void showWelcomeDialog() {
+  public void showMessageDialog(String titleKey, 
+          String msgKey, Object[] msgParams,
+          String buttonKey, ActionListener okListener, String okCommand) {
     showDialog();
-    delegate.showWelcomeDialog();
+    delegate.showMessageDialog(titleKey, msgKey, msgParams, buttonKey, okListener, okCommand);
   }
 
   @Override
-  public void showHashDataInputDialog(List<HashDataInput> signedReferences, 
-          ActionListener okListener, 
-          String okCommand) {
+  public void showMessageDialog(String titleKey, String msgKey, Object[] msgParams) {
     showDialog();
-    delegate.showHashDataInputDialog(signedReferences, okListener, okCommand);
+    delegate.showMessageDialog(titleKey, msgKey, msgParams);
   }
 
   @Override
-  public void showMessageDialog(String titleKey, String msgKey, Object[] msgParams, ActionListener okListener, String okCommand) {
+  public void showMessageDialog(String titleKey, String msgKey) {
     showDialog();
-    delegate.showMessageDialog(titleKey, msgKey, msgParams, okListener, okCommand);
+    delegate.showMessageDialog(titleKey, msgKey);
   }
 }
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
index 46f915a9..531e6591 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
@@ -67,7 +67,7 @@ public class LocalSignRequestHandler extends SignRequestHandler {
    * @throws java.lang.Exception
    */
   @Override
-  public void displayHashDataInputs(List<ReferenceType> dsigReferences) throws Exception {
+  public void displayDataToBeSigned(List<ReferenceType> dsigReferences) throws Exception {
     if (dsigReferences == null || dsigReferences.size() < 1) {
       log.error("No hashdata input selected to be displayed: null");
       throw new Exception("No HashData Input selected to be displayed");
@@ -109,7 +109,7 @@ public class LocalSignRequestHandler extends SignRequestHandler {
       log.error("dsig:SignedInfo does not contain a data reference");
       throw new Exception("dsig:SignedInfo does not contain a data reference");
     }
-    gui.showHashDataInputDialog(selectedHashDataInputs, this, "hashDataDone");
+    gui.showSecureViewer(selectedHashDataInputs, this, "hashDataDone");
   }
 
   private ByteArrayHashDataInput getByteArrayHashDataInput(HashDataInput hashDataInput) throws IOException {
diff --git a/BKULocalApp/src/main/java/at/gv/egiz/bku/local/app/Container.java b/BKULocalApp/src/main/java/at/gv/egiz/bku/local/app/Container.java
index d15d2c1b..833dbf4d 100644
--- a/BKULocalApp/src/main/java/at/gv/egiz/bku/local/app/Container.java
+++ b/BKULocalApp/src/main/java/at/gv/egiz/bku/local/app/Container.java
@@ -1,10 +1,5 @@
 package at.gv.egiz.bku.local.app;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.mortbay.jetty.Connector;
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/cardnotsupported.html b/BKUOnline/src/main/webapp/helpfiles/de/cardnotsupported.html
new file mode 100644
index 00000000..021ddfa7
--- /dev/null
+++ b/BKUOnline/src/main/webapp/helpfiles/de/cardnotsupported.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/cardnotsupported.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Die Karte wird nicht unterstützt</h1>
+    <p>Die im Kartenleser gesteckte Chipkarte wird nicht unterstützt.</p>
+    <p>Bitte stecken Sie eine unterstützte Chipkarte (Bürgerkarte) in den Kartenleser. Derzeit werden die folgenden Chipkarten unterstützt:</p>
+   	<ul>
+       	<li><strong>e-card</strong> <br />
+   	    Chipkarte der <a href="http://www.sozialversicherung.at">Österreichischen Sozialversicherung</a></li>
+            <li><strong>a-sign premium</strong> <br />
+            Chipkarte der <a href="http://www.a-trust.at">A-Trust GmbH</a> bzw. diverse andere Chipkarten mit der Aufschrift 'a-sign premium'.</li>
+    </ul>
+    <p>Sind mehrere unterstützte Kartenleser angeschlossen, stecken sie eine unterstützte Chipkarte (Bürgerkarte) in einen der angeschlossenen Kartenleser. Wird die Chipkarte erkannt wechselt die Bildschirmanzeige. Wird die Chipkarte nicht erkannt, wird der Kartenleser möglicherweise nicht unterstützt. Stecken Sie die Chipkarte daher in einen anderen Kartenleser.</p>
+    <p><br class="clearfloat" /></p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/cardnotsupported.png b/BKUOnline/src/main/webapp/helpfiles/de/cardnotsupported.png
new file mode 100644
index 00000000..c3b7ce6b
Binary files /dev/null and b/BKUOnline/src/main/webapp/helpfiles/de/cardnotsupported.png differ
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/help.cardnotsupported.html b/BKUOnline/src/main/webapp/helpfiles/de/help.cardnotsupported.html
deleted file mode 100644
index c647bf72..00000000
--- a/BKUOnline/src/main/webapp/helpfiles/de/help.cardnotsupported.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Untitled Document</title>
-<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online-Hilfe</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="../../helpfiles/de/help.cardnotsupported.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Die Karte wird nicht unterstützt</h1>
-    <p>Die im Kartenleser gesteckte Chipkarte wird nicht unterstützt.</p>
-    <p>Bitte stecken Sie eine unterstützte Chipkarte (Bürgerkarte) in den Kartenleser. Derzeit werden die folgenden Chipkarten unterstützt:</p>
-   	<ul>
-       	<li><strong>e-card</strong> <br />
-   	    Chipkarte der <a href="http://www.sozialversicherung.at">Österreichischen Sozialversicherung</a></li>
-            <li><strong>a-sign premium</strong> <br />
-            Chipkarte der <a href="http://www.a-trust.at">A-Trust GmbH</a> bzw. diverse andere Chipkarten mit der Aufschrift 'a-sign premium'.</li>
-    </ul>
-    <p>Sind mehrere unterstützte Kartenleser angeschlossen, stecken sie eine unterstützte Chipkarte (Bürgerkarte) in einen der angeschlossenen Kartenleser. Wird die Chipkarte erkannt wechselt die Bildschirmanzeige. Wird die Chipkarte nicht erkannt, wird der Kartenleser möglicherweise nicht unterstützt. Stecken Sie die Chipkarte daher in einen anderen Kartenleser.</p>
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/help.cardnotsupported.png b/BKUOnline/src/main/webapp/helpfiles/de/help.cardnotsupported.png
deleted file mode 100644
index c3b7ce6b..00000000
Binary files a/BKUOnline/src/main/webapp/helpfiles/de/help.cardnotsupported.png and /dev/null differ
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/help.insertcard.html b/BKUOnline/src/main/webapp/helpfiles/de/help.insertcard.html
deleted file mode 100644
index 0bfc6230..00000000
--- a/BKUOnline/src/main/webapp/helpfiles/de/help.insertcard.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Untitled Document</title>
-<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online-Hilfe</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="../../helpfiles/de/help.insertcard.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Bitte die Bürgerkarte in den Kartenleser stecken</h1>
-    <p>Die Software für den Zugriff auf die Bürgerkarte hat einen oder mehrere unterstützte Kartenleser gefunden.</p>
-    <p>Bitte stecken Sie nun ihre Bürgerkarte in den Kartenleser. Wird die Karte erkannt, welchselt die Bildschirmanzeige.</p>
-    <p>Sollten Sie mehrere Kartenleser angeschlossen haben, wählen Sie einen beliebigen aus. Wird die Karte im ausgewählten Kartenleser nicht erkannt, wird dieser Kartenleser eventuell nicht unterstützt. Probieren Sie es daher in einem anderen Kartenleser nochmal.
-    </p>
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/help.insertcard.png b/BKUOnline/src/main/webapp/helpfiles/de/help.insertcard.png
deleted file mode 100644
index 62a22975..00000000
Binary files a/BKUOnline/src/main/webapp/helpfiles/de/help.insertcard.png and /dev/null differ
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/help.wait.html b/BKUOnline/src/main/webapp/helpfiles/de/help.wait.html
deleted file mode 100644
index ed3db1b8..00000000
--- a/BKUOnline/src/main/webapp/helpfiles/de/help.wait.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Untitled Document</title>
-<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online-Hilfe</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="../../helpfiles/de/help.wait.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Bitte warten ...</h1>
-    <p>Die Software für den Zugriff auf die Bürgerkarte ist damit beschäftigt, einen Befehl auszuführen bzw. auf einen neuen Befehl vom Server zu warten.    </p>
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/help.wait.png b/BKUOnline/src/main/webapp/helpfiles/de/help.wait.png
deleted file mode 100644
index 63a38fbf..00000000
Binary files a/BKUOnline/src/main/webapp/helpfiles/de/help.wait.png and /dev/null differ
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/help.welcome.html b/BKUOnline/src/main/webapp/helpfiles/de/help.welcome.html
deleted file mode 100644
index 9796a206..00000000
--- a/BKUOnline/src/main/webapp/helpfiles/de/help.welcome.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Untitled Document</title>
-<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
-<!--[if IE]>
-<style type="text/css"> 
-/* place css fixes for all versions of IE in this conditional comment */
-.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
-.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
-/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
-</style>
-<![endif]-->
-</head>
-
-<body class="twoColElsLtHdr">
-
-<div id="container">
-  <div id="header">
-    <h1>Online-Hilfe</h1>
-    <!-- end #header --></div>
-  <div id="sidebar1">
-    <p><img src="../../helpfiles/de/help.welcome.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
-    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
-    <!-- end #sidebar1 --></div>
-  <div id="mainContent">
-    <h1> Willkommen </h1>
-    <p>Die Anzeige &quot;Willkommen&quot; erfolgt unmittelbar nachdem die Software für den Zugriff auf die Bürgerkarte erfolgreich im Browser geladen wurde.</p>
-    <p>Die Software versucht nun eine Verbindung mit dem Server aufzunehmen um Befehle für den Zugriff auf die Bürgerkarte zu erhalten.</p>
-    <p><br class="clearfloat" /></p>
-  </div>
-  <div id="footer">
-  	<p>
-    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
-    </p>
-  </div>
-<!-- end #container --></div>
-</body>
-</html>
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/help.welcome.png b/BKUOnline/src/main/webapp/helpfiles/de/help.welcome.png
deleted file mode 100644
index 78133b4d..00000000
Binary files a/BKUOnline/src/main/webapp/helpfiles/de/help.welcome.png and /dev/null differ
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/insertcard.html b/BKUOnline/src/main/webapp/helpfiles/de/insertcard.html
new file mode 100644
index 00000000..f7f1a28a
--- /dev/null
+++ b/BKUOnline/src/main/webapp/helpfiles/de/insertcard.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/insertcard.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Bitte die Bürgerkarte in den Kartenleser stecken</h1>
+    <p>Die Software für den Zugriff auf die Bürgerkarte hat einen oder mehrere unterstützte Kartenleser gefunden.</p>
+    <p>Bitte stecken Sie nun ihre Bürgerkarte in den Kartenleser. Wird die Karte erkannt, welchselt die Bildschirmanzeige.</p>
+    <p>Sollten Sie mehrere Kartenleser angeschlossen haben, wählen Sie einen beliebigen aus. Wird die Karte im ausgewählten Kartenleser nicht erkannt, wird dieser Kartenleser eventuell nicht unterstützt. Probieren Sie es daher in einem anderen Kartenleser nochmal.
+    </p>
+    <p><br class="clearfloat" /></p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/insertcard.png b/BKUOnline/src/main/webapp/helpfiles/de/insertcard.png
new file mode 100644
index 00000000..62a22975
Binary files /dev/null and b/BKUOnline/src/main/webapp/helpfiles/de/insertcard.png differ
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/wait.html b/BKUOnline/src/main/webapp/helpfiles/de/wait.html
new file mode 100644
index 00000000..8561ff35
--- /dev/null
+++ b/BKUOnline/src/main/webapp/helpfiles/de/wait.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/wait.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Bitte warten ...</h1>
+    <p>Die Software für den Zugriff auf die Bürgerkarte ist damit beschäftigt, einen Befehl auszuführen bzw. auf einen neuen Befehl vom Server zu warten.    </p>
+    <p><br class="clearfloat" /></p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/wait.png b/BKUOnline/src/main/webapp/helpfiles/de/wait.png
new file mode 100644
index 00000000..63a38fbf
Binary files /dev/null and b/BKUOnline/src/main/webapp/helpfiles/de/wait.png differ
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/welcome.html b/BKUOnline/src/main/webapp/helpfiles/de/welcome.html
new file mode 100644
index 00000000..6c5463e5
--- /dev/null
+++ b/BKUOnline/src/main/webapp/helpfiles/de/welcome.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Untitled Document</title>
+<link href="../../helpfiles/help.css" rel="stylesheet" type="text/css" />
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="../../helpfiles/de/welcome.png" alt="Bildschirmfoto des Applets" width="190" height="130"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1> Willkommen </h1>
+    <p>Die Anzeige &quot;Willkommen&quot; erfolgt unmittelbar nachdem die Software für den Zugriff auf die Bürgerkarte erfolgreich im Browser geladen wurde.</p>
+    <p>Die Software versucht nun eine Verbindung mit dem Server aufzunehmen um Befehle für den Zugriff auf die Bürgerkarte zu erhalten.</p>
+    <p><br class="clearfloat" /></p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/welcome.png b/BKUOnline/src/main/webapp/helpfiles/de/welcome.png
new file mode 100644
index 00000000..78133b4d
Binary files /dev/null and b/BKUOnline/src/main/webapp/helpfiles/de/welcome.png differ
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ACOS04Card.java b/smcc/src/main/java/at/gv/egiz/smcc/ACOS04Card.java
new file mode 100644
index 00000000..9fca6ab9
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ACOS04Card.java
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.smcc;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class ACOS04Card extends ACOSCard {
+
+  public ACOS04Card() {
+    pinSpecs.remove(PINSPEC_INF);
+  }
+
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
index c2c62fd8..01b9155b 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
@@ -29,9 +29,10 @@
 package at.gv.egiz.smcc;
 
 import at.gv.egiz.smcc.util.SMCCHelper;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 
-import javax.smartcardio.Card;
 import javax.smartcardio.CardChannel;
 import javax.smartcardio.CardException;
 import javax.smartcardio.CommandAPDU;
@@ -100,9 +101,9 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
       (byte) 0x01 // RSA // TODO: Not verified yet
   };
 
-  private static final int PINSPEC_INF = 0;
-  private static final int PINSPEC_DEC = 1;
-  private static final int PINSPEC_SIG = 2;
+  protected static final int PINSPEC_INF = 0;
+  protected static final int PINSPEC_DEC = 1;
+  protected static final int PINSPEC_SIG = 2;
 
   public ACOSCard() {
     super("at/gv/egiz/smcc/ACOSCard");
@@ -179,15 +180,12 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
         //new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("inf.pin.name"));
         
         int retries = -1;
-        String pin = null;
+        char[] pin = null;
         boolean pinRequiered = false;
 
         do {
           if (pinRequiered) {
             pin = provider.providePIN(spec, retries);
-            if (pin == null) {
-              throw new CancelledException();
-            }
           }
           try {
             getCard().beginExclusive();
@@ -234,20 +232,17 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
         //new PINSpec(6, 10, "[0-9]", getResourceBundle().getString("sig.pin.name"));
         
         int retries = -1;
-        String pin = null;
+        char[] pin = null;
 
         do {
           pin = provider.providePIN(spec, retries);
-          if (pin == null) {
-            throw new CancelledException();
-          }
           try {
             getCard().beginExclusive();
             
             // SELECT DF
             selectFileFID(DF_SIG);
             // VERIFY
-            retries = verifyPIN(pin, KID_PIN_SIG);
+            retries = verifyPIN(KID_PIN_SIG, pin);
             if (retries != -1) {
               throw new VerificationFailedException(retries);
             }
@@ -259,7 +254,7 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
             return psoComputDigitalSiganture();
 
           } catch (SecurityStatusNotSatisfiedException e) {
-            retries = verifyPIN(null, KID_PIN_SIG);
+            retries = verifyPIN(KID_PIN_SIG);
           } catch (VerificationFailedException e) {
             retries = e.getRetries();
           } finally {
@@ -276,15 +271,12 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
         //new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("dec.pin.name"));
 
         int retries = -1;
-        String pin = null;
-        boolean pinRequiered = false;
+        char[] pin = null;
+        boolean pinRequired = false;
 
         do {
-          if (pinRequiered) {
+          if (pinRequired) {
             pin = provider.providePIN(spec, retries);
-            if (pin == null) {
-              throw new CancelledException();
-            }
           }
           try {
             getCard().beginExclusive();
@@ -292,7 +284,7 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
             // SELECT DF
             selectFileFID(DF_DEC);
             // VERIFY
-            retries = verifyPIN(pin, KID_PIN_DEC);
+            retries = verifyPIN(KID_PIN_DEC, pin);
             if (retries != -1) {
               throw new VerificationFailedException(retries);
             }
@@ -304,10 +296,10 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
           } catch (FileNotFoundException e) {
             throw new NotActivatedException();
           } catch (SecurityStatusNotSatisfiedException e) {
-            pinRequiered = true;
-            retries = verifyPIN(null, KID_PIN_DEC);
+            pinRequired = true;
+            retries = verifyPIN(KID_PIN_DEC);
           } catch (VerificationFailedException e) {
-            pinRequiered = true;
+            pinRequired = true;
             retries = e.getRetries();
           } finally {
             getCard().endExclusive();
@@ -328,48 +320,16 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
       
   }
 
+  ////////////////////////////////////////////////////////////////////////
+  // PROTECTED METHODS (assume exclusive card access)
+  ////////////////////////////////////////////////////////////////////////
+
   protected ResponseAPDU selectFileFID(byte[] fid) throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
     return transmit(channel, new CommandAPDU(0x00, 0xA4, 0x00,
         0x00, fid, 256));
   }
 
-  @Override
-  protected int verifyPIN(String pin, byte kid) throws LockedException, NotActivatedException, SignatureCardException {
-
-    CardChannel channel = getCardChannel();
-
-    ResponseAPDU resp;
-    try {
-      if (pin != null) {
-        resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid, encodePINBlock(pin)), false);
-      } else {
-        //TODO this is not supported
-        resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid), false);
-      }
-    } catch (CardException ex) {
-      log.error("smart card communication failed: " + ex.getMessage());
-      throw new SignatureCardException("smart card communication failed: " + ex.getMessage(), ex);
-    }
-
-    //6A 00 (falshe P1/P2) nicht in contextAID
-    //69 85 (nutzungsbedingungen nicht erfüllt) in DF_Sig und nicht sigpin
-
-    if (resp.getSW() == 0x63c0) {
-      throw new LockedException("PIN locked.");
-    } else if (resp.getSW1() == 0x63 && resp.getSW2() >> 4 == 0xc) {
-      // return number of possible retries
-      return resp.getSW2() & 0x0f;
-    } else if (resp.getSW() == 0x6983) {
-      throw new NotActivatedException();
-    } else if (resp.getSW() == 0x9000) {
-      return -1;
-    } else {
-      throw new SignatureCardException("Failed to verify pin: SW="
-          + Integer.toHexString(resp.getSW()) + ".");
-    }
-  }
-  
   private void mseSetDST(int p1, int p2, byte[] dst) throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
     ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0x22, p1,
@@ -426,92 +386,294 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
     }
   }
 
-  @Override
-  public String toString() {
-    return "a-sign premium";
-  }
-
   /**
-   * ASCII encoded pin, padded with 0x00
-   * @param pin
-   * @return a 8 byte pin block 
+   *
+   * @param kid
+   * @return -1
    */
-  private byte[] encodePINBlock(String pin) {
-    byte[] asciiPIN = pin.getBytes(Charset.forName("ASCII"));
-    byte[] encodedPIN = new byte[8];
-    System.arraycopy(asciiPIN, 0, encodedPIN, 0, Math.min(asciiPIN.length,
-        encodedPIN.length));
-//    System.out.println("ASCII encoded PIN block: " + SMCCHelper.toString(encodedPIN));
-    return encodedPIN;
+  @Override
+  protected int verifyPIN(byte kid) {
+    log.debug("VERIFY PIN without PIN BLOCK not supported by ACOS");
+    return -1;
   }
 
   @Override
-  public void activatePIN(PINSpec pinSpec, String pin) throws SignatureCardException {
-    throw new SignatureCardException("PIN activation not supported by this card");
+  protected int verifyPIN(byte kid, char[] pin)
+          throws LockedException, NotActivatedException, CancelledException, TimeoutException, SignatureCardException {
+    try {
+      byte[] sw;
+      if (ifdSupportsFeature(FEATURE_VERIFY_PIN_DIRECT)) {
+        log.debug("verify PIN on IFD");
+        sw = transmitControlCommand(
+                ifdCtrlCmds.get(FEATURE_VERIFY_PIN_DIRECT),
+                getPINVerifyStructure(kid));
+//        int sw = (resp[resp.length-2] & 0xff) << 8 | resp[resp.length-1] & 0xff;
+      } else {
+        byte[] pinBlock = encodePINBlock(pin);
+        CardChannel channel = getCardChannel();
+        ResponseAPDU resp = transmit(channel,
+                new CommandAPDU(0x00, 0x20, 0x00, kid, pinBlock), false);
+        sw = new byte[2];
+        sw[0] = (byte) resp.getSW1();
+        sw[1] = (byte) resp.getSW2();
+      }
+
+      //6A 00 (falshe P1/P2) nicht in contextAID
+      //69 85 (nutzungsbedingungen nicht erfüllt) in DF_Sig und nicht sigpin
+
+      if (sw[0] == (byte) 0x90 && sw[1] == (byte) 0x00) {
+        return -1;
+      } else if (sw[0] == (byte) 0x63 && sw[1] == (byte) 0xc0) {
+        throw new LockedException("[63:c0]");
+      } else if (sw[0] == (byte) 0x63 && (sw[1] & 0xf0) >> 4 == 0xc) {
+        return sw[1] & 0x0f;
+      } else if (sw[0] == (byte) 0x69 && sw[1] == (byte) 0x83) {
+        //Authentisierungsmethode gesperrt
+        throw new NotActivatedException("[69:83]");
+//      } else if (sw[0] == (byte) 0x69 && sw[1] == (byte) 0x84) {
+//        //referenzierte Daten sind reversibel gesperrt (invalidated)
+//        throw new NotActivatedException("[69:84]");
+//      } else if (sw[0] == (byte) 0x69 && sw[1] == (byte) 0x85) {
+//        //Benutzungsbedingungen nicht erfüllt
+//        throw new NotActivatedException("[69:85]");
+      } else if (sw[0] == (byte) 0x64 && sw[1] == (byte) 0x00) {
+        throw new TimeoutException("[64:00]");
+      } else if (sw[0] == (byte) 0x64 && sw[1] == (byte) 0x01) {
+        throw new CancelledException("[64:01]");
+      }
+      log.error("Failed to verify pin: SW="
+              + SMCCHelper.toString(sw));
+      throw new SignatureCardException(SMCCHelper.toString(sw));
+
+    } catch (CardException ex) {
+      log.error("smart card communication failed: " + ex.getMessage());
+      throw new SignatureCardException("smart card communication failed: " + ex.getMessage(), ex);
+    }
   }
 
   /**
    * SCARD_E_NOT_TRANSACTED inf/dec PIN not active (pcsc crash)
-   * @param pinSpec
-   * @param oldPIN
-   * @param newPIN
+   * @param kid
+   * @param oldPin
+   * @param newPin
+   * @return
    * @throws at.gv.egiz.smcc.LockedException
-   * @throws at.gv.egiz.smcc.VerificationFailedException
    * @throws at.gv.egiz.smcc.NotActivatedException
    * @throws at.gv.egiz.smcc.SignatureCardException
    */
   @Override
-  public void changePIN(PINSpec pinSpec, String oldPIN, String newPIN)
-          throws LockedException, VerificationFailedException, NotActivatedException, SignatureCardException {
-    Card icc = getCard();
+  protected int changePIN(byte kid, char[] oldPin, char[] newPin)
+          throws LockedException, NotActivatedException, CancelledException, TimeoutException, SignatureCardException {
     try {
-      icc.beginExclusive();
-      CardChannel channel = icc.getBasicChannel();
-
-      if (pinSpec.getContextAID() != null) {
-        ResponseAPDU responseAPDU = transmit(channel,
-                new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, pinSpec.getContextAID()));
-        if (responseAPDU.getSW() != 0x9000) {
-          icc.endExclusive();
-          String msg = "Select AID " + SMCCHelper.toString(pinSpec.getContextAID()) +
-                  ": SW=" + Integer.toHexString(responseAPDU.getSW());
-          log.error(msg);
-          throw new SignatureCardException(msg);
-        }
-      }
-
-      byte[] cmd = new byte[16];
-      System.arraycopy(encodePINBlock(oldPIN), 0, cmd, 0, 8);
-      System.arraycopy(encodePINBlock(newPIN), 0, cmd, 8, 8);
+       byte[] sw;
+      if (ifdSupportsFeature(FEATURE_MODIFY_PIN_DIRECT)) {
+        log.debug("modify PIN on IFD");
+        sw = transmitControlCommand(
+                ifdCtrlCmds.get(FEATURE_MODIFY_PIN_DIRECT),
+                getPINModifyStructure(kid));
+//        int sw = (resp[resp.length-2] & 0xff) << 8 | resp[resp.length-1] & 0xff;
+      } else {
+        byte[] cmd = new byte[16];
+        System.arraycopy(encodePINBlock(oldPin), 0, cmd, 0, 8);
+        System.arraycopy(encodePINBlock(newPin), 0, cmd, 8, 8);
 
-      ResponseAPDU responseAPDU = transmit(channel,
-              new CommandAPDU(0x00, 0x24, 0x00, pinSpec.getKID(), cmd), false);
+        CardChannel channel = getCardChannel();
 
-      icc.endExclusive();
+        ResponseAPDU resp = transmit(channel,
+                new CommandAPDU(0x00, 0x24, 0x00, kid, cmd), false);
 
-      log.debug("change pin returned SW=" + Integer.toHexString(responseAPDU.getSW()));
+        sw = new byte[2];
+        sw[0] = (byte) resp.getSW1();
+        sw[1] = (byte) resp.getSW2();
+      }
 
-      if (responseAPDU.getSW() == 0x63c0) {
-        log.error(pinSpec.getLocalizedName() + " locked");
-        throw new LockedException();
-      } else if (responseAPDU.getSW1() == 0x63 && responseAPDU.getSW2() >> 4 == 0xc) {
-        int retries = responseAPDU.getSW2() & 0x0f;
-        log.error("wrong " + pinSpec.getLocalizedName() + ", " + retries + " retries");
-        throw new VerificationFailedException(retries);
-      } else if (responseAPDU.getSW() == 0x6983) {
+      // activates pin (newPIN) if not active
+      if (sw[0] == (byte) 0x90 && sw[1] == (byte) 0x00) {
+        return -1;
+      } else if (sw[0] == (byte) 0x63 && sw[1] == (byte) 0xc0) {
+        throw new LockedException("[63:c0]");
+      } else if (sw[0] == (byte) 0x63 && (sw[1] & 0xf0) >> 4 == 0xc) {
+        return sw[1] & 0x0f;
+      } else if (sw[0] == (byte) 0x69 && sw[1] == (byte) 0x83) {
+        //Authentisierungsmethode gesperrt
         // sig-pin only (card not transacted for inf/dec pin)
-        log.error(pinSpec.getLocalizedName() + " not activated");
-        throw new NotActivatedException();
-      } else if (responseAPDU.getSW() != 0x9000) {
-        String msg = "Failed to change " + pinSpec.getLocalizedName() +
-                ": SW=" + Integer.toHexString(responseAPDU.getSW());
-        log.error(msg);
-        throw new SignatureCardException(msg);
+        throw new NotActivatedException("[69:83]");
+      } else if (sw[0] == (byte) 0x64 && sw[1] == (byte) 0x00) {
+        throw new TimeoutException("[64:00]");
+      } else if (sw[0] == (byte) 0x64 && sw[1] == (byte) 0x01) {
+        throw new CancelledException("[64:01]");
       }
+      log.error("Failed to change pin: SW="
+              + SMCCHelper.toString(sw));
+      throw new SignatureCardException(SMCCHelper.toString(sw));
+
     } catch (CardException ex) {
-      log.error("Failed to change " + pinSpec.getLocalizedName() +
-              ": " + ex.getMessage());
-      throw new SignatureCardException(ex.getMessage(), ex);
+      log.error("smart card communication failed: " + ex.getMessage());
+      throw new SignatureCardException("smart card communication failed: " + ex.getMessage(), ex);
     }
   }
+
+  /**
+   * throws SignatureCardException (PIN activation not supported by ACOS)
+   * @throws at.gv.egiz.smcc.SignatureCardException
+   */
+  @Override
+  public void activatePIN(byte kid, char[] pin)
+          throws SignatureCardException {
+    log.error("ACTIVATE PIN not supported by ACOS");
+    throw new SignatureCardException("PIN activation not supported by this card");
+  }
+
+  /**
+   * ASCII encoded pin, padded with 0x00
+   * @param pin
+   * @return a 8 byte pin block
+   */
+  @Override
+  protected byte[] encodePINBlock(char[] pin) {
+//    byte[] asciiPIN = new String(pin).getBytes(Charset.forName("ASCII"));
+    CharBuffer chars = CharBuffer.wrap(pin);
+    ByteBuffer bytes = Charset.forName("ASCII").encode(chars);
+    byte[] asciiPIN = bytes.array();
+    byte[] encodedPIN = new byte[8];
+    System.arraycopy(asciiPIN, 0, encodedPIN, 0, Math.min(asciiPIN.length,
+        encodedPIN.length));
+//    System.out.println("ASCII encoded PIN block: " + SMCCHelper.toString(encodedPIN));
+    return encodedPIN;
+  }
+  
+  private byte[] getPINVerifyStructure(byte kid) {
+
+      byte bTimeOut = (byte) 00;            // Default time out
+      byte bTimeOut2 = (byte) 00;           // Default time out
+      byte bmFormatString = (byte) 0x82;      // 1 0001 0 01
+                                              // ^------------ System unit = byte
+                                              //   ^^^^------- PIN position in the frame = 1 byte
+                                              //        ^----- PIN justification left
+                                              //          ^^-- BCD format
+                                              // 1 0000 0 10
+                                              //          ^^-- ASCII format
+      byte bmPINBlockString = (byte) 0x08;    // 0100 0111
+                                              // ^^^^--------- PIN length size: 4 bits
+                                              //      ^^^^---- Length PIN = 7 bytes
+      byte bmPINLengthFormat = (byte) 0x04;   // 000 0 0100
+                                              //     ^-------- System bit units is bit
+                                              //       ^^^^--- PIN length is at the 4th position bit
+      byte wPINMaxExtraDigitL = (byte) 0x04;  // Max=4 digits
+      byte wPINMaxExtraDigitH = (byte) 0x04;  // Min=4 digits
+      byte bEntryValidationCondition = 0x02;  // Max size reach or Validation key pressed
+      byte bNumberMessage = (byte) 0x00;      // No message
+      byte wLangIdL = (byte) 0x0C;            // - English?
+      byte wLangIdH = (byte) 0x04;            // \
+      byte bMsgIndex = (byte) 0x00;           // Default Msg
+
+      byte[] apdu = new byte[] {
+        (byte) 0x00, (byte) 0x20, (byte) 0x00, kid, (byte) 0x08,  // CLA INS P1 P2 LC
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,               // Data
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00                // Data
+      };
+
+      int offset = 0;
+      byte[] pinVerifyStructure = new byte[offset + 19 + apdu.length];
+      pinVerifyStructure[offset++] = bTimeOut;
+      pinVerifyStructure[offset++] = bTimeOut2;
+      pinVerifyStructure[offset++] = bmFormatString;
+      pinVerifyStructure[offset++] = bmPINBlockString;
+      pinVerifyStructure[offset++] = bmPINLengthFormat;
+      pinVerifyStructure[offset++] = wPINMaxExtraDigitL;
+      pinVerifyStructure[offset++] = wPINMaxExtraDigitH;
+      pinVerifyStructure[offset++] = bEntryValidationCondition;
+      pinVerifyStructure[offset++] = bNumberMessage;
+      pinVerifyStructure[offset++] = wLangIdL;
+      pinVerifyStructure[offset++] = wLangIdH;
+      pinVerifyStructure[offset++] = bMsgIndex;
+
+      pinVerifyStructure[offset++] = 0x00;
+      pinVerifyStructure[offset++] = 0x00;
+      pinVerifyStructure[offset++] = 0x00;
+
+      pinVerifyStructure[offset++] = (byte) apdu.length;
+      pinVerifyStructure[offset++] = 0x00;
+      pinVerifyStructure[offset++] = 0x00;
+      pinVerifyStructure[offset++] = 0x00;
+      System.arraycopy(apdu, 0, pinVerifyStructure, offset, apdu.length);
+
+      return pinVerifyStructure;
+  }
+  
+  public byte[] getPINModifyStructure(byte kid) {
+
+      byte bTimeOut = (byte) 00;            // Default time out
+      byte bTimeOut2 = (byte) 00;           // Default time out
+      byte bmFormatString = (byte) 0x82;      // 1 0001 0 01
+                                              // ^------------ System unit = byte
+                                              //   ^^^^------- PIN position in the frame = 1 byte
+                                              //        ^----- PIN justification left
+                                              //          ^^-- BCD format
+                                              // 1 0000 0 10
+                                              //          ^^-- ASCII format
+      byte bmPINBlockString = (byte) 0x08;    // 0100 0111
+                                              // ^^^^--------- PIN length size: 4 bits
+                                              //      ^^^^---- Length PIN = 7 bytes
+      byte bmPINLengthFormat = (byte) 0x00;   // 000 0 0100
+                                              //     ^-------- System bit units is bit
+                                              //       ^^^^--- PIN length is at the 4th position bit
+      byte bInsertionOffsetOld = (byte) 0x00; // insertion position offset in bytes
+      byte bInsertionOffsetNew = (byte) 0x00; // insertion position offset in bytes
+      byte wPINMaxExtraDigitL = (byte) 0x04;  // Min=4 digits
+      byte wPINMaxExtraDigitH = (byte) 0x04;  // Max=12 digits
+      byte bConfirmPIN = (byte) 0x00;         // ??? need for confirm pin
+      byte bEntryValidationCondition = 0x02;  // Max size reach or Validation key pressed
+      byte bNumberMessage = (byte) 0x00;      // No message
+      byte wLangIdL = (byte) 0x0C;            // - English?
+      byte wLangIdH = (byte) 0x04;            // \
+      byte bMsgIndex1 = (byte) 0x00;           // Default Msg
+      byte bMsgIndex2 = (byte) 0x00;           // Default Msg
+      byte bMsgIndex3 = (byte) 0x00;           // Default Msg
+
+      byte[] apdu = new byte[] {
+        (byte) 0x00, (byte) 0x24, (byte) 0x00, kid, (byte) 0x10,  // CLA INS P1 P2 LC
+        (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff,               // Data
+        (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,                // ...
+        (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff,               // Data
+        (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff                // ...
+      };
+
+      int offset = 0;
+      byte[] pinModifyStructure = new byte[offset + 24 + apdu.length];
+      pinModifyStructure[offset++] = bTimeOut;
+      pinModifyStructure[offset++] = bTimeOut2;
+      pinModifyStructure[offset++] = bmFormatString;
+      pinModifyStructure[offset++] = bmPINBlockString;
+      pinModifyStructure[offset++] = bmPINLengthFormat;
+      pinModifyStructure[offset++] = bInsertionOffsetOld;
+      pinModifyStructure[offset++] = bInsertionOffsetNew;
+      pinModifyStructure[offset++] = wPINMaxExtraDigitL;
+      pinModifyStructure[offset++] = wPINMaxExtraDigitH;
+      pinModifyStructure[offset++] = bConfirmPIN;
+      pinModifyStructure[offset++] = bEntryValidationCondition;
+      pinModifyStructure[offset++] = bNumberMessage;
+      pinModifyStructure[offset++] = wLangIdL;
+      pinModifyStructure[offset++] = wLangIdH;
+      pinModifyStructure[offset++] = bMsgIndex1;
+      pinModifyStructure[offset++] = bMsgIndex2;
+      pinModifyStructure[offset++] = bMsgIndex3;
+
+      pinModifyStructure[offset++] = 0x00;
+      pinModifyStructure[offset++] = 0x00;
+      pinModifyStructure[offset++] = 0x00;
+
+      pinModifyStructure[offset++] = (byte) apdu.length;
+      pinModifyStructure[offset++] = 0x00;
+      pinModifyStructure[offset++] = 0x00;
+      pinModifyStructure[offset++] = 0x00;
+      System.arraycopy(apdu, 0, pinModifyStructure, offset, apdu.length);
+
+      return pinModifyStructure;
+  }
+
+  @Override
+  public String toString() {
+    return "a-sign premium";
+  }
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
index 39952bb9..6587aaf9 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
@@ -33,12 +33,12 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.ResourceBundle;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.smartcardio.ATR;
 import javax.smartcardio.Card;
 import javax.smartcardio.CardChannel;
@@ -54,6 +54,14 @@ public abstract class AbstractSignatureCard implements SignatureCard {
 
   private static Log log = LogFactory.getLog(AbstractSignatureCard.class);
 
+  static final short GET_FEATURE_REQUEST = 3400;
+  
+  private static int getCtrlCode(short function) {
+    return 0x310000 | ((0xFFFF & function) << 2);
+  }
+
+  protected Map<Byte, Long> ifdCtrlCmds;
+
   protected List<PINSpec> pinSpecs = new ArrayList<PINSpec>();
 
   private ResourceBundle i18n;
@@ -106,11 +114,14 @@ public abstract class AbstractSignatureCard implements SignatureCard {
    */
   protected byte[] selectFileAID(byte[] dfName) throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
-    ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0xA4, 0x04,
-        0x00, dfName, 256));
+    ResponseAPDU resp = transmit(channel,
+            new CommandAPDU(0x00, 0xA4, 0x04, 0x00, dfName, 256));
+//            new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, dfName));
     if (resp.getSW() != 0x9000) {
-      throw new SignatureCardException("Failed to select application AID="
-          + toString(dfName) + ": SW=" + Integer.toHexString(resp.getSW()) + ".");
+      String msg = "Failed to select application AID=" + SMCCHelper.toString(dfName) +
+              ": SW=" + Integer.toHexString(resp.getSW());
+      log.error(msg);
+      throw new SignatureCardException(msg);
     } else {
       return resp.getBytes();
     }
@@ -119,10 +130,63 @@ public abstract class AbstractSignatureCard implements SignatureCard {
   protected abstract ResponseAPDU selectFileFID(byte[] fid) throws CardException,
       SignatureCardException;
 
-  protected abstract int verifyPIN(String pin, byte kid) 
+  /**
+   * VERIFY APDU without PIN BLOCK
+   * Not supported by ACOS cards (and GemPC Pinpad?)
+   * @param kid
+   * @return the number of possible tries until card is blocked or -1 if unknown
+   * (ACOS does not support this VERIFY APDU type)
+   * @throws at.gv.egiz.smcc.LockedException
+   * @throws at.gv.egiz.smcc.NotActivatedException
+   * @throws at.gv.egiz.smcc.SignatureCardException
+   */
+  protected abstract int verifyPIN(byte kid)
           throws LockedException, NotActivatedException, SignatureCardException;
 
-  
+  /**
+   * VERIFY APDU with PIN BLOCK
+   * If IFD supports VERIFY_PIN on pinpad, parameter pin may be empty.
+   * @param kid
+   * @param pin to be encoded in the PIN BLOCK
+   * @return -1 if VERIFY PIN was successful, or the number of possible retries
+   * @throws at.gv.egiz.smcc.LockedException
+   * @throws at.gv.egiz.smcc.NotActivatedException
+   * @throws at.gv.egiz.smcc.SignatureCardException
+   */
+  protected abstract int verifyPIN(byte kid, char[] pin)
+          throws LockedException, NotActivatedException, CancelledException, TimeoutException, SignatureCardException;
+
+  /**
+   * CHANGE(?) APDU
+   * If IFD supports VERIFY_PIN on pinpad, parameter pin may be empty.
+   * @param kid
+   * @param pin
+   * @throws at.gv.egiz.smcc.SignatureCardException if activation fails
+   */
+  protected abstract void activatePIN(byte kid, char[] pin)
+          throws CancelledException, TimeoutException, SignatureCardException;
+
+  /**
+   * CHANGE(?) APDU
+   * If IFD supports VERIFY_PIN on pinpad, parameter pin may be empty.
+   * @param kid
+   * @param pin
+   * @return -1 if CHANGE PIN was successful, or the number of possible retries
+   * @throws at.gv.egiz.smcc.SignatureCardException if change fails
+   */
+  protected abstract int changePIN(byte kid, char[] oldPin, char[] newPin)
+          throws CancelledException, TimeoutException, SignatureCardException;
+
+  /**
+   * encode the pin as needed in VERIFY/CHANGE APDUs
+   * @param pin
+   * @return
+   * @throws at.gv.egiz.smcc.SignatureCardException if the provided pin does
+   * not meet the restrictions imposed by the encoding (not the pinSpec!),
+   * such as maximum Length
+   */
+  protected abstract byte[] encodePINBlock(char[] pin) throws SignatureCardException;
+
   protected byte[] readRecord(int recordNumber) throws SignatureCardException, CardException {
     return readRecord(getCardChannel(), recordNumber);
   }
@@ -295,7 +359,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
    * @throws SignatureCardException
    * @throws CardException 
    */
-  protected byte[] readTLVFile(byte[] aid, byte[] ef, String pin, byte kid, int maxLength)
+  protected byte[] readTLVFile(byte[] aid, byte[] ef, char[] pin, byte kid, int maxLength)
       throws SignatureCardException, InterruptedException, CardException {
 
 
@@ -318,7 +382,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
 
     // VERIFY
     if (pin != null) {
-      int retries = verifyPIN(pin, kid);
+      int retries = verifyPIN(kid, pin);
       if (retries != -1) {
         throw new VerificationFailedException(retries);
       }
@@ -388,6 +452,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
       ifs_ = 0xFF & atr.getBytes()[6];
       log.trace("Setting IFS (information field size) to " + ifs_);
     }
+    ifdCtrlCmds = queryIFDFeatures();
   }
   
   @Override
@@ -446,39 +511,266 @@ public abstract class AbstractSignatureCard implements SignatureCard {
   }
 
   @Override
-  public int verifyPIN(PINSpec pinSpec, String pin) throws LockedException, NotActivatedException, SignatureCardException {
-
-    Card icc = getCard();
+  public void verifyPIN(PINSpec pinSpec, PINProvider pinProvider)
+          throws LockedException, NotActivatedException, CancelledException, TimeoutException, SignatureCardException, InterruptedException {
     try {
-      icc.beginExclusive();
-      CardChannel channel = icc.getBasicChannel();
+      getCard().beginExclusive();
 
       if (pinSpec.getContextAID() != null) {
-        ResponseAPDU responseAPDU = transmit(channel,
-                new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, pinSpec.getContextAID()));
-        if (responseAPDU.getSW() != 0x9000) {
-          icc.endExclusive();
-          String msg = "Failed to verify PIN " +
-                  SMCCHelper.toString(new byte[]{pinSpec.getKID()}) +
-                  ": Failed to verify AID " +
-                  SMCCHelper.toString(pinSpec.getContextAID()) +
-                  ": " + SMCCHelper.toString(responseAPDU.getBytes());
-          log.error(msg);
-          throw new SignatureCardException(msg);
-        }
+        selectFileAID(pinSpec.getContextAID());
       }
-      return verifyPIN(pin, pinSpec.getKID());
+
+      int retries = verifyPIN(pinSpec.getKID());
+      do {
+        char[] pin = pinProvider.providePIN(pinSpec, retries);
+        retries = verifyPIN(pinSpec.getKID(), pin);
+      } while (retries > 0);
+      //return on -1, 0 never reached: verifyPIN throws LockedEx
 
     } catch (CardException ex) {
-      log.error("failed to verify pinspec: " + ex.getMessage(), ex);
+      log.error("failed to verify " + pinSpec.getLocalizedName() +
+              ": " + ex.getMessage(), ex);
       throw new SignatureCardException(ex);
     } finally {
       try {
-        icc.endExclusive();
+        getCard().endExclusive();
+      } catch (CardException ex) {
+        log.trace("failed to end exclusive card access: " + ex.getMessage());
+      }
+    }
+  }
+
+  @Override
+  public void activatePIN(PINSpec pinSpec, PINProvider pinProvider)
+          throws CancelledException, SignatureCardException, CancelledException, TimeoutException, InterruptedException {
+   try {
+      getCard().beginExclusive();
+
+      if (pinSpec.getContextAID() != null) {
+        selectFileAID(pinSpec.getContextAID());
+      }
+      char[] pin = pinProvider.providePIN(pinSpec, -1);
+      activatePIN(pinSpec.getKID(), pin);
+      
+    } catch (CardException ex) {
+      log.error("Failed to activate " + pinSpec.getLocalizedName() +
+              ": " + ex.getMessage());
+      throw new SignatureCardException(ex.getMessage(), ex);
+    } finally {
+      try {
+        getCard().endExclusive();
       } catch (CardException ex) {
         log.trace("failed to end exclusive card access: " + ex.getMessage());
       }
+    }
+  }
+
+  /**
+   * activates pin (newPIN) if not active
+   * @param pinSpec
+   * @param oldPIN
+   * @param newPIN
+   * @throws at.gv.egiz.smcc.LockedException
+   * @throws at.gv.egiz.smcc.VerificationFailedException
+   * @throws at.gv.egiz.smcc.NotActivatedException
+   * @throws at.gv.egiz.smcc.SignatureCardException
+   */
+  @Override
+  public void changePIN(PINSpec pinSpec, ChangePINProvider pinProvider)
+          throws LockedException, NotActivatedException, CancelledException, TimeoutException, SignatureCardException, InterruptedException {
+    try {
+      getCard().beginExclusive();
+
+      if (pinSpec.getContextAID() != null) {
+        selectFileAID(pinSpec.getContextAID());
+      }
+
+      int retries = verifyPIN(pinSpec.getKID());
+      do {
+        char[] newPin = pinProvider.providePIN(pinSpec, retries);
+        char[] oldPin = pinProvider.provideOldPIN(pinSpec, retries);
+        retries = changePIN(pinSpec.getKID(), oldPin, newPin);
+      } while (retries > 0);
+      //return on -1, 0 never reached: verifyPIN throws LockedEx
 
+    } catch (CardException ex) {
+      log.error("Failed to change " + pinSpec.getLocalizedName() +
+              ": " + ex.getMessage());
+      throw new SignatureCardException(ex.getMessage(), ex);
+    } finally {
+      try {
+        getCard().endExclusive();
+      } catch (CardException ex) {
+        log.trace("failed to end exclusive card access: " + ex.getMessage());
+      }
     }
   }
+
+  @Override
+  public void unblockPIN(PINSpec pinSpec, PINProvider pinProvider)
+          throws CancelledException, SignatureCardException, InterruptedException {
+    throw new SignatureCardException("Unblock not supported yet");
+  }
+
+  /////////////////////////////////////////////////////////////////////////////
+  // IFD related code
+  /////////////////////////////////////////////////////////////////////////////
+
+  /**
+   * TODO implement VERIFY_PIN_START/FINISH (feature 0x01/0x02)
+   * @return
+   */
+  @Override
+  public boolean ifdSupportsFeature(byte feature) {
+    if (ifdCtrlCmds != null) {
+      return ifdCtrlCmds.containsKey(feature);
+    }
+    return false;
+  }
+
+  protected Map<Byte, Long> queryIFDFeatures() {
+
+    if (card_ == null) {
+      throw new NullPointerException("Need connected smart card to query IFD features");
+    }
+
+    Map<Byte, Long> ifdFeatures = new HashMap<Byte, Long>();
+
+    try {
+      if (log.isTraceEnabled()) {
+        log.trace("GET_FEATURE_REQUEST CtrlCode " + Integer.toHexString(getCtrlCode(GET_FEATURE_REQUEST)));
+      }
+      byte[] resp = card_.transmitControlCommand(getCtrlCode(GET_FEATURE_REQUEST), new byte[]{});
+
+      if (log.isTraceEnabled()) {
+        log.trace("GET_FEATURE_REQUEST Response " + SMCCHelper.toString(resp));
+      }
+
+      for (int i = 0; i + 5 < resp.length; i += 6) {
+        Byte feature = new Byte(resp[i]);
+        Long ctrlCode = new Long(
+          ((0xFF & resp[i + 2]) << 24) |
+          ((0xFF & resp[i + 3]) << 16) |
+          ((0xFF & resp[i + 4]) << 8) |
+           (0xFF & resp[i + 5]));
+        if (log.isInfoEnabled()) {
+          log.info("IFD supports feature " + Integer.toHexString(feature.byteValue()) +
+                  ": " + Long.toHexString(ctrlCode.longValue()));
+        }
+        ifdFeatures.put(feature, ctrlCode);
+      }
+
+    } catch (CardException ex) {
+      log.debug("Failed to query IFD features: " + ex.getMessage());
+      log.trace(ex);
+      log.info("IFD does not support PINPad");
+      return null;
+    }
+    return ifdFeatures;
+  }
+
+
+  protected byte ifdGetKeyPressed() throws CardException {
+    if (ifdSupportsFeature(FEATURE_VERIFY_PIN_DIRECT)) {
+
+      Long controlCode = (Long) ifdCtrlCmds.get(new Byte((byte) 0x05));
+
+      byte key = 0x00;
+      while (key == 0x00) {
+
+        byte[] resp = card_.transmitControlCommand(controlCode.intValue(), new byte[] {});
+
+        if (resp != null && resp.length > 0) {
+          key = resp[0];
+        }
+      }
+
+      System.out.println("Key: " + key);
+
+    }
+
+    return 0x00;
+  }
+
+  protected byte[] ifdVerifyPINFinish() throws CardException {
+    if (ifdSupportsFeature(FEATURE_VERIFY_PIN_DIRECT)) {
+
+      Long controlCode = (Long) ifdCtrlCmds.get(new Byte((byte) 0x02));
+
+      byte[] resp = card_.transmitControlCommand(controlCode.intValue(), new byte[] {});
+
+      System.out.println("CommandResp: " + toString(resp));
+
+      return resp;
+
+    }
+
+    return null;
+  }
+
+
+  /**
+   * assumes ifdSupportsVerifyPIN() == true
+   * @param pinVerifyStructure
+   * @return
+   * @throws javax.smartcardio.CardException
+   */
+//  protected byte[] ifdVerifyPIN(byte[] pinVerifyStructure) throws CardException {
+//
+////      Long ctrlCode = (Long) ifdFeatures.get(FEATURE_IFD_PIN_PROPERTIES);
+////      if (ctrlCode != null) {
+////        if (log.isTraceEnabled()) {
+////          log.trace("PIN_PROPERTIES CtrlCode " + Integer.toHexString(ctrlCode.intValue()));
+////        }
+////        byte[] resp = card_.transmitControlCommand(ctrlCode.intValue(), new byte[] {});
+////
+////        if (log.isTraceEnabled()) {
+////          log.trace("PIN_PROPERTIES Response " + SMCCHelper.toString(resp));
+////        }
+////      }
+//
+//
+//      Long ctrlCode = (Long) ifdFeatures.get(FEATURE_VERIFY_PIN_DIRECT);
+//      if (ctrlCode == null) {
+//        throw new NullPointerException("no CtrlCode for FEATURE_VERIFY_PIN_DIRECT");
+//      }
+//
+//      if (log.isTraceEnabled()) {
+//        log.trace("VERIFY_PIN_DIRECT CtrlCode " + Integer.toHexString(ctrlCode.intValue()) +
+//                ", PIN_VERIFY_STRUCTURE " + SMCCHelper.toString(pinVerifyStructure));
+//      }
+//      byte[] resp = card_.transmitControlCommand(ctrlCode.intValue(), pinVerifyStructure);
+//
+//      if (log.isTraceEnabled()) {
+//        log.trace("VERIFY_PIN_DIRECT Response " + SMCCHelper.toString(resp));
+//      }
+//      return resp;
+//  }
+
+//  protected Long getControlCode(Byte feature) {
+//    if (ifdFeatures != null) {
+//      return ifdFeatures.get(feature);
+//    }
+//    return null;
+//  }
+
+  protected byte[] transmitControlCommand(Long ctrlCode, byte[] ctrlCommand)
+          throws CardException {
+//    Long ctrlCode = (Long) ifdFeatures.get(feature);
+    if (ctrlCode == null) {
+      throw new NullPointerException("ControlCode " +
+              Integer.toHexString(ctrlCode.intValue()) + " not supported");
+    }
+    if (log.isTraceEnabled()) {
+      log.trace("CtrlCommand (" + Integer.toHexString(ctrlCode.intValue()) +
+              ")  " + SMCCHelper.toString(ctrlCommand));
+    }
+    byte[] resp = card_.transmitControlCommand(ctrlCode.intValue(), ctrlCommand);
+
+    if (log.isTraceEnabled()) {
+      log.trace("CtrlCommand Response " + SMCCHelper.toString(resp));
+    }
+    return resp;
+  }
+
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ChangePINProvider.java b/smcc/src/main/java/at/gv/egiz/smcc/ChangePINProvider.java
new file mode 100644
index 00000000..d0622aa4
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ChangePINProvider.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.smcc;
+
+import at.gv.egiz.smcc.*;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public interface ChangePINProvider extends PINProvider {
+
+  /**
+   *
+   * @param spec
+   * @param retries
+   * @return null if no old value for this pin
+   * @throws at.gv.egiz.smcc.CancelledException if cancelled by user
+   * @throws java.lang.InterruptedException
+   */
+  public char[] provideOldPIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException;
+
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/PINProvider.java b/smcc/src/main/java/at/gv/egiz/smcc/PINProvider.java
index e0104618..8fa80dcb 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/PINProvider.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/PINProvider.java
@@ -28,8 +28,30 @@
 //
 package at.gv.egiz.smcc;
 
+/**
+ * The number of retries is not fixed and there is no way (?) to obtain this value.
+ * A PINProvider should therefore maintain an internal retry counter or flag
+ * to decide whether or not to warn the user (num retries passed in providePIN).
+ *
+ * Therefore PINProvider objects should not be reused.
+ *
+ * (ACOS: reload counter: between 0 and 15, where 15 meens deactivated)
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
 public interface PINProvider {
-  
-  public String providePIN(PINSpec spec, int retries) throws InterruptedException;
+
+  /**
+   *
+   * @param spec
+   * @param retries num of remaining retries or -1 if unknown
+   * (a positive value does <em>not</em> necessarily signify that there was
+   * already an unsuccessful PIN verification)
+   * @return pin != null
+   * @throws at.gv.egiz.smcc.CancelledException
+   * @throws java.lang.InterruptedException
+   */
+  public char[] providePIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException;
 
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
index 3c5f38a2..91245c50 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
@@ -30,7 +30,6 @@ package at.gv.egiz.smcc;
 
 import at.gv.egiz.smcc.util.SMCCHelper;
 import java.util.Arrays;
-import javax.smartcardio.Card;
 import javax.smartcardio.CardChannel;
 import javax.smartcardio.CardException;
 import javax.smartcardio.CommandAPDU;
@@ -223,15 +222,12 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
         //new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
         
         int retries = -1;
-        String pin = null;
+        char[] pin = null;
         boolean pinRequiered = false;
 
         do {
           if (pinRequiered) {
             pin = provider.providePIN(spec, retries);
-            if (pin == null) {
-              throw new CancelledException();
-            }
           }
           try {
             getCard().beginExclusive();
@@ -240,7 +236,7 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
             throw new NotActivatedException();
           } catch (SecurityStatusNotSatisfiedException e) {
             pinRequiered = true;
-            retries = verifyPIN(null, KID_PIN_CARD);
+            retries = verifyPIN(KID_PIN_CARD);
           } catch (VerificationFailedException e) {
             pinRequiered = true;
             retries = e.getRetries();
@@ -316,20 +312,17 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
         //new PINSpec(6, 10, "[0-9]", getResourceBundle().getString("sig.pin.name"));
         
         int retries = -1;
-        String pin = null;
+        char[] pin = null;
 
         do {
           try {
             getCard().beginExclusive();
             selectFileAID(AID_DF_SS);
-            retries = verifyPIN(null, KID_PIN_SS);
+            retries = verifyPIN(KID_PIN_SS); //, null);
           } finally {
             getCard().endExclusive();
           }
           pin = provider.providePIN(spec, retries);
-          if (pin == null) {
-            throw new CancelledException();
-          }
           try {
             getCard().beginExclusive();
             return createSignature(hash, AID_DF_SS, pin, KID_PIN_SS, DST_SS);
@@ -349,15 +342,12 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
         //new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
  
         int retries = -1;
-        String pin = null;
+        char[] pin = null;
         boolean pinRequiered = false;
 
         do {
           if (pinRequiered) {
             pin = provider.providePIN(spec, retries);
-            if (pin == null) {
-              throw new CancelledException();
-            }
           }
           try {
             getCard().beginExclusive();
@@ -366,7 +356,7 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
             throw new NotActivatedException();
           } catch (SecurityStatusNotSatisfiedException e) {
             pinRequiered = true;
-            retries = verifyPIN(null, KID_PIN_CARD);
+            retries = verifyPIN(KID_PIN_CARD);
           } catch (VerificationFailedException e) {
             pinRequiered = true;
             retries = e.getRetries();
@@ -389,13 +379,18 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
   
   }
 
+
+  ////////////////////////////////////////////////////////////////////////
+  // PROTECTED METHODS (assume exclusive card access)
+  ////////////////////////////////////////////////////////////////////////
+
   protected ResponseAPDU selectFileFID(byte[] fid) throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
     return transmit(channel, new CommandAPDU(0x00, 0xA4, 0x02,
         0x04, fid, 256));
   }
 
-  private byte[] createSignature(byte[] hash, byte[] aid, String pin, byte kid,
+  private byte[] createSignature(byte[] hash, byte[] aid, char[] pin, byte kid,
       byte[] dst) throws CardException, SignatureCardException {
     
     // SELECT MF
@@ -403,7 +398,7 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
     // SELECT DF
     selectFileAID(aid);
     // VERIFY
-    int retries = verifyPIN(pin, kid);
+    int retries = verifyPIN(kid, pin);
     if (retries != -1) {
       throw new VerificationFailedException(retries);
     }
@@ -417,7 +412,6 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
     
   }
 
-  
   private void selectMF() throws CardException, SignatureCardException {
     CardChannel channel = getCardChannel();
     ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0xA4, 0x00,
@@ -467,58 +461,85 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
     }
   }
 
-  /**
-   * VERIFY PIN
-   * <p>
-   * If <code>pin</code> is <code>null</code> only the PIN status is checked and
-   * returned.
-   * </p>
-   * 
-   * @param pin
-   *          the PIN (may be <code>null</code>)
-   * @param kid
-   *          the KID of the PIN to be verified
-   * 
-   * @return -1 if VERIFY PIN was successful, or the number of possible retries 
-   *
-   * @throws LockedException
-   *            if the pin is locked
-   * @throws NotActivatedException
-   *           if the card application has not been activated
-   * @throws SignatureCardException
-   *           if VERIFY PIN fails for some other reason (card communication error)
-   */
   @Override
-  public int verifyPIN(String pin, byte kid) throws LockedException, NotActivatedException, SignatureCardException {
+  protected int verifyPIN(byte kid, char[] pin)
+          throws LockedException, NotActivatedException, SignatureCardException {
     try {
-      CardChannel channel = getCardChannel();
-
-      ResponseAPDU resp;
-      if (pin == null) {
-        resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid));
+      byte[] sw;
+      if (ifdSupportsFeature(FEATURE_VERIFY_PIN_DIRECT)) {
+        log.debug("verify PIN on IFD");
+        sw = transmitControlCommand(
+                ifdCtrlCmds.get(FEATURE_VERIFY_PIN_DIRECT),
+                getPINVerifyStructure(kid));
+//        int sw = (resp[resp.length-2] & 0xff) << 8 | resp[resp.length-1] & 0xff;
       } else {
-        // BCD encode PIN and marshal PIN block
         byte[] pinBlock = encodePINBlock(pin);
-        resp = transmit(channel, new CommandAPDU(0x00, 0x20, 0x00, kid, pinBlock), false);
+        CardChannel channel = getCardChannel();
+        ResponseAPDU resp = transmit(channel,
+                new CommandAPDU(0x00, 0x20, 0x00, kid, pinBlock), false);
+        sw = new byte[2];
+        sw[0] = (byte) resp.getSW1();
+        sw[1] = (byte) resp.getSW2();
+      }
 
+      if (sw[0] == (byte) 0x90 && sw[1] == (byte) 0x00) {
+        return -1;
+      } else if (sw[0] == (byte) 0x63 && sw[1] == (byte) 0xc0) {
+        throw new LockedException("[63:c0]");
+      } else if (sw[0] == (byte) 0x63 && (sw[1] & 0xf0) >> 4 == 0xc) {
+        return sw[1] & 0x0f;
+      } else if (sw[0] == (byte) 0x69 && sw[1] == (byte) 0x83) {
+        //Authentisierungsmethode gesperrt
+        throw new LockedException("[69:83]");
+      } else if (sw[0] == (byte) 0x69 && sw[1] == (byte) 0x84) {
+        //referenzierte Daten sind reversibel gesperrt (invalidated)
+        throw new NotActivatedException("[69:84]");
+      } else if (sw[0] == (byte) 0x69 && sw[1] == (byte) 0x85) {
+        //Benutzungsbedingungen nicht erfüllt
+        throw new NotActivatedException("[69:85]");
+      } else if (sw[0] == (byte) 0x64 && sw[1] == (byte) 0x00) {
+        throw new TimeoutException("[64:00]");
+      } else if (sw[0] == (byte) 0x64 && sw[1] == (byte) 0x01) {
+        throw new CancelledException("[64:01]");
       }
+      log.error("Failed to verify pin: SW="
+              + SMCCHelper.toString(sw));
+      throw new SignatureCardException(SMCCHelper.toString(sw));
+      
+    } catch (CardException ex) {
+      log.error("smart card communication failed: " + ex.getMessage());
+      throw new SignatureCardException("smart card communication failed: " + ex.getMessage(), ex);
+    }
+  }
 
-      if (resp.getSW() == 0x63c0) {
-        throw new LockedException("PIN locked.");
-      } else if (resp.getSW1() == 0x63 && resp.getSW2() >> 4 == 0xc) {
-        // return number of possible retries
+  @Override
+  protected int verifyPIN(byte kid)
+          throws LockedException, NotActivatedException, SignatureCardException {
+    try {
+      CardChannel channel = getCardChannel();
+      ResponseAPDU resp = transmit(channel,
+              new CommandAPDU(0x00, 0x20, 0x00, kid), false);
+
+      if (resp.getSW() == 0x9000) {
+        return -1;
+      } else if (resp.getSW() == 0x63c0) {
+        throw new LockedException("[63:c0]");
+      } else if (resp.getSW1() == 0x63 && (resp.getSW2() & 0xf0) >> 4 == 0xc) {
         return resp.getSW2() & 0x0f;
       } else if (resp.getSW() == 0x6983) {
-        throw new LockedException();
+        //Authentisierungsmethode gesperrt
+        throw new LockedException("[69:83]");
       } else if (resp.getSW() == 0x6984) {
-        // PIN LCS = "Initialized" (-> not activated)
-        throw new NotActivatedException();
-      } else if (resp.getSW() == 0x9000) {
-        return -1; // success
-      } else {
-        throw new SignatureCardException("Failed to verify pin: SW="
-            + Integer.toHexString(resp.getSW()));
+        //referenzierte Daten sind reversibel gesperrt (invalidated)
+        throw new NotActivatedException("[69:84]");
+      } else if (resp.getSW() == 0x6985) {
+        //Benutzungsbedingungen nicht erfüllt
+        throw new NotActivatedException("[69:85]");
       }
+      log.error("Failed to verify pin: SW="
+              + Integer.toHexString(resp.getSW()));
+      throw new SignatureCardException("[" + Integer.toHexString(resp.getSW()) + "]");
+
     } catch (CardException ex) {
       log.error("smart card communication failed: " + ex.getMessage());
       throw new SignatureCardException("smart card communication failed: " + ex.getMessage(), ex);
@@ -526,24 +547,95 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
   }
 
   @Override
-  public void reset() throws SignatureCardException {
+  protected int changePIN(byte kid, char[] oldPin, char[] newPin)
+          throws LockedException, NotActivatedException, CancelledException, TimeoutException, SignatureCardException {
     try {
-      super.reset();
-      log.debug("select MF (e-card workaround)");
-      CardChannel channel = getCardChannel();
-      ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0xA4, 0x00, 0x0C));
-      if (resp.getSW() != 0x9000) {
-        throw new SignatureCardException("Failed to select MF after RESET: SW=" + Integer.toHexString(resp.getSW()) + ".");
+      byte[] sw;
+      if (ifdSupportsFeature(FEATURE_MODIFY_PIN_DIRECT)) {
+        log.debug("modify PIN on IFD");
+        sw = transmitControlCommand(
+                ifdCtrlCmds.get(FEATURE_MODIFY_PIN_DIRECT),
+                getPINModifyStructure(kid));
+//        int sw = (resp[resp.length-2] & 0xff) << 8 | resp[resp.length-1] & 0xff;
+      } else {
+        byte[] cmd = new byte[16];
+        System.arraycopy(encodePINBlock(oldPin), 0, cmd, 0, 8);
+        System.arraycopy(encodePINBlock(newPin), 0, cmd, 8, 8);
+
+        CardChannel channel = getCardChannel();
+
+        ResponseAPDU resp = transmit(channel,
+                new CommandAPDU(0x00, 0x24, 0x00, kid, cmd), false);
+
+        sw = new byte[2];
+        sw[0] = (byte) resp.getSW1();
+        sw[1] = (byte) resp.getSW2();
+      }
+
+      // activates pin (newPIN) if not active
+      if (sw[0] == (byte) 0x90 && sw[1] == (byte) 0x00) {
+        return -1;
+      } else if (sw[0] == (byte) 0x63 && sw[1] == (byte) 0xc0) {
+        throw new LockedException("[63:c0]");
+      } else if (sw[0] == (byte) 0x63 && (sw[1] & 0xf0) >> 4 == 0xc) {
+        return sw[1] & 0x0f;
+      } else if (sw[0] == (byte) 0x69 && sw[1] == (byte) 0x83) {
+        //Authentisierungsmethode gesperrt
+        throw new LockedException("[69:83]");
+//      } else if (sw[0] == (byte) 0x69 && sw[1] == (byte) 0x84) {
+//        //referenzierte Daten sind reversibel gesperrt (invalidated)
+//        throw new NotActivatedException("[69:84]");
+//      } else if (sw[0] == (byte) 0x69 && sw[1] == (byte) 0x85) {
+//        //Benutzungsbedingungen nicht erfüllt
+//        throw new NotActivatedException("[69:85]");
+      } else if (sw[0] == (byte) 0x64 && sw[1] == (byte) 0x00) {
+        throw new TimeoutException("[64:00]");
+      } else if (sw[0] == (byte) 0x64 && sw[1] == (byte) 0x01) {
+        throw new CancelledException("[64:01]");
       }
+      log.error("Failed to change pin: SW="
+              + SMCCHelper.toString(sw));
+      throw new SignatureCardException(SMCCHelper.toString(sw));
     } catch (CardException ex) {
-      log.error("Failed to select MF after RESET: " + ex.getMessage(), ex);
-      throw new SignatureCardException("Failed to select MF after RESET");
+      log.error("smart card communication failed: " + ex.getMessage());
+      throw new SignatureCardException("smart card communication failed: " + ex.getMessage(), ex);
     }
   }
 
+  @Override
+  protected void activatePIN(byte kid, char[] pin)
+          throws CancelledException, TimeoutException, SignatureCardException {
+    try {
+      CardChannel channel = getCardChannel();
+      ResponseAPDU resp = transmit(channel,
+              new CommandAPDU(0x00, 0x24, 0x01, kid, encodePINBlock(pin)), false);
+
+      log.trace("activate pin returned SW=" + Integer.toHexString(resp.getSW()));
 
-  public String toString() {
-    return "e-card";
+      if (resp.getSW1() == 0x9000) {
+        return;
+      } else if (resp.getSW() == 0x6983) {
+        //Authentisierungsmethode gesperrt
+        throw new LockedException("[69:83]");
+      } else if (resp.getSW() == 0x6984) {
+        //referenzierte Daten sind reversibel gesperrt (invalidated)
+        throw new NotActivatedException("[69:84]");
+      } else if (resp.getSW() == 0x6985) {
+        //Benutzungsbedingungen nicht erfüllt
+        throw new NotActivatedException("[69:85]");
+      } else if (resp.getSW() == 0x6400) {
+        throw new TimeoutException("[64:00]");
+      } else if (resp.getSW() == 0x6401) {
+        throw new CancelledException("[64:01]");
+      }
+      log.error("Failed to activate pin: SW=" +
+              Integer.toHexString(resp.getSW()));
+      throw new SignatureCardException("[" + Integer.toHexString(resp.getSW()) + "]");
+
+    } catch (CardException ex) {
+      log.error("smart card communication failed: " + ex.getMessage());
+      throw new SignatureCardException("smart card communication failed: " + ex.getMessage(), ex);
+    }
   }
 
   /**
@@ -552,17 +644,20 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
    * @return a 8 byte pin block consisting of length byte (0x2X),
    * the BCD encoded pin and a 0xFF padding
    */
-  private byte[] encodePINBlock(String pin) {
-    char[] pinChars = pin.toCharArray();
-    int numDigits = pinChars.length;
+  @Override
+  protected byte[] encodePINBlock(char[] pin) throws SignatureCardException {
+    if (pin == null || pin.length > 12) {
+      throw new SignatureCardException("invalid pin: " + pin);
+    }
+    int numDigits = pin.length;
     int numBytes = (int) Math.ceil(numDigits/2.0);
 
     byte[] pinBlock = new byte[8];
     pinBlock[0] = (byte) (0x20 | numDigits);
 
     for (int i = 0; i < numBytes; i++) {
-      int p1 = 16*Character.digit(pinChars[i*2], 16);
-      int p2 = (i*2+1 < numDigits) ? Character.digit(pinChars[i*2+1], 16) : 0xf;
+      int p1 = 16*Character.digit(pin[i*2], 16);
+      int p2 = (i*2+1 < numDigits) ? Character.digit(pin[i*2+1], 16) : 0xf;
       pinBlock[i+1] = (byte) (p1 + p2);
     }
     Arrays.fill(pinBlock, numBytes + 1, pinBlock.length, (byte) 0xff);
@@ -570,111 +665,151 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
 
     return pinBlock;
   }
+  
+  private byte[] getPINVerifyStructure(byte kid) {
+      
+      byte bTimeOut = (byte) 00;            // Default time out
+      byte bTimeOut2 = (byte) 00;           // Default time out
+      byte bmFormatString = (byte) 0x89;      // 1 0001 0 01 
+                                              // ^------------ System unit = byte
+                                              //   ^^^^------- PIN position in the frame = 1 byte
+                                              //        ^----- PIN justification left
+                                              //          ^^-- BCD format
+      byte bmPINBlockString = (byte) 0x47;    // 0100 0111
+                                              // ^^^^--------- PIN length size: 4 bits
+                                              //      ^^^^---- Length PIN = 7 bytes
+      byte bmPINLengthFormat = (byte) 0x04;   // 000 0 0100
+                                              //     ^-------- System bit units is bit
+                                              //       ^^^^--- PIN length is at the 4th position bit
+      byte wPINMaxExtraDigitL = (byte) 0x04;  // Max=4 digits
+      byte wPINMaxExtraDigitH = (byte) 0x04;  // Min=4 digits
+      byte bEntryValidationCondition = 0x02;  // Max size reach or Validation key pressed
+      byte bNumberMessage = (byte) 0x00;      // No message
+      byte wLangIdL = (byte) 0x0C;            // - English?
+      byte wLangIdH = (byte) 0x04;            // \
+      byte bMsgIndex = (byte) 0x00;           // Default Msg
+
+      byte[] apdu = new byte[] {
+        (byte) 0x00, (byte) 0x20, (byte) 0x00, kid, (byte) 0x08,  // CLA INS P1 P2 LC
+        (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff,               // Data
+        (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff                // ...
+      };
+
+      int offset = 0;
+      byte[] pinVerifyStructure = new byte[offset + 19 + apdu.length];
+      pinVerifyStructure[offset++] = bTimeOut;
+      pinVerifyStructure[offset++] = bTimeOut2;
+      pinVerifyStructure[offset++] = bmFormatString;
+      pinVerifyStructure[offset++] = bmPINBlockString;
+      pinVerifyStructure[offset++] = bmPINLengthFormat;
+      pinVerifyStructure[offset++] = wPINMaxExtraDigitL;
+      pinVerifyStructure[offset++] = wPINMaxExtraDigitH;
+      pinVerifyStructure[offset++] = bEntryValidationCondition;
+      pinVerifyStructure[offset++] = bNumberMessage;
+      pinVerifyStructure[offset++] = wLangIdL;
+      pinVerifyStructure[offset++] = wLangIdH;
+      pinVerifyStructure[offset++] = bMsgIndex;
+      
+      pinVerifyStructure[offset++] = 0x00;
+      pinVerifyStructure[offset++] = 0x00;
+      pinVerifyStructure[offset++] = 0x00;
+      
+      pinVerifyStructure[offset++] = (byte) apdu.length;
+      pinVerifyStructure[offset++] = 0x00;
+      pinVerifyStructure[offset++] = 0x00;
+      pinVerifyStructure[offset++] = 0x00;
+      System.arraycopy(apdu, 0, pinVerifyStructure, offset, apdu.length);
 
-  @Override
-  public void activatePIN(PINSpec pinSpec, String pin)
-          throws SignatureCardException {
-    Card icc = getCard();
-    try {
-      icc.beginExclusive();
-      CardChannel channel = icc.getBasicChannel();
-
-      if (pinSpec.getContextAID() != null) {
-        ResponseAPDU responseAPDU = transmit(channel,
-                new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, pinSpec.getContextAID()));
-        if (responseAPDU.getSW() != 0x9000) {
-          icc.endExclusive();
-          String msg = "Select AID " + SMCCHelper.toString(pinSpec.getContextAID()) +
-                  ": SW=" + Integer.toHexString(responseAPDU.getSW());
-          log.error(msg);
-          throw new SignatureCardException(msg);
-        }
-      }
-
-      ResponseAPDU responseAPDU = transmit(channel,
-              new CommandAPDU(0x00, 0x24, 0x01, pinSpec.getKID(), encodePINBlock(pin)),
-              false);
-
-      icc.endExclusive();
-
-      log.debug("activate pin returned SW=" + Integer.toHexString(responseAPDU.getSW()));
+      return pinVerifyStructure;
+  }
 
-       if (responseAPDU.getSW() != 0x9000) {
-        String msg = "Failed to activate " + pinSpec.getLocalizedName() +
-                ": SW=" + Integer.toHexString(responseAPDU.getSW());
-        log.error(msg);
-        throw new SignatureCardException(msg);
-      }
-    } catch (CardException ex) {
-      log.error("Failed to activate " + pinSpec.getLocalizedName() +
-              ": " + ex.getMessage());
-      throw new SignatureCardException(ex.getMessage(), ex);
-    }
+  private byte[] getPINModifyStructure(byte kid) {
+
+      byte bTimeOut = (byte) 00;            // Default time out
+      byte bTimeOut2 = (byte) 00;           // Default time out
+      byte bmFormatString = (byte) 0x89;      // 1 0001 0 01
+                                              // ^------------ System unit = byte
+                                              //   ^^^^------- PIN position in the frame = 1 byte
+                                              //        ^----- PIN justification left
+                                              //          ^^-- BCD format
+      byte bmPINBlockString = (byte) 0x47;    // 0100 0111
+                                              // ^^^^--------- PIN length size: 4 bits
+                                              //      ^^^^---- Length PIN = 7 bytes
+      byte bmPINLengthFormat = (byte) 0x04;   // 000 0 0100
+                                              //     ^-------- System bit units is bit
+                                              //       ^^^^--- PIN length is at the 4th position bit
+      byte bInsertionOffsetOld = (byte) 0x01; // insertion position offset in bytes
+      byte bInsertionOffsetNew = (byte) 0x08; // insertion position offset in bytes
+      byte wPINMaxExtraDigitL = (byte) 0x04;  // Min=4 digits
+      byte wPINMaxExtraDigitH = (byte) 0x04;  // Max=12 digits
+      byte bConfirmPIN = (byte) 0x00;         // ??? need for confirm pin
+      byte bEntryValidationCondition = 0x02;  // Max size reach or Validation key pressed
+      byte bNumberMessage = (byte) 0x00;      // No message
+      byte wLangIdL = (byte) 0x0C;            // - English?
+      byte wLangIdH = (byte) 0x04;            // \
+      byte bMsgIndex1 = (byte) 0x00;           // Default Msg
+      byte bMsgIndex2 = (byte) 0x00;           // Default Msg
+      byte bMsgIndex3 = (byte) 0x00;           // Default Msg
+
+      byte[] apdu = new byte[] {
+        (byte) 0x00, (byte) 0x24, (byte) 0x00, kid, (byte) 0x10,  // CLA INS P1 P2 LC
+        (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff,               // Data
+        (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,                // ...
+        (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff,               // Data
+        (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff                // ...
+      };
+
+      int offset = 0;
+      byte[] pinModifyStructure = new byte[offset + 24 + apdu.length];
+      pinModifyStructure[offset++] = bTimeOut;
+      pinModifyStructure[offset++] = bTimeOut2;
+      pinModifyStructure[offset++] = bmFormatString;
+      pinModifyStructure[offset++] = bmPINBlockString;
+      pinModifyStructure[offset++] = bmPINLengthFormat;
+      pinModifyStructure[offset++] = bInsertionOffsetOld;
+      pinModifyStructure[offset++] = bInsertionOffsetNew;
+      pinModifyStructure[offset++] = wPINMaxExtraDigitL;
+      pinModifyStructure[offset++] = wPINMaxExtraDigitH;
+      pinModifyStructure[offset++] = bConfirmPIN;
+      pinModifyStructure[offset++] = bEntryValidationCondition;
+      pinModifyStructure[offset++] = bNumberMessage;
+      pinModifyStructure[offset++] = wLangIdL;
+      pinModifyStructure[offset++] = wLangIdH;
+      pinModifyStructure[offset++] = bMsgIndex1;
+      pinModifyStructure[offset++] = bMsgIndex2;
+      pinModifyStructure[offset++] = bMsgIndex3;
+
+      pinModifyStructure[offset++] = 0x00;
+      pinModifyStructure[offset++] = 0x00;
+      pinModifyStructure[offset++] = 0x00;
+
+      pinModifyStructure[offset++] = (byte) apdu.length;
+      pinModifyStructure[offset++] = 0x00;
+      pinModifyStructure[offset++] = 0x00;
+      pinModifyStructure[offset++] = 0x00;
+      System.arraycopy(apdu, 0, pinModifyStructure, offset, apdu.length);
+
+//      log.debug("PIN MODIFY " + SMCCHelper.toString(pinModifyStructure));
+      return pinModifyStructure;
   }
 
-  /**
-   * activates pin (newPIN) if not active
-   * @param pinSpec
-   * @param oldPIN
-   * @param newPIN
-   * @throws at.gv.egiz.smcc.LockedException
-   * @throws at.gv.egiz.smcc.VerificationFailedException
-   * @throws at.gv.egiz.smcc.NotActivatedException
-   * @throws at.gv.egiz.smcc.SignatureCardException
-   */
   @Override
-  public void changePIN(PINSpec pinSpec, String oldPIN, String newPIN)
-          throws LockedException, VerificationFailedException, NotActivatedException, SignatureCardException {
-    Card icc = getCard();
+  public void reset() throws SignatureCardException {
     try {
-      icc.beginExclusive();
-      CardChannel channel = icc.getBasicChannel();
-
-      if (pinSpec.getContextAID() != null) {
-        ResponseAPDU responseAPDU = transmit(channel,
-                new CommandAPDU(0x00, 0xa4, 0x04, 0x0c, pinSpec.getContextAID()));
-        if (responseAPDU.getSW() != 0x9000) {
-          icc.endExclusive();
-          String msg = "Select AID " + SMCCHelper.toString(pinSpec.getContextAID()) +
-                  ": SW=" + Integer.toHexString(responseAPDU.getSW());
-          log.error(msg);
-          throw new SignatureCardException(msg);
-        }
-      }
-
-      byte[] cmd = new byte[16];
-      System.arraycopy(encodePINBlock(oldPIN), 0, cmd, 0, 8);
-      System.arraycopy(encodePINBlock(newPIN), 0, cmd, 8, 8);
-
-      ResponseAPDU responseAPDU = transmit(channel,
-              new CommandAPDU(0x00, 0x24, 0x00, pinSpec.getKID(), cmd), false);
-
-      icc.endExclusive();
-
-      log.debug("change pin returned SW=" + Integer.toHexString(responseAPDU.getSW()));
-
-      // activates pin (newPIN) if not active
-      if (responseAPDU.getSW() == 0x63c0) {
-        log.error(pinSpec.getLocalizedName() + " locked");
-        throw new LockedException();
-      } else if (responseAPDU.getSW1() == 0x63 && responseAPDU.getSW2() >> 4 == 0xc) {
-        int retries = responseAPDU.getSW2() & 0x0f;
-        log.error("wrong " + pinSpec.getLocalizedName() + ", " + retries + " retries");
-        throw new VerificationFailedException(retries);
-      } else if (responseAPDU.getSW() == 0x6983) {
-        log.error(pinSpec.getLocalizedName() + " locked");
-        throw new LockedException();
-      } else if (responseAPDU.getSW() != 0x9000) {
-        String msg = "Failed to change " + pinSpec.getLocalizedName() +
-                ": SW=" + Integer.toHexString(responseAPDU.getSW());
-        log.error(msg);
-        throw new SignatureCardException(msg);
+      super.reset();
+      log.debug("select MF (e-card workaround)");
+      CardChannel channel = getCardChannel();
+      ResponseAPDU resp = transmit(channel, new CommandAPDU(0x00, 0xA4, 0x00, 0x0C));
+      if (resp.getSW() != 0x9000) {
+        throw new SignatureCardException("Failed to select MF after RESET: SW=" + Integer.toHexString(resp.getSW()) + ".");
       }
     } catch (CardException ex) {
-      log.error("Failed to change " + pinSpec.getLocalizedName() +
-              ": " + ex.getMessage());
-      throw new SignatureCardException(ex.getMessage(), ex);
+      log.error("Failed to select MF after RESET: " + ex.getMessage(), ex);
+      throw new SignatureCardException("Failed to select MF after RESET");
     }
   }
 
+  public String toString() {
+    return "e-card";
+  }
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
index d7763be0..293b9c71 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
@@ -77,11 +77,11 @@ public class SWCard implements SignatureCard {
 
   private KeyStore certifiedKeyStore;
   
-  private String certifiedKeyStorePassword;
+  private char[] certifiedKeyStorePassword;
   
   private KeyStore secureKeyStore;
   
-  private String secureKeyStorePassword;
+  private char[] secureKeyStorePassword;
   
   private Certificate certifiedCertificate;
   
@@ -195,7 +195,7 @@ public class SWCard implements SignatureCard {
   
   }
   
-  private String loadKeyStorePassword(String passwordFileName) throws SignatureCardException {
+  private char[] loadKeyStorePassword(String passwordFileName) throws SignatureCardException {
 
     String fileName = getFileName(passwordFileName);
     FileInputStream keyStorePasswordFile;
@@ -212,7 +212,7 @@ public class SWCard implements SignatureCard {
       for (int l; (l = reader.read(b)) != -1;) {
         sb.append(b, 0, l);
       }
-      return sb.toString();
+      return sb.toString().toCharArray();
     } catch (IOException e) {
       throw new SignatureCardException("Failed to read file '" + passwordFileName + "'.");
     }
@@ -237,7 +237,7 @@ public class SWCard implements SignatureCard {
     
   }
   
-  private String getPassword(KeyboxName keyboxName) throws SignatureCardException {
+  private char[] getPassword(KeyboxName keyboxName) throws SignatureCardException {
     
     if (keyboxName == KeyboxName.CERITIFIED_KEYPAIR) {
       if (certifiedKeyStorePassword == null) {
@@ -311,7 +311,7 @@ public class SWCard implements SignatureCard {
   public byte[] createSignature(byte[] hash, KeyboxName keyboxName, PINProvider provider) throws SignatureCardException, InterruptedException {
 
     // KeyStore password
-    String password = getPassword(keyboxName);
+    char[] password = getPassword(keyboxName);
 
     if (password == null) {
 
@@ -325,7 +325,7 @@ public class SWCard implements SignatureCard {
       
     }
 
-    KeyStore keyStore = getKeyStore(keyboxName, password.toCharArray());
+    KeyStore keyStore = getKeyStore(keyboxName, password);
 
     PrivateKey privateKey = null;
     
@@ -338,7 +338,7 @@ public class SWCard implements SignatureCard {
           Key key = null;
           while (key == null) {
             try {
-              key = keyStore.getKey(alias, password.toCharArray());
+              key = keyStore.getKey(alias, password);
             } catch (UnrecoverableKeyException e) {
               log.info("Failed to get Key from KeyStore. Wrong password?", e);
             }
@@ -399,15 +399,27 @@ public class SWCard implements SignatureCard {
   }
 
   @Override
-  public int verifyPIN(PINSpec pinSpec, String pin) throws LockedException, NotActivatedException, SignatureCardException {
-    return -1;
+  public void verifyPIN(PINSpec pinSpec, PINProvider pinProvider)
+          throws LockedException, NotActivatedException, SignatureCardException {
   }
 
   @Override
-  public void changePIN(PINSpec pinSpec, String oldPIN, String newPIN) throws LockedException, VerificationFailedException, NotActivatedException, SignatureCardException {
+  public void activatePIN(PINSpec pinSpec, PINProvider pinProvider) throws SignatureCardException {
+    throw new UnsupportedOperationException("Not supported yet.");
   }
 
   @Override
-  public void activatePIN(PINSpec pinSpec, String pin) throws SignatureCardException {
+  public void unblockPIN(PINSpec pinSpec, PINProvider pukProvider) throws CancelledException, SignatureCardException, InterruptedException {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public void changePIN(PINSpec pinSpec, ChangePINProvider pinProvider) throws LockedException, NotActivatedException, CancelledException, SignatureCardException, InterruptedException {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public boolean ifdSupportsFeature(byte feature) {
+    return false;
   }
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
index 3c2273b9..2097e6d3 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
@@ -36,6 +36,14 @@ import javax.smartcardio.CardTerminal;
 
 public interface SignatureCard {
 
+  /**
+   * IFD FEATURES
+   */
+  static final Byte FEATURE_VERIFY_PIN_DIRECT = new Byte((byte) 0x06);
+  static final Byte FEATURE_MODIFY_PIN_DIRECT = new Byte((byte) 0x07);
+  static final Byte FEATURE_MCT_READER_DIRECT = new Byte((byte) 0x08);
+  static final Byte FEATURE_IFD_PIN_PROPERTIES = new Byte((byte) 0x0a);
+
   public static class KeyboxName {
 
     public static KeyboxName SECURE_SIGNATURE_KEYPAIR = new KeyboxName(
@@ -123,29 +131,29 @@ public interface SignatureCard {
    */
   public List<PINSpec> getPINSpecs();
 
-  /**
-   *
-   * @param pinSpec descriptor which pin to verify
-   * @param pin may be null to test the PIN status
-   * @return the number of remaining retries or -1
-   * @throws at.gv.egiz.smcc.LockedException
-   * @throws at.gv.egiz.smcc.NotActivatedException
-   * @throws at.gv.egiz.smcc.SignatureCardException
-   */
-  public int verifyPIN(PINSpec pinSpec, String pin)
-          throws LockedException, NotActivatedException, SignatureCardException;
+  public void verifyPIN(PINSpec pinSpec, PINProvider pinProvider)
+          throws LockedException, NotActivatedException, CancelledException, SignatureCardException, InterruptedException;
 
-  public void changePIN(PINSpec pinSpec, String oldPIN, String newPIN)
-          throws LockedException, VerificationFailedException, NotActivatedException, SignatureCardException;
+  public void changePIN(PINSpec pinSpec, ChangePINProvider pinProvider)
+          throws LockedException, NotActivatedException, CancelledException, SignatureCardException, InterruptedException;
 
-  public void activatePIN(PINSpec pinSpec, String pin)
-          throws SignatureCardException;
+  public void activatePIN(PINSpec pinSpec, PINProvider pinProvider)
+          throws CancelledException, SignatureCardException, InterruptedException;
+
+  public void unblockPIN(PINSpec pinSpec, PINProvider pukProvider)
+          throws CancelledException, SignatureCardException, InterruptedException;
+
+  /**
+   * TODO
+   * @return
+   */
+  public boolean ifdSupportsFeature(byte feature);
 
   /**
    * Sets the local for evtl. required callbacks (e.g. PINSpec)
    * @param locale must not be null;
    */
   public void setLocale(Locale locale);
-  
-  
+
+
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java
index ab66e9a1..5146c275 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java
@@ -196,7 +196,7 @@ public class SignatureCardFactory {
             (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00
         },
         "at.gv.egiz.smcc.ACOSCard"));
-    
+
   }
 
   /**
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/TimeoutException.java b/smcc/src/main/java/at/gv/egiz/smcc/TimeoutException.java
new file mode 100644
index 00000000..d14a4c15
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/TimeoutException.java
@@ -0,0 +1,39 @@
+/*
+* 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.
+*/
+package at.gv.egiz.smcc;
+
+public class TimeoutException extends SignatureCardException {
+
+  private static final long serialVersionUID = 1L;
+
+  public TimeoutException() {
+    super();
+  }
+
+  public TimeoutException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public TimeoutException(String message) {
+    super(message);
+  }
+
+  public TimeoutException(Throwable cause) {
+    super(cause);
+  }
+
+}
diff --git a/smcc/src/test/resources/log4j.properties b/smcc/src/test/resources/log4j.properties
index 94662fd2..053eac17 100644
--- a/smcc/src/test/resources/log4j.properties
+++ b/smcc/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 # loglever DEBUG, appender STDOUT
-log4j.rootLogger=DEBUG, STDOUT
+log4j.rootLogger=TRACE, STDOUT
 #log4j.logger.at.gv.egiz.slbinding.RedirectEventFilter=DEBUG, STDOUT
 
 # STDOUT appender
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java
index 23b71690..14b36e28 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java
@@ -136,7 +136,9 @@ public abstract class AbstractBKUWorker extends AbstractSMCCSTAL implements Acti
         if (oldValue != SMCCHelper.CARD_NOT_SUPPORTED) {
           actionCommandList.clear();
           actionCommandList.add("cancel");
-          gui.showCardNotSupportedDialog(this, "cancel");
+          gui.showMessageDialog(BKUGUIFacade.TITLE_CARD_NOT_SUPPORTED,
+                  BKUGUIFacade.MESSAGE_CARD_NOT_SUPPORTED, null,
+                  BKUGUIFacade.BUTTON_CANCEL, this, "cancel");
           oldValue = SMCCHelper.CARD_NOT_SUPPORTED;
         }
         break;
@@ -144,7 +146,9 @@ public abstract class AbstractBKUWorker extends AbstractSMCCSTAL implements Acti
         if (oldValue != SMCCHelper.NO_CARD) {
           actionCommandList.clear();
           actionCommandList.add("cancel");
-          gui.showInsertCardDialog(this, "cancel");
+          gui.showMessageDialog(BKUGUIFacade.TITLE_INSERTCARD,
+            BKUGUIFacade.MESSAGE_INSERTCARD, null,
+            BKUGUIFacade.BUTTON_CANCEL, this, "cancel");
           oldValue = SMCCHelper.NO_CARD;
         }
         break;
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java
new file mode 100644
index 00000000..e32f08d4
--- /dev/null
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.smccstal;
+
+import at.gv.egiz.smcc.PINProvider;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public abstract class AbstractPINProvider implements PINProvider, ActionListener {
+
+  protected static final Log log = LogFactory.getLog(AbstractPINProvider.class);
+
+  protected boolean retry = false;
+
+  protected String action;
+
+  private boolean actionPerformed;
+
+//  protected void waitForAction() throws InterruptedException {
+//    super.wait();
+//  }
+
+  protected synchronized void waitForAction() throws InterruptedException {
+    try {
+      while (!actionPerformed) {
+        this.wait();
+      }
+    } catch (InterruptedException e) {
+      log.error("interrupt in waitForAction");
+      throw e;
+    }
+    actionPerformed = false;
+  }
+
+  private synchronized void actionPerformed() {
+    actionPerformed = true;
+    notify();//All();
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    log.debug("command " + e.getActionCommand());
+    action = e.getActionCommand();
+    actionPerformed();
+  }
+}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
index 1cf81e05..71f35181 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
@@ -121,6 +121,12 @@ public abstract class AbstractSMCCSTAL implements STAL {
     return new ErrorResponse(6000);
   }
 
+  /**
+   *
+   * @param requestList
+   * @return
+   * @throws RuntimeException with cause InterruptedException if interrupted
+   */
   @Override
   public List<STALResponse> handleRequest(List<? extends STALRequest> requestList) {
     log.debug("Got request list containing " + requestList.size()
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
index 5a54e97f..94444922 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
@@ -33,23 +33,26 @@ import at.gv.egiz.stal.InfoboxReadResponse;
 import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
 
-public class InfoBoxReadRequestHandler extends AbstractRequestHandler implements
-    PINProvider {
+public class InfoBoxReadRequestHandler extends AbstractRequestHandler {
 
   private static Log log = LogFactory.getLog(InfoBoxReadRequestHandler.class);
 
-  private int retryCounter = 0;
+  protected PINProviderFactory pinProviderFactory;
 
   @Override
   public STALResponse handleRequest(STALRequest request) throws InterruptedException {
     if (request instanceof InfoboxReadRequest) {
       InfoboxReadRequest infoBox = (InfoboxReadRequest) request;
+      if (pinProviderFactory == null) {
+        pinProviderFactory = PINProviderFactory.getInstance(card, gui);
+      }
       try {
         if (infoBox.getInfoboxIdentifier().equals("IdentityLink")) {
           newSTALMessage("Message.RequestCaption", "Message.IdentityLink");
           log.debug("Handling identitylink infobox");
-          byte[] resp = card.getInfobox(infoBox.getInfoboxIdentifier(), this,
-              infoBox.getDomainIdentifier());
+          byte[] resp = card.getInfobox(infoBox.getInfoboxIdentifier(),
+                  pinProviderFactory.getCardPINProvider(),
+                  infoBox.getDomainIdentifier());
           if (resp == null) {
             log.info("Got null as result->user cancelled");
             return new ErrorResponse(6001);
@@ -94,8 +97,9 @@ public class InfoBoxReadRequestHandler extends AbstractRequestHandler implements
           newSTALMessage("Message.RequestCaption", "Message.InfoboxReadRequest");
           log.warn("Unknown infobox identifier: "
               + infoBox.getInfoboxIdentifier() + " trying generic request");
-          byte[] resp = card.getInfobox(infoBox.getInfoboxIdentifier(), this,
-              infoBox.getDomainIdentifier());
+          byte[] resp = card.getInfobox(infoBox.getInfoboxIdentifier(),
+                  pinProviderFactory.getCardPINProvider(),
+                  infoBox.getDomainIdentifier());
           if (resp == null) {
             return new ErrorResponse(6001);
           }
@@ -110,13 +114,15 @@ public class InfoBoxReadRequestHandler extends AbstractRequestHandler implements
         log.info("Citizen card not activated.", e);
         gui.showErrorDialog(BKUGUIFacade.ERR_CARD_NOTACTIVATED, null, this, null);
         waitForAction();
-        gui.showWaitDialog(null);
+        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                BKUGUIFacade.MESSAGE_WAIT);
         return new ErrorResponse(6001);
       } catch (LockedException e) {
         log.info("Citizen card locked.", e);
         gui.showErrorDialog(BKUGUIFacade.ERR_CARD_LOCKED, null, this, null);
         waitForAction();
-        gui.showWaitDialog(null);
+        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                BKUGUIFacade.MESSAGE_WAIT);
         return new ErrorResponse(6001);
       } catch (CancelledException cx) {
         log.debug("User cancelled request", cx);
@@ -135,20 +141,4 @@ public class InfoBoxReadRequestHandler extends AbstractRequestHandler implements
   public boolean requireCard() {
     return true;
   }
-
-  @Override
-  public String providePIN(PINSpec spec, int retries) throws InterruptedException {
-    if (retryCounter++ > 0) {
-      log.info("PIN wrong retrying ...");
-      gui.showCardPINRetryDialog(spec, retries, this, "ok", this, "cancel");
-    } else {
-      gui.showCardPINDialog(spec, this, "ok", this, "cancel");
-    }
-    waitForAction();
-    gui.showWaitDialog(null);
-    if (actionCommand.equals("cancel")) {
-      return null;
-    }
-    return new String(gui.getPin());
-  }
 }
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java
new file mode 100644
index 00000000..670b71dc
--- /dev/null
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.smccstal;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.smcc.PINProvider;
+import at.gv.egiz.smcc.SignatureCard;
+import at.gv.egiz.stal.signedinfo.SignedInfoType;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public abstract class PINProviderFactory {
+
+  BKUGUIFacade gui;
+  
+  public static PINProviderFactory getInstance(SignatureCard forCard,
+          BKUGUIFacade gui) {
+    if (forCard.ifdSupportsFeature(SignatureCard.FEATURE_VERIFY_PIN_DIRECT)) {
+      return new PinpadPINProviderFactory(gui);
+    } else {
+      return new SoftwarePINProviderFactory(gui);
+    }
+  }
+
+  public abstract PINProvider getSignaturePINProvider(SecureViewer viewer,
+          SignedInfoType signedInfo);
+  
+  public abstract PINProvider getCardPINProvider();
+
+}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PinpadPINProviderFactory.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PinpadPINProviderFactory.java
new file mode 100644
index 00000000..55321b72
--- /dev/null
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PinpadPINProviderFactory.java
@@ -0,0 +1,155 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.smccstal;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINProvider;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.stal.HashDataInput;
+import at.gv.egiz.stal.signedinfo.SignedInfoType;
+import java.util.List;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PinpadPINProviderFactory extends PINProviderFactory {
+
+  protected PinpadPINProviderFactory(BKUGUIFacade gui) {
+    this.gui = gui;
+  }
+
+  @Override
+  public PINProvider getSignaturePINProvider(SecureViewer viewer,
+          SignedInfoType signedInfo) {
+
+    return new SignaturePinProvider(viewer, signedInfo);
+  }
+
+  @Override
+  public PINProvider getCardPINProvider() {
+    return new CardPinProvider();
+  }
+
+  class SignaturePinProvider extends AbstractPINProvider {
+
+//    protected BKUGUIFacade gui;
+    protected SecureViewer viewer;
+    protected SignedInfoType signedInfo;
+    protected List<HashDataInput> hashDataInputs;
+
+    private SignaturePinProvider(SecureViewer viewer,
+            SignedInfoType signedInfo) {
+      this.viewer = viewer;
+      this.signedInfo = signedInfo;
+    }
+
+    @Override
+    public char[] providePIN(PINSpec spec, int retries)
+            throws CancelledException, InterruptedException {
+
+      showPinpadPINDialog(retries, spec);
+      retry = true;
+      return null;
+
+//      do {
+//        waitForAction();
+//        gui.showWaitDialog(null);
+//
+//        if ("hashData".equals(action)) {
+//          // show pin dialog in background
+//          gui.showSignaturePINDialog(spec, (retry) ? retries : -1,
+//                  this, "sign",
+//                  this, "cancel",
+//                  this, "hashData");
+//
+//          viewer.displayDataToBeSigned(signedInfo.getReference());
+//
+//        } else if ("sign".equals(action)) {
+//          retry = true;
+//          return gui.getPin();
+//        } else if ("hashDataDone".equals(action)) {
+//          gui.showSignaturePINDialog(spec, (retry) ? retries : -1,
+//                  this, "sign",
+//                  this, "cancel",
+//                  this, "hashData");
+//        } else if ("cancel".equals(action) ||
+//                "error".equals(action)) {
+//          throw new CancelledException(spec.getLocalizedName() +
+//                  " entry cancelled");
+//        }
+//      } while (true);
+    }
+
+    private void showPinpadPINDialog(int retries, PINSpec pinSpec) {
+      String title, message;
+      Object[] params;
+      if (retry) {
+        title = BKUGUIFacade.TITLE_RETRY;
+        message = BKUGUIFacade.MESSAGE_RETRIES;
+        params = new Object[]{String.valueOf(retries)};
+      } else {
+        title = BKUGUIFacade.TITLE_SIGN;
+        message = BKUGUIFacade.MESSAGE_ENTERPIN_PINPAD;
+        String pinSize = String.valueOf(pinSpec.getMinLength());
+        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+          pinSize += "-" + pinSpec.getMaxLength();
+        }
+        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
+      }
+      gui.showMessageDialog(title, message, params);
+    }
+  }
+
+  class CardPinProvider extends AbstractPINProvider {
+
+    private CardPinProvider() {
+    }
+
+    @Override
+    public char[] providePIN(PINSpec spec, int retries)
+            throws CancelledException, InterruptedException {
+
+      showPinpadPINDialog(retries, spec);
+      retry = true;
+      return null;
+
+    }
+
+    private void showPinpadPINDialog(int retries, PINSpec pinSpec) {
+      String title, message;
+      Object[] params;
+      if (retry) {
+        title = BKUGUIFacade.TITLE_RETRY;
+        message = BKUGUIFacade.MESSAGE_RETRIES;
+        params = new Object[]{String.valueOf(retries)};
+      } else {
+        title = BKUGUIFacade.TITLE_CARDPIN;
+        message = BKUGUIFacade.MESSAGE_ENTERPIN_PINPAD;
+        String pinSize = String.valueOf(pinSpec.getMinLength());
+        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+          pinSize += "-" + pinSpec.getMaxLength();
+        }
+        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
+      }
+      gui.showMessageDialog(title, message, params);
+    }
+  }
+}
+
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SecureViewer.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SecureViewer.java
new file mode 100644
index 00000000..c395679a
--- /dev/null
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SecureViewer.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.smccstal;
+
+import at.gv.egiz.stal.signedinfo.ReferenceType;
+import java.security.DigestException;
+import java.util.List;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public interface SecureViewer {
+
+  /**
+   * Displays the hashdata inputs for all provided dsig:SignedReferences.
+   * Implementations may verify the digest value if necessary.
+   * (LocalSignRequestHandler operates on DataObjectHashDataInput,
+   * other SignRequestHandlers should cache the HashDataInputs obtained by webservice calls,
+   * or simply forward to a HashDataInputServlet.)
+   * @param signedReferences The caller may select a subset of the references in SignedInfo to be displayed.
+   * @throws java.security.DigestException if digest values are verified and do not correspond
+   * (or any other digest computation error occurs)
+   * @throws java.lang.Exception
+   */
+  void displayDataToBeSigned(List<ReferenceType> signedReferences) 
+          throws DigestException, Exception;
+
+}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index d041a8cb..ac510f38 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -17,7 +17,6 @@
 package at.gv.egiz.bku.smccstal;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
-import java.awt.event.ActionEvent;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.security.MessageDigest;
@@ -35,12 +34,11 @@ import at.gv.egiz.smcc.CancelledException;
 import at.gv.egiz.smcc.LockedException;
 import at.gv.egiz.smcc.NotActivatedException;
 import at.gv.egiz.smcc.PINProvider;
-import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.smcc.SignatureCard;
 import at.gv.egiz.smcc.SignatureCardException;
 import at.gv.egiz.smcc.SignatureCard.KeyboxName;
+import at.gv.egiz.smcc.TimeoutException;
 import at.gv.egiz.stal.ErrorResponse;
-import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
 import at.gv.egiz.stal.SignRequest;
@@ -48,13 +46,12 @@ import at.gv.egiz.stal.SignResponse;
 import at.gv.egiz.stal.signedinfo.ObjectFactory;
 import at.gv.egiz.stal.signedinfo.SignedInfoType;
 import at.gv.egiz.stal.util.JCEAlgorithmNames;
-import java.security.DigestException;
-import java.util.List;
 
-public abstract class SignRequestHandler extends AbstractRequestHandler implements HashDataInputDisplay {
+public abstract class SignRequestHandler extends AbstractRequestHandler implements SecureViewer {
 
     private static Log log = LogFactory.getLog(SignRequestHandler.class);
     private static JAXBContext jaxbContext;
+    private PINProviderFactory pinProviderFactory;
     
     static {
         try {
@@ -84,7 +81,14 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
                 MessageDigest md = MessageDigest.getInstance(jceName);
                 md.update(signReq.getSignedInfo());
                 KeyboxName kb = SignatureCard.KeyboxName.getKeyboxName(signReq.getKeyIdentifier());
-                byte[] resp = card.createSignature(md.digest(), kb, new STALPinProvider(si.getValue()));
+
+                if (pinProviderFactory == null) {
+                  pinProviderFactory = PINProviderFactory.getInstance(card, gui);
+                }
+                PINProvider pinProvider = pinProviderFactory.
+                        getSignaturePINProvider(this, si.getValue());
+                
+                byte[] resp = card.createSignature(md.digest(), kb, pinProvider);
                 if (resp == null) {
                     return new ErrorResponse(6001);
                 }
@@ -95,17 +99,28 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
               log.info("Citizen card not activated.", e);
               gui.showErrorDialog(BKUGUIFacade.ERR_CARD_NOTACTIVATED, null, this, null);
               waitForAction();
-              gui.showWaitDialog(null);
+              gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                      BKUGUIFacade.MESSAGE_WAIT);
               return new ErrorResponse(6001);
             } catch (LockedException e) {
               log.info("Citizen card locked.", e);
               gui.showErrorDialog(BKUGUIFacade.ERR_CARD_LOCKED, null, this, null);
               waitForAction();
-              gui.showWaitDialog(null);
+              gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                      BKUGUIFacade.MESSAGE_WAIT);
               return new ErrorResponse(6001);
             } catch (CancelledException cx) {
                 log.debug("User cancelled request");
                 return new ErrorResponse(6001);
+            } catch (TimeoutException ex) {
+              log.error("Timeout during pin entry");
+              gui.showMessageDialog(BKUGUIFacade.TITLE_ENTRY_TIMEOUT,
+                      BKUGUIFacade.ERR_PIN_TIMEOUT, null,
+                      BKUGUIFacade.BUTTON_CANCEL, this, null);
+              waitForAction();
+              gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                      BKUGUIFacade.MESSAGE_WAIT);
+              return new ErrorResponse(6001);
             } catch (SignatureCardException e) {
                 log.error("Error while creating signature: " + e);
                 return new ErrorResponse(4000);
@@ -127,64 +142,64 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
         return true;
     }
 
-  class STALPinProvider implements PINProvider {
-    
-    protected SignedInfoType signedInfo;
-    protected List<HashDataInput> hashDataInputs;
-    private int retryCounter = 0;
-
-    public STALPinProvider(SignedInfoType signedInfo) {
-      this.signedInfo = signedInfo;
-    }
-    
-    private void showSignaturePINDialog(PINSpec spec, int retries) {
-      if (retryCounter > 0) {
-          gui.showSignaturePINRetryDialog(spec, retries, SignRequestHandler.this, "sign", SignRequestHandler.this,
-            "cancel", SignRequestHandler.this, "hashData");
-        } else {
-          gui.showSignaturePINDialog(spec, SignRequestHandler.this, "sign", SignRequestHandler.this, "cancel", SignRequestHandler.this,
-            "hashData");
-        }
-    }
-  
-    @Override
-    public String providePIN(PINSpec spec, int retries) throws InterruptedException {
-    
-      showSignaturePINDialog(spec, retries);
-      
-    do {
-      waitForAction();
-      gui.showWaitDialog(null);
-      if (actionCommand.equals("cancel")) {
-        return null;
-      } else if (actionCommand.equals("hashData")) {
-        
-        showSignaturePINDialog(spec, retries);
-          
-          try {
-            displayHashDataInputs(signedInfo.getReference());
-          } catch (DigestException ex) { 
-            log.error("Bad digest value: " + ex.getMessage());
-            gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH, new Object[] {ex.getMessage()}, SignRequestHandler.this, "error");
-          } catch (Exception ex) {
-            log.error("Could not display hashdata inputs: " + ex.getMessage());
-            gui.showErrorDialog(BKUGUIFacade.ERR_DISPLAY_HASHDATA, new Object[] {ex.getMessage()}, SignRequestHandler.this, "error");
-          }
-        
-      } else if (actionCommand.equals("sign")) {
-        retryCounter++;
-        return new String(gui.getPin());
-      } else if (actionCommand.equals("hashDataDone")) {
-        showSignaturePINDialog(spec, retries);
-      } else if (actionCommand.equals("error")) {
-        return null;
-      }
-    } while (true);
-  }
-
+//  class SoftwarePinProvider implements PINProvider {
+//
+//    protected SignedInfoType signedInfo;
+//    protected List<HashDataInput> hashDataInputs;
+//    private boolean retry = false;
+//
+//    public SoftwarePinProvider(SignedInfoType signedInfo) {
+//      this.signedInfo = signedInfo;
+//    }
+//
+//    private void showSignaturePINDialog(PINSpec spec, int retries) {
+//      if (retry) {
+//          gui.showSignaturePINRetryDialog(spec, retries, SignRequestHandler.this, "sign", SignRequestHandler.this,
+//            "cancel", SignRequestHandler.this, "hashData");
+//        } else {
+//          gui.showSignaturePINDialog(spec, SignRequestHandler.this, "sign", SignRequestHandler.this, "cancel", SignRequestHandler.this,
+//            "hashData");
+//        }
+//    }
+//
 //    @Override
-//    public void actionPerformed(ActionEvent e) {
-//      throw new UnsupportedOperationException("Not supported yet.");
+//    public char[] providePIN(PINSpec spec, int retries)
+//            throws CancelledException, InterruptedException {
+//      showSignaturePINDialog(spec, retries);
+//
+//      do {
+//        waitForAction();
+//        gui.showWaitDialog(null);
+//        if (actionCommand.equals("hashData")) {
+//
+//          showSignaturePINDialog(spec, retries);
+//
+//            try {
+//              displayHashDataInputs(signedInfo.getReference());
+//
+//            } catch (DigestException ex) {
+//              log.error("Bad digest value: " + ex.getMessage());
+//              gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH,
+//                      new Object[] {ex.getMessage()},
+//                      SignRequestHandler.this, "error");
+//            } catch (Exception ex) {
+//              log.error("Could not display hashdata inputs: " +
+//                      ex.getMessage());
+//              gui.showErrorDialog(BKUGUIFacade.ERR_DISPLAY_HASHDATA,
+//                      new Object[] {ex.getMessage()},
+//                      SignRequestHandler.this, "error");
+//            }
+//        } else if (actionCommand.equals("sign")) {
+//          retry = true;
+//          return gui.getPin();
+//        } else if (actionCommand.equals("hashDataDone")) {
+//          showSignaturePINDialog(spec, retries);
+//        } else if (actionCommand.equals("cancel") ||
+//                   actionCommand.equals("error")) {
+//          throw new CancelledException(spec.getLocalizedName() +
+//                  " entry cancelled");
+//        }
+//      } while (true);
 //    }
-  }
+//  }
 }
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SoftwarePINProviderFactory.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SoftwarePINProviderFactory.java
new file mode 100644
index 00000000..54a34280
--- /dev/null
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SoftwarePINProviderFactory.java
@@ -0,0 +1,140 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.smccstal;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.smcc.*;
+import at.gv.egiz.stal.HashDataInput;
+import at.gv.egiz.stal.signedinfo.SignedInfoType;
+import java.security.DigestException;
+import java.util.List;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class SoftwarePINProviderFactory extends PINProviderFactory {
+
+  protected SoftwarePINProviderFactory(BKUGUIFacade gui) {
+    this.gui = gui;
+  }
+
+  @Override
+  public PINProvider getSignaturePINProvider(SecureViewer viewer,
+          SignedInfoType signedInfo) {
+    return new SignaturePinProvider(viewer, signedInfo);
+  }
+
+  @Override
+  public PINProvider getCardPINProvider() {
+    return new CardPinProvider();
+  }
+
+  class SignaturePinProvider extends AbstractPINProvider {
+
+//    protected BKUGUIFacade gui;
+    protected SecureViewer viewer;
+    protected SignedInfoType signedInfo;
+    protected List<HashDataInput> hashDataInputs;
+
+    private SignaturePinProvider(SecureViewer viewer,
+            SignedInfoType signedInfo) {
+      this.viewer = viewer;
+      this.signedInfo = signedInfo;
+    }
+
+    @Override
+    public char[] providePIN(PINSpec spec, int retries)
+            throws CancelledException, InterruptedException {
+
+      gui.showSignaturePINDialog(spec, (retry) ? retries : -1,
+              this, "sign",
+              this, "cancel",
+              this, "hashData");
+
+      do {
+        waitForAction();
+        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                BKUGUIFacade.MESSAGE_WAIT);
+
+        if ("hashData".equals(action)) {
+          // show pin dialog in background
+          gui.showSignaturePINDialog(spec, (retry) ? retries : -1,
+                  this, "sign",
+                  this, "cancel",
+                  this, "hashData");
+
+          try {
+            viewer.displayDataToBeSigned(signedInfo.getReference());
+          } catch (DigestException ex) {
+            log.error("Bad digest value: " + ex.getMessage());
+            gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH,
+                    new Object[]{ex.getMessage()},
+                    this, "error");
+          } catch (Exception ex) {
+            log.error("Could not display hashdata inputs: " +
+                    ex.getMessage());
+            gui.showErrorDialog(BKUGUIFacade.ERR_DISPLAY_HASHDATA,
+                    new Object[]{ex.getMessage()},
+                    this, "error");
+          }
+        } else if ("sign".equals(action)) {
+          retry = true;
+          return gui.getPin();
+        } else if ("hashDataDone".equals(action)) {
+          gui.showSignaturePINDialog(spec, (retry) ? retries : -1,
+                  this, "sign",
+                  this, "cancel",
+                  this, "hashData");
+        } else if ("cancel".equals(action) ||
+                "error".equals(action)) {
+          throw new CancelledException(spec.getLocalizedName() +
+                  " entry cancelled");
+        }
+      } while (true);
+    }
+  }
+
+  class CardPinProvider extends AbstractPINProvider {
+
+//    protected BKUGUIFacade gui;
+
+    private CardPinProvider() {
+    }
+
+    @Override
+    public char[] providePIN(PINSpec spec, int retries)
+            throws CancelledException, InterruptedException {
+
+      gui.showCardPINDialog(spec, (retry) ? retries : -1,
+              this, "ok",
+              this, "cancel");
+
+      waitForAction();
+      
+      gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+              BKUGUIFacade.MESSAGE_WAIT);
+
+      if ("cancel".equals(action)) {
+        throw new CancelledException(spec.getLocalizedName() +
+                  " entry cancelled");
+      }
+      retry = true;
+      return gui.getPin();
+    }
+  }
+}
diff --git a/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java b/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
index b2a91784..51dfe0da 100644
--- a/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
+++ b/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
@@ -93,16 +93,24 @@ public class AbstractSMCCSTALTest extends AbstractSMCCSTAL implements
       }
 
       @Override
-      public int verifyPIN(PINSpec pinSpec, String pin) throws LockedException, NotActivatedException, SignatureCardException {
-        return -1;
+      public void verifyPIN(PINSpec pinSpec, PINProvider pinProvider) {
       }
 
       @Override
-      public void changePIN(PINSpec pinSpec, String oldPIN, String newPIN) throws LockedException, VerificationFailedException, NotActivatedException, SignatureCardException {
+      public void changePIN(PINSpec pinSpec, ChangePINProvider pinProvider) {
       }
 
       @Override
-      public void activatePIN(PINSpec pinSpec, String pin) throws SignatureCardException {
+      public void activatePIN(PINSpec pinSpec, PINProvider pinProvider) {
+      }
+
+      @Override
+      public void unblockPIN(PINSpec pinSpec, PINProvider pukProvider) {
+      }
+
+      @Override
+      public boolean ifdSupportsFeature(byte feature) {
+        return false;
       }
      
    };
-- 
cgit v1.2.3


From 616e06910051528674165319a1d6d161dff5859c Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 27 Mar 2009 17:33:11 +0000
Subject: 1.1-RC6 (pinpad, pinmgmt, secureviewer)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@323 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../gv/egiz/bku/online/applet/AppletBKUWorker.java |   5 +-
 .../egiz/bku/online/applet/AppletSecureViewer.java |  79 +--
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |  10 +-
 .../java/at/gv/egiz/bku/gui/PINManagementGUI.java  |  26 +-
 .../at/gv/egiz/bku/gui/PINManagementGUIFacade.java |   9 +-
 .../java/at/gv/egiz/bku/gui/PINStatusRenderer.java |   2 -
 .../smccstal/ext/ManagementPINProviderFactory.java |  13 +-
 .../bku/smccstal/ext/PinpadPINProviderFactory.java |  45 +-
 .../gv/egiz/bku/gui/ActivationMessages.properties  |   6 +-
 .../egiz/bku/gui/ActivationMessages_en.properties  |   6 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |  40 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 603 +++++++++++++--------
 .../java/at/gv/egiz/bku/gui/HashDataViewer.java    | 293 ----------
 .../at/gv/egiz/bku/gui/SecureViewerDialog.java     | 371 +++++++++++++
 .../at/gv/egiz/bku/gui/Messages.properties         |   3 +-
 .../at/gv/egiz/bku/gui/Messages_en.properties      |   1 +
 .../src/main/resources/images/ChipperlingLogo.png  | Bin 0 -> 4035 bytes
 .../test/java/at/gv/egiz/bku/gui/BKUGUITest.java   |   5 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |   4 +-
 .../at/gv/egiz/bku/local/stal/BKUGuiProxy.java     |   8 +
 .../at/gv/egiz/bku/local/stal/LocalBKUWorker.java  |   3 +-
 .../gv/egiz/bku/local/stal/LocalSecureViewer.java  | 109 ++++
 .../bku/local/stal/LocalSignRequestHandler.java    |  83 +--
 .../gv/egiz/bku/online/conf/defaultConf.properties |   3 +
 BKUOnline/src/main/resources/log4j.properties      |   2 +-
 BKUOnline/src/main/webapp/SLRequestForm.html       |  27 +
 .../at/gv/egiz/bku/binding/ExpiryRemoverTest.java  | 101 ++--
 smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java   | 130 ++---
 .../at/gv/egiz/smcc/AbstractSignatureCard.java     | 220 ++------
 .../src/main/java/at/gv/egiz/smcc/STARCOSCard.java | 234 +++++---
 smcc/src/main/java/at/gv/egiz/smcc/SWCard.java     |  49 +-
 .../main/java/at/gv/egiz/smcc/SignatureCard.java   |  15 +-
 smcc/src/main/java/at/gv/egiz/smcc/ccid/CCID.java  |  77 +++
 .../java/at/gv/egiz/smcc/ccid/DefaultReader.java   | 264 +++++++++
 .../at/gv/egiz/smcc/ccid/GemplusGemPCPinpad.java   |  65 +++
 .../java/at/gv/egiz/smcc/ccid/ReaderFactory.java   |  35 ++
 .../test/java/at/gv/egiz/smcc/ACOSCardTest.java    | 135 +++++
 .../test/java/at/gv/egiz/smcc/STARCOSCardTest.java | 267 +++++++++
 .../gv/egiz/bku/smccstal/AbstractPINProvider.java  |   2 +-
 .../gv/egiz/bku/smccstal/PINProviderFactory.java   |   3 +-
 .../bku/smccstal/PinpadPINProviderFactory.java     | 131 +++--
 .../java/at/gv/egiz/bku/smccstal/SecureViewer.java |  11 +-
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   |  14 +-
 .../bku/smccstal/SoftwarePINProviderFactory.java   |  25 +-
 .../java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java |   7 +-
 45 files changed, 2364 insertions(+), 1177 deletions(-)
 delete mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
 create mode 100644 BKUCommonGUI/src/main/resources/images/ChipperlingLogo.png
 create mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSecureViewer.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/ccid/CCID.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/ccid/DefaultReader.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/ccid/GemplusGemPCPinpad.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/ACOSCardTest.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
index 9b9735f6..e8d8976d 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java
@@ -18,6 +18,7 @@ package at.gv.egiz.bku.online.applet;
 
 import at.gv.egiz.bku.smccstal.AbstractBKUWorker;
 import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.bku.smccstal.SignRequestHandler;
 import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
 import at.gv.egiz.stal.SignRequest;
@@ -67,8 +68,10 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable {
       STALPortType stalPort = applet.getSTALPort();
       STALTranslator stalTranslator = applet.getSTALTranslator();
 
+      AppletSecureViewer secureViewer =
+              new AppletSecureViewer(gui, stalPort, sessionId);
       addRequestHandler(SignRequest.class,
-              new AppletSecureViewer(stalPort, sessionId));
+              new SignRequestHandler(secureViewer));
 
       GetNextRequestResponseType nextRequestResp = stalPort.connect(sessionId);
 
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java
index e2551e2d..929cecb1 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java
@@ -16,17 +16,8 @@
  */
 package at.gv.egiz.bku.online.applet;
 
+import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.smccstal.SecureViewer;
-import java.security.DigestException;
-import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.bku.smccstal.SignRequestHandler;
 import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
 import at.gv.egiz.stal.service.GetHashDataInputFault;
@@ -34,49 +25,73 @@ import at.gv.egiz.stal.service.STALPortType;
 import at.gv.egiz.stal.service.types.GetHashDataInputResponseType;
 import at.gv.egiz.stal.service.types.GetHashDataInputType;
 import at.gv.egiz.stal.signedinfo.ReferenceType;
+import at.gv.egiz.stal.signedinfo.SignedInfoType;
+import java.awt.event.ActionListener;
+import java.security.DigestException;
+import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
- * A SignRequesthandler that obtains hashdata inputs from a STAL webservice and
- * displays these either within the applet or in a separate frame.
- * The internal viewer displays plaintext data only, other mimetypes can be saved to disk.
- * The standalone (frame) viewer displays all mimetypes.
- * 
- * (This class depends on STALService and therefore is not part of BKUCommonGUI.)
- * 
+ *
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
-public class AppletSecureViewer extends SignRequestHandler {
+public class AppletSecureViewer implements SecureViewer {
 
   private static final Log log = LogFactory.getLog(AppletSecureViewer.class);
+
+  protected BKUGUIFacade gui;
   protected STALPortType stalPort;
   protected String sessId;
+  protected List<HashDataInput> verifiedDataToBeSigned;
 
-  public AppletSecureViewer(STALPortType stalPort, String sessId) {
-    if (stalPort == null || sessId == null) {
+  public AppletSecureViewer(BKUGUIFacade gui, STALPortType stalPort,
+          String sessId) {
+    if (gui == null) {
+      throw new NullPointerException("GUI must not be null");
+    }
+    if (stalPort == null) {
       throw new NullPointerException("STAL port must not be null");
     }
-    this.sessId = sessId;
+    if (sessId == null) {
+      throw new NullPointerException("session id must not be null");
+    }
+    this.gui = gui;
     this.stalPort = stalPort;
+    this.sessId = sessId;
   }
 
   /**
-   * TODO don't throw exceptions
+   * retrieves the data to be signed for
    * @param signedReferences
+   * @param okListener
+   * @param okCommand
+   * @param cancelListener
+   * @param cancelCommand
    * @throws java.security.DigestException
    * @throws java.lang.Exception
    */
   @Override
-  public void displayDataToBeSigned(List<ReferenceType> signedReferences) 
+  public void displayDataToBeSigned(SignedInfoType signedInfo,
+          ActionListener okListener, String okCommand)
           throws DigestException, Exception {
-
-  List<GetHashDataInputResponseType.Reference> hdi = getHashDataInput(signedReferences);
-    List<HashDataInput> verifiedHashDataInputs = verifyHashDataInput(signedReferences, hdi);
-
-    if (verifiedHashDataInputs.size() > 0) {
-      gui.showSecureViewer(verifiedHashDataInputs, this, "hashDataDone");
+    
+    if (verifiedDataToBeSigned == null) {
+      log.info("retrieve data to be signed for dsig:SignedInfo " +
+              signedInfo.getId());
+      List<GetHashDataInputResponseType.Reference> hdi = 
+              getHashDataInput(signedInfo.getReference());
+      verifiedDataToBeSigned = verifyHashDataInput(signedInfo.getReference(),
+              hdi);
+    }
+    if (verifiedDataToBeSigned.size() > 0) {
+      gui.showSecureViewer(verifiedDataToBeSigned, okListener, okCommand);
     } else {
-      throw new Exception("No signature data (apart from any QualifyingProperties or a Manifest)");
+      throw new Exception("No data to be signed (apart from any QualifyingProperties or a Manifest)");
     }
   }
 
@@ -110,7 +125,7 @@ public class AppletSecureViewer extends SignRequestHandler {
         }
       }
     }
-    
+
     if (request.getReference().size() < 1) {
       log.error("No signature data (apart from any QualifyingProperties or a Manifest) for session " + sessId);
       throw new Exception("No signature data (apart from any QualifyingProperties or a Manifest)");
@@ -187,7 +202,7 @@ public class AppletSecureViewer extends SignRequestHandler {
         verifiedHashDataInputs.add(new ByteArrayHashDataInput(hdi, signedRefId, mimeType, encoding));
       }
     }
-    
+
     return verifiedHashDataInputs;
   }
 
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index a4337bbd..0ddb6dc6 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -34,6 +34,7 @@ import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.BKUGUIImpl;
 import at.gv.egiz.stal.service.STALPortType;
 import at.gv.egiz.stal.service.STALService;
+import java.applet.AppletContext;
 import java.awt.Container;
 import javax.xml.namespace.QName;
 
@@ -207,14 +208,19 @@ public class BKUApplet extends JApplet {
    */
   protected void sendRedirect(String sessionId) {
     try {
+      AppletContext ctx = getAppletContext();
+      if (ctx == null) {
+        log.error("no applet context (applet might already have been destroyed)");
+        return;
+      }
       URL redirectURL = getURLParameter(REDIRECT_URL, sessionId);
       String redirectTarget = getParameter(REDIRECT_TARGET);
       if (redirectTarget == null) {
         log.info("Done. Redirecting to " + redirectURL + " ...");
-        getAppletContext().showDocument(redirectURL);
+        ctx.showDocument(redirectURL);
       } else {
         log.info("Done. Redirecting to " + redirectURL + " (target=" + redirectTarget + ") ...");
-        getAppletContext().showDocument(redirectURL, redirectTarget);
+        ctx.showDocument(redirectURL, redirectTarget);
       }
     } catch (MalformedURLException ex) {
       log.warn("Failed to redirect: " + ex.getMessage(), ex);
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
index 159dd29d..d1ca6c00 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
@@ -118,18 +118,18 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                 pinStatusTable.setDefaultRenderer(PINSpec.class, new PINSpecRenderer());
                 pinStatusTable.setDefaultRenderer(STATUS.class, new PINStatusRenderer(cardmgmtMessages));
                 pinStatusTable.setTableHeader(null);
-
-                pinStatusTable.addMouseMotionListener(new MouseMotionAdapter() {
-
-                  @Override
-                  public void mouseMoved(MouseEvent e) {
-                    if (pinStatusTable.columnAtPoint(e.getPoint()) == 0) {
-                      pinStatusTable.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-                    } else {
-                      pinStatusTable.setCursor(Cursor.getDefaultCursor());
-                    }
-                  }
-                });
+                pinStatusTable.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+//                pinStatusTable.addMouseMotionListener(new MouseMotionAdapter() {
+//
+//                  @Override
+//                  public void mouseMoved(MouseEvent e) {
+//                    if (pinStatusTable.columnAtPoint(e.getPoint()) == 0) {
+//                      pinStatusTable.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+//                    } else {
+//                      pinStatusTable.setCursor(Cursor.getDefaultCursor());
+//                    }
+//                  }
+//                });
 
                 final JButton activateButton = new JButton();
                 activateButton.setFont(activateButton.getFont().deriveFont(activateButton.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -392,7 +392,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                 if (pinpad) {
                   JLabel pinpadLabel = new JLabel();
                   pinpadLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~Font.BOLD));
-                  String pinpadPattern = getMessage(MESSAGE_PINPAD);
+                  String pinpadPattern = getMessage(MESSAGE_VERIFYPIN_PINPAD);
                   pinpadLabel.setText(MessageFormat.format(pinpadPattern,
                           new Object[] { pinSpec.getLocalizedName(), pinSize }));
                   
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
index 45313f42..f0cc0a27 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
@@ -40,13 +40,16 @@ public interface PINManagementGUIFacade extends BKUGUIFacade {
   public static final String MESSAGE_ACTIVATE_SUCCESS = "activate.success";
   public static final String MESSAGE_CHANGE_SUCCESS = "change.success";
   public static final String MESSAGE_PINMGMT = "pin.mgmt";
-  public static final String MESSAGE_PINPAD = "pinpad";
-  public static final String MESSAGE_CHANGEPIN_PINPAD = "pinpad.change";
+//  public static final String MESSAGE_PINPAD = "pinpad";
   public static final String MESSAGE_ACTIVATE_PIN = "activate.pin";
   public static final String MESSAGE_CHANGE_PIN = "change.pin";
   public static final String MESSAGE_VERIFY_PIN = "verify.pin";
   public static final String MESSAGE_UNBLOCK_PIN = "unblock.pin";
-  
+  public static final String MESSAGE_ACTIVATEPIN_PINPAD = "activate.pinpad";
+  public static final String MESSAGE_CHANGEPIN_PINPAD = "change.pinpad";
+  public static final String MESSAGE_VERIFYPIN_PINPAD = "verify.pinpad";
+  public static final String MESSAGE_UNBLOCKPIN_PINPAD = "unblock.pinpad";
+
   public static final String LABEL_OLD_PIN = "label.old.pin";
   public static final String LABEL_NEW_PIN = "label.new.pin";
   public static final String LABEL_REPEAT_PIN = "label.repeat.pin";
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
index 4cb84b77..83ff74f2 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
@@ -22,8 +22,6 @@ import java.awt.Color;
 import java.awt.Font;
 import java.util.ResourceBundle;
 import javax.swing.table.DefaultTableCellRenderer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  *
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java
index b0dd8766..d635b8df 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java
@@ -19,6 +19,7 @@ package at.gv.egiz.bku.smccstal.ext;
 
 import at.gv.egiz.smcc.ChangePINProvider;
 import at.gv.egiz.bku.gui.PINManagementGUIFacade;
+import at.gv.egiz.smcc.ccid.CCID;
 import at.gv.egiz.smcc.PINProvider;
 import at.gv.egiz.smcc.SignatureCard;
 
@@ -33,13 +34,13 @@ public abstract class ManagementPINProviderFactory {
   
   public static ManagementPINProviderFactory getInstance(SignatureCard forCard,
           PINManagementGUIFacade gui) {
-//    if (forCard.ifdSupportsFeature(SignatureCard.FEATURE_VERIFY_PIN_DIRECT)) {
-////      forCard.ifdSupportsFeature(SignatureCard.FEATURE_MODIFY_PIN_DIRECT)
-//      return new PinpadPINProviderFactory(gui);
-//
-//    } else {
+    if (forCard.getReader().hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
+//      forCard.ifdSupportsFeature(SignatureCard.FEATURE_MODIFY_PIN_DIRECT)
+      return new PinpadPINProviderFactory(gui);
+
+    } else {
       return new SoftwarePINProviderFactory(gui);
-//    }
+    }
   }
 
   public abstract PINProvider getVerifyPINProvider();
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PinpadPINProviderFactory.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PinpadPINProviderFactory.java
index 4176e0a9..a9ad5ef8 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PinpadPINProviderFactory.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PinpadPINProviderFactory.java
@@ -73,23 +73,6 @@ public class PinpadPINProviderFactory extends ManagementPINProviderFactory {
       showPinpadPINDialog(retries, spec);
       retry = true;
       return null;
-
-//      gui.showPINDialog(type, spec, (retry) ? retries : -1,
-//              this, "exec",
-//              this, "back");
-//
-//      waitForAction();
-//
-//      if ("exec".equals(action)) {
-//        gui.showWaitDialog(null);
-//        retry = true;
-//        return gui.getPin();
-//      } else if ("back".equals(action)) {
-//        throw new CancelledException();
-//      } else {
-//        log.error("unsupported command " + action);
-//        throw new CancelledException();
-//      }
     }
 
     /**
@@ -111,14 +94,38 @@ public class PinpadPINProviderFactory extends ManagementPINProviderFactory {
         title = BKUGUIFacade.TITLE_RETRY;
         message = BKUGUIFacade.MESSAGE_RETRIES;
         params = new Object[]{String.valueOf(retries)};
-      } else {
-        title = BKUGUIFacade.TITLE_SIGN;
+      } else if (type == DIALOG.VERIFY) {
+        title = PINManagementGUIFacade.TITLE_VERIFY_PIN;
         message = BKUGUIFacade.MESSAGE_ENTERPIN_PINPAD;
         String pinSize = String.valueOf(pinSpec.getMinLength());
         if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
           pinSize += "-" + pinSpec.getMaxLength();
         }
         params = new Object[]{pinSpec.getLocalizedName(), pinSize};
+      } else if (type == DIALOG.ACTIVATE) {
+        title = PINManagementGUIFacade.TITLE_ACTIVATE_PIN;
+        message = PINManagementGUIFacade.MESSAGE_ACTIVATEPIN_PINPAD;
+        String pinSize = String.valueOf(pinSpec.getMinLength());
+        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+          pinSize += "-" + pinSpec.getMaxLength();
+        }
+        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
+      } else if (type == DIALOG.CHANGE) {
+        title = PINManagementGUIFacade.TITLE_CHANGE_PIN;
+        message = PINManagementGUIFacade.MESSAGE_CHANGEPIN_PINPAD;
+        String pinSize = String.valueOf(pinSpec.getMinLength());
+        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+          pinSize += "-" + pinSpec.getMaxLength();
+        }
+        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
+      } else { //if (type == DIALOG.UNBLOCK) {
+        title = PINManagementGUIFacade.TITLE_UNBLOCK_PIN;
+        message = PINManagementGUIFacade.MESSAGE_UNBLOCKPIN_PINPAD;
+        String pinSize = String.valueOf(pinSpec.getMinLength());
+        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+          pinSize += "-" + pinSpec.getMaxLength();
+        }
+        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
       }
       gui.showMessageDialog(title, message, params);
     }
diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
index 4ceacb21..c6d219d4 100644
--- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
+++ b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
@@ -24,12 +24,14 @@ title.change.success=<html>Erfolg</html>
 
 # removed message.* prefix to reuse keys as help keys
 pin.mgmt=<html>Die Karte verf\u00FCgt \u00FCber {0} PINs</html>
-pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben und best\u00E4tigen.</html>
-pinpad.change=<html>{0} ({1} stellig) am Kartenleser eingeben und best\u00E4tigen.</html>
 activate.pin=<html>{0} eingeben und best\u00E4tigen</html>
 change.pin=<html>{0} eingeben und best\u00E4tigen</html>
 unblock.pin=<html>PUK zu {0} eingeben</html>
 verify.pin=<html>{0} eingeben (TODO: Warning not activated)</html>
+verify.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben (und best\u00E4tigen).</html>
+activate.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben und wiederholen (jeweils best\u00E4tigen).</html>
+change.pinpad=<html>Alte {0} ({1} stellig) am Kartenleser eingeben, danach neue {0} eingeben und wiederholen (jeweils best\u00E4tigen). </html>
+unblock.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben (und best\u00E4tigen).</html>
 activate.success=<html>{0} wurde erfolgreich aktiviert.</html>
 change.success=<html>{0} wurde erfolgreich ge\u00E4ndert.</html>
 
diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
index 9178d65c..b4bededf 100644
--- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
+++ b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
@@ -23,11 +23,13 @@ title.change.success=<html>Success</html>
 
 # removed message.* prefix to reuse keys as help keys
 pin.mgmt=<html>The smartcard has {0} PINs</html>
-pinpad=<html>Enter {0} ({1} digits) on pinpad and confirm.</html>
-pinpad.change=<html>Enter {0} ({1} digits) on pinpad and confirm.</html>
 activate.pin=<html>Enter and confirm {0}</html>
 change.pin=<html>Enter and confirm {0}</html>
 unblock.pin=<html>Enter PUK for {0}</html>
+verify.pinpad=<html>Enter {0} ({1} digits) on cardreader (and confirm).</html>
+activate.pinpad=<html>Enter {0} ({1} digits) on cardreader and repeat (confirm in each case).</html>
+change.pinpad=<html>Enter old {0} ({1} digits) on cardreader, then enter new {0} and repeat (confirm in each case).</html>
+unblock.pinpad=<html>Enter {0} ({1} digits) on cardreader (and confirm).</html>
 activate.success=<html>{0} successfully activated</html>
 change.success=<html>{0} successfully changed</html>
 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 1043b6a1..4b079428 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -43,6 +43,7 @@ public interface BKUGUIFacade {
   
   public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
   public static final String DEFAULT_BACKGROUND = "/images/BackgroundChipperling.png";
+  public static final String DEFAULT_ICON = "/images/ChipperlingLogo.png";
   public static final String HELP_IMG = "/images/help.png";
   public static final String HASHDATA_FONT = "Monospaced";
   public static final Color ERROR_COLOR = Color.RED;
@@ -58,6 +59,7 @@ public interface BKUGUIFacade {
   public static final String TITLE_WAIT = "title.wait";
   public static final String TITLE_HASHDATA = "title.hashdata";
   public static final String WINDOWTITLE_SAVE = "windowtitle.save";
+  public static final String WINDOWTITLE_ERROR = "windowtitle.error";
   public static final String WINDOWTITLE_SAVEDIR = "windowtitle.savedir";
   public static final String WINDOWTITLE_OVERWRITE = "windowtitle.overwrite";
   public static final String WINDOWTITLE_VIEWER = "windowtitle.viewer";
@@ -102,42 +104,36 @@ public interface BKUGUIFacade {
 
   public enum Style { tiny, simple, advanced };
     
-//  public void init(Container contentPane, Locale locale, Style guiStyle, URL background, ActionListener helpListener);
-
   /**
    * BKUWorker needs to init signature card with locale
    * @return
    */
   public Locale getLocale();
 
-//  public void showWelcomeDialog();
-
-  /**
-   * 
-   * @param waitMessage if null, a simple 'please wait' text is displayed
-   */
-//  public void showWaitDialog(String waitMessage);
-
-//  public void showInsertCardDialog(ActionListener cancelListener, String actionCommand);
-
-//  public void showCardNotSupportedDialog(ActionListener cancelListener, String actionCommand);
-
   public void showCardPINDialog(PINSpec pinSpec, int numRetries,
           ActionListener okListener, String okCommand,
           ActionListener cancelListener, String cancelCommand);
 
-//  public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand);
-
-  public void showSignaturePINDialog(PINSpec pinSpec, int numRetries, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand);
-
-//  public void showSignaturePINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand);
+  public void showSignaturePINDialog(PINSpec pinSpec, int numRetries,
+          ActionListener signListener, String signCommand,
+          ActionListener cancelListener, String cancelCommand,
+          ActionListener viewerListener, String viewerCommand);
 
-//  public void showPinpadSignaturePINDialog(PINSpec pinSpec, int retries);
+  public void showPinpadSignaturePINDialog(PINSpec pinSpec, int numRetries, 
+          ActionListener viewerListener, String viewerCommand);
 
   public char[] getPin();
 
-  public void showSecureViewer(List<HashDataInput> signedReferences,
-          ActionListener okListener, String okCommand);
+  /**
+   *
+   * @param dataToBeSigned
+   * @param backListener if list of references hides pin dialog, backListener
+   * receives an action when user hits 'back' button (i.e. whenever the pin-dialog
+   * needs to be re-paint)
+   * @param backCommand
+   */
+  public void showSecureViewer(List<HashDataInput> dataToBeSigned,
+          ActionListener backListener, String backCommand);
 
   public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams,
           ActionListener okListener, String okCommand);
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 928be249..a7eebbfd 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -71,6 +71,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
     }
 
     protected HelpMouseListener helpListener;
+    protected SecureViewerDialog secureViewer;
     
     protected Container contentPane;
     protected ResourceBundle messages;
@@ -145,13 +146,16 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 @Override
                 public void run() {
                   
-                  log.debug("initializing gui");
+                  log.debug("initializing gui [" + Thread.currentThread().getName() + "]");
 
                   if (renderIconPanel) {
                     initIconPanel(background);
                     initContentPanel(null);
                   } else {
-                    initContentPanel(background);
+                    initContentPanel((background == null) ?
+                      getClass().getResource(DEFAULT_BACKGROUND) :
+                      background
+                    );
                   }
                   
                   GroupLayout layout = new GroupLayout(contentPane);
@@ -159,15 +163,27 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   
                   if (renderIconPanel) {
                     layout.setHorizontalGroup(layout.createSequentialGroup()
-                        .addComponent(iconPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
-                        .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));
+                            .addContainerGap()
+                            .addComponent(iconPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
+                            .addComponent(contentPanel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                            .addContainerGap());
+                    layout.setVerticalGroup(layout.createSequentialGroup()
+                            .addContainerGap()
+                            .addGroup(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))
+                            .addContainerGap());
                   } else {
-                    layout.setHorizontalGroup(layout.createSequentialGroup().addComponent(contentPanel));
-                    layout.setVerticalGroup(layout.createSequentialGroup().addComponent(contentPanel));
+                    layout.setHorizontalGroup(layout.createSequentialGroup()
+                            // left border
+                            .addContainerGap()
+                            .addComponent(contentPanel)
+                            .addContainerGap());
+                    layout.setVerticalGroup(layout.createSequentialGroup()
+                            .addContainerGap()
+                            .addComponent(contentPanel)
+                            .addContainerGap());
                   }
                 }
             });
@@ -178,11 +194,12 @@ public class BKUGUIImpl implements BKUGUIFacade {
     
     protected void initIconPanel(URL background) {
       if (background == null) {
-        background = getClass().getResource(DEFAULT_BACKGROUND);
+        background = getClass().getResource(DEFAULT_ICON);
       }
       if ("file".equals(background.getProtocol())) {
-        log.warn("file:// background images not permitted: " + background);
-        background = getClass().getResource(DEFAULT_BACKGROUND);
+        log.warn("file:// background images not permitted: " + background +
+                ", loading default background");
+        background = getClass().getResource(DEFAULT_ICON);
       }
       log.debug("loading icon panel background " + background);
       
@@ -194,26 +211,24 @@ public class BKUGUIImpl implements BKUGUIFacade {
       iconPanel.setLayout(iconPanelLayout);
       iconPanelLayout.setHorizontalGroup(
         iconPanelLayout.createSequentialGroup()
-          .addContainerGap()
           .addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
-          // no gap here (contentPanel has containerGap)
       iconPanelLayout.setVerticalGroup(
         iconPanelLayout.createSequentialGroup()
-          .addContainerGap()
-          .addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE));
+          .addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
     }
 
     protected void initContentPanel(URL background) { 
 
+//      if (background == null) {
+//        background = getClass().getResource(DEFAULT_BACKGROUND);
+//      }
       if (background == null) {
-        background = getClass().getResource(DEFAULT_BACKGROUND);
-      }
-      if (background == null) {
+        log.debug("no background image set");
           contentPanel = new JPanel();
       } else {
           if ("file".equals(background.getProtocol())) {
-            log.warn("file:// background images not permitted: " + background);
+            log.warn("file:// background images not permitted: " + background +
+                    ", loading default background");
             background = getClass().getResource(DEFAULT_BACKGROUND);
           }
           log.debug("loading background " + background);
@@ -257,34 +272,29 @@ public class BKUGUIImpl implements BKUGUIFacade {
       GroupLayout contentPanelLayout = new GroupLayout(contentPanel);
       contentPanel.setLayout(contentPanelLayout);
 
-      GroupLayout.ParallelGroup horizontalContentInner = contentPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+      // align header, main and button to the right
+      GroupLayout.ParallelGroup horizontalContent =
+              contentPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING); //LEADING);
+      GroupLayout.SequentialGroup verticalContent =
+              contentPanelLayout.createSequentialGroup();
+
       if (renderHeaderPanel) {
-        horizontalContentInner
+        horizontalContent
                 .addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE);
+        verticalContent
+                .addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
+
       }
-      horizontalContentInner
+      horizontalContent
               .addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-              .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE);
-      GroupLayout.SequentialGroup horizontalContentOuter = contentPanelLayout.createSequentialGroup();
-      if (!renderIconPanel) {
-        horizontalContentOuter
-                .addContainerGap();
-      }
-      horizontalContentOuter
-              .addGroup(horizontalContentInner)
-              .addContainerGap();
-      contentPanelLayout.setHorizontalGroup(horizontalContentOuter);
-      
-      GroupLayout.SequentialGroup verticalContent = contentPanelLayout.createSequentialGroup();
-      verticalContent.addContainerGap();
-      if (renderHeaderPanel) {
-        verticalContent.addComponent(headerPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
-      }
-      verticalContent.addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 
-        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
-        .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-        .addContainerGap();
+              .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE); //Short.MAX_VALUE);
+      verticalContent
+              .addComponent(mainPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+              .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
+              .addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
+
+      contentPanelLayout.setHorizontalGroup(horizontalContent); //Outer);
       contentPanelLayout.setVerticalGroup(verticalContent);
     }
 
@@ -521,7 +531,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
             @Override
             public void run() {
 
-              log.debug("show card-pin dialog");
+              log.debug("show card-pin dialog [" + Thread.currentThread().getName() + "]");
       
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
@@ -653,7 +663,6 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 buttonPanel.setLayout(buttonPanelLayout);
 
                 GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                         .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
                 GroupLayout.Group buttonVertical;
                 
@@ -700,6 +709,128 @@ public class BKUGUIImpl implements BKUGUIFacade {
 //        showSignaturePINDialog(pinSpec, -1, signListener, signCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
 //    }
 
+    @Override
+    public void showPinpadSignaturePINDialog(final PINSpec pinSpec, final int numRetries,
+//            final ActionListener cancelListener, final String cancelCommand,
+            final ActionListener hashdataListener, final String hashdataCommand) {
+
+        log.debug("scheduling pinpad signature-pin dialog");
+
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+
+              log.debug("show pinpad signature-pin dialog [" + Thread.currentThread().getName() + "]");
+
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+                if (renderHeaderPanel) {
+                  if (numRetries < 0) {
+                      titleLabel.setText(getMessage(TITLE_SIGN));
+                  } else {
+                      titleLabel.setText(getMessage(TITLE_RETRY));
+                  }
+                }
+
+                JLabel infoLabel = new JLabel();
+                if (numRetries < 0) {
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  if (shortText) {
+                    infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_TINY));
+                  } else {
+                    infoLabel.setText(getMessage(MESSAGE_HASHDATALINK));
+                  }
+                  infoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                  infoLabel.setForeground(HYPERLINK_COLOR);
+                  infoLabel.addMouseListener(new MouseAdapter() {
+
+                      @Override
+                      public void mouseClicked(MouseEvent me) {
+                          ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
+                          hashdataListener.actionPerformed(e);
+                      }
+                  });
+                  helpListener.setHelpTopic(HELP_SIGNPIN);
+                } else {
+                  String retryPattern;
+                  if (numRetries < 2) {
+                    retryPattern = getMessage(MESSAGE_LAST_RETRY);
+                  } else {
+                    retryPattern = getMessage(MESSAGE_RETRIES);
+                  }
+                  infoLabel.setText(MessageFormat.format(retryPattern, new Object[]{String.valueOf(numRetries)}));
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                  infoLabel.setForeground(ERROR_COLOR);
+                  helpListener.setHelpTopic(HELP_RETRY);
+                }
+
+                String pinSize = String.valueOf(pinSpec.getMinLength());
+                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+                    pinSize += "-" + pinSpec.getMaxLength();
+                }
+
+                String msgPattern = getMessage(MESSAGE_ENTERPIN_PINPAD);
+                String msg = MessageFormat.format(msgPattern, new Object[] {
+                  pinSpec.getLocalizedName(), pinSize });
+
+                JLabel msgLabel = new JLabel();
+                msgLabel.setFont(msgLabel.getFont().deriveFont(msgLabel.getFont().getStyle() & ~Font.BOLD));
+                msgLabel.setText(msg);
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
+                        .addComponent(infoLabel);
+                GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                        .addComponent(infoLabel);
+
+                if (!renderHeaderPanel) {
+                  infoHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel);
+                  infoVertical
+                          .addComponent(helpLabel);
+                }
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addGroup(infoHorizontal)
+                    .addComponent(msgLabel));
+
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createSequentialGroup()
+                    .addGroup(infoVertical)
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addComponent(msgLabel));
+
+                //no cancel button (cancel via pinpad)
+//                if (renderCancelButton) {
+//                    JButton cancelButton = new JButton();
+//                    cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+//                    cancelButton.setText(getMessage(BUTTON_CANCEL));
+//                    cancelButton.setActionCommand(cancelCommand);
+//                    cancelButton.addActionListener(cancelListener);
+//
+//                    GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+//                    buttonPanel.setLayout(buttonPanelLayout);
+//
+//                    GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
+//                            .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+//                    GroupLayout.SequentialGroup buttonVertical = buttonPanelLayout.createSequentialGroup()
+//                            .addComponent(cancelButton);
+//
+//                    buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
+//                    buttonPanelLayout.setVerticalGroup(buttonVertical);
+//                }
+
+                contentPanel.validate();
+            }
+        });
+    }
+
     @Override
     public void showSignaturePINDialog(final PINSpec pinSpec, final int numRetries,
             final ActionListener signListener, final String signCommand,
@@ -717,7 +848,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
             @Override
             public void run() {
               
-              log.debug("show signature-pin dialog");
+              log.debug("show signature-pin dialog [" + Thread.currentThread().getName() + "]");
       
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
@@ -730,6 +861,38 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   }
                 }
 
+                JLabel infoLabel = new JLabel();
+                if (numRetries < 0) {
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  if (shortText) {
+                    infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_TINY));
+                  } else {
+                    infoLabel.setText(getMessage(MESSAGE_HASHDATALINK));
+                  }
+                  infoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                  infoLabel.setForeground(HYPERLINK_COLOR);
+                  infoLabel.addMouseListener(new MouseAdapter() {
+
+                      @Override
+                      public void mouseClicked(MouseEvent me) {
+                          ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
+                          hashdataListener.actionPerformed(e);
+                      }
+                  });
+                  helpListener.setHelpTopic(HELP_SIGNPIN);
+                } else {
+                  String retryPattern;
+                  if (numRetries < 2) {
+                    retryPattern = getMessage(MESSAGE_LAST_RETRY);
+                  } else {
+                    retryPattern = getMessage(MESSAGE_RETRIES);
+                  }
+                  infoLabel.setText(MessageFormat.format(retryPattern, new Object[]{String.valueOf(numRetries)}));
+                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
+                  infoLabel.setForeground(ERROR_COLOR);
+                  helpListener.setHelpTopic(HELP_RETRY);
+                }
+
                 JButton signButton = new JButton();
                 signButton.setFont(signButton.getFont().deriveFont(signButton.getFont().getStyle() & ~java.awt.Font.BOLD));
                 signButton.setText(getMessage(BUTTON_SIGN));
@@ -765,46 +928,14 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 }
                 pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
 
-                JLabel infoLabel = new JLabel();
-                if (numRetries < 0) {
-                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                  if (shortText) {
-                    infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_TINY));
-                  } else {
-                    infoLabel.setText(getMessage(MESSAGE_HASHDATALINK));
-                  }
-                  infoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-                  infoLabel.setForeground(HYPERLINK_COLOR);
-                  infoLabel.addMouseListener(new MouseAdapter() {
-
-                      @Override
-                      public void mouseClicked(MouseEvent me) {
-                          ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
-                          hashdataListener.actionPerformed(e);
-                      }
-                  });
-                  helpListener.setHelpTopic(HELP_SIGNPIN);
-                } else {
-                  String retryPattern;
-                  if (numRetries < 2) {
-                    retryPattern = getMessage(MESSAGE_LAST_RETRY);
-                  } else {
-                    retryPattern = getMessage(MESSAGE_RETRIES);
-                  }
-                  infoLabel.setText(MessageFormat.format(retryPattern, new Object[]{String.valueOf(numRetries)}));
-                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                  infoLabel.setForeground(ERROR_COLOR);
-                  helpListener.setHelpTopic(HELP_RETRY);
-                }
-
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
-                
+
                 GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
                         .addComponent(infoLabel);
                 GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                         .addComponent(infoLabel);
-                       
+
                 if (!renderHeaderPanel) {
                   infoHorizontal
                           .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
@@ -814,8 +945,8 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 }
 
                 // align pinfield and pinsize to the right
-                GroupLayout.ParallelGroup pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING);
-                GroupLayout.Group pinVertical;
+                GroupLayout.Group pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING);
+                GroupLayout.SequentialGroup pinVertical = mainPanelLayout.createSequentialGroup();
 
                 if (pinLabelPos == PinLabelPosition.ABOVE) {
                   pinHorizontal
@@ -823,20 +954,25 @@ public class BKUGUIImpl implements BKUGUIFacade {
                             .addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                             .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                           .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
-                  pinVertical = mainPanelLayout.createSequentialGroup()
+                  pinVertical
                           .addComponent(signPinLabel)
                           .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                          .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
-                } else {
+                          .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(pinsizeLabel);
+                } else { // PinLabelPosition.LEFT
                   pinHorizontal
                           .addGroup(mainPanelLayout.createSequentialGroup()
                             .addComponent(signPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                             .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                             .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                           .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
-                  pinVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                          .addComponent(signPinLabel)
-                          .addComponent(pinField);
+                  pinVertical
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(signPinLabel)
+                            .addComponent(pinField))
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(pinsizeLabel);
                 }
 
                 mainPanelLayout.setHorizontalGroup(
@@ -848,18 +984,14 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   mainPanelLayout.createSequentialGroup()
                     .addGroup(infoVertical)
                     .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addGroup(pinVertical)
-                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addComponent(pinsizeLabel));
+                    .addGroup(pinVertical));
 
                 GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
                 buttonPanel.setLayout(buttonPanelLayout);
 
-                GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(signButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup();
                 GroupLayout.Group buttonVertical;
-                
+
                 if (renderCancelButton) {
                   JButton cancelButton = new JButton();
                   cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -868,17 +1000,19 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   cancelButton.addActionListener(cancelListener);
 
                   buttonHorizontal
+                          .addComponent(signButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
                           .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
                           .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
-                  
                   buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
                           .addComponent(signButton)
-                          .addComponent(cancelButton); 
+                          .addComponent(cancelButton);
                 } else {
+                  buttonHorizontal
+                          .addComponent(signButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
                   buttonVertical = buttonPanelLayout.createSequentialGroup()
                           .addComponent(signButton);
                 }
-                
+
                 buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
                 buttonPanelLayout.setVerticalGroup(buttonVertical);
 
@@ -951,7 +1085,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
           @Override
             public void run() {
 
-                log.debug("show message dialog");
+                log.debug("show message dialog [" + Thread.currentThread().getName() + "]");
 
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
@@ -1011,7 +1145,6 @@ public class BKUGUIImpl implements BKUGUIFacade {
 
                   buttonPanelLayout.setHorizontalGroup(
                     buttonPanelLayout.createSequentialGroup()
-                          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                           .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
                   buttonPanelLayout.setVerticalGroup(
                     buttonPanelLayout.createSequentialGroup()
@@ -1084,68 +1217,69 @@ public class BKUGUIImpl implements BKUGUIFacade {
         }
         return null;
     }
+
+
+    ////////////////////////////////////////////////////////////////////////////
+    // SECURE VIEWER
+    ////////////////////////////////////////////////////////////////////////////
+
     
     /**
-     * TODO handle multiple references in HashDataViewer
      * @param signedReferences
-     * @param okListener
+     * @param backListener gets notified if pin-dialog has to be redrawn
+     * (signedRefencesList returns via BACK button)
      * @param okCommand
      */
     @Override
-    public void showSecureViewer(final List<HashDataInput> signedReferences,
-            final ActionListener okListener, 
-            final String okCommand) {
-      
-      if (signedReferences == null) {
-        showErrorDialog(getMessage(ERR_NO_HASHDATA), new Object[] {"No SignedReferences provided"}, okListener, okCommand);
-        return;
-      }
+    public void showSecureViewer(final List<HashDataInput> dataToBeSigned,
+            final ActionListener backListener, final String backCommand) {
       
-      if (signedReferences.size() == 1) {
+      if (dataToBeSigned == null) {
+        showErrorDialog(getMessage(ERR_NO_HASHDATA),
+                new Object[] {"no signature data provided"},
+                backListener, backCommand);
+      } else if (dataToBeSigned.size() == 1) {
         try {
-          log.debug("scheduling hashdata viewer");
+          log.debug("scheduling secure viewer");
 
-          SwingUtilities.invokeAndWait(new Runnable() {
+          SwingUtilities.invokeLater(new Runnable() {
 
             @Override
             public void run() {
-              ActionListener saveHashDataListener = new ActionListener() {
-
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                  HashDataInput hdi = signedReferences.get(0);
-                  showSaveHashDataInputDialog(Collections.singletonList(hdi), okListener, okCommand);
-                }
-              };
-              showHashDataViewer(signedReferences.get(0), saveHashDataListener, "save");
+              showSecureViewer(dataToBeSigned.get(0)); 
             }
           });
        
-        } catch (InterruptedException ex) {
-          log.error("Failed to display HashDataViewer: " + ex.getMessage());
-        } catch (InvocationTargetException ex) {
-          log.error("Failed to display HashDataViewer: " + ex.getMessage());
+        } catch (Exception ex) { //InterruptedException InvocationTargetException
+          log.error("Failed to display secure viewer: " + ex.getMessage());
+          log.trace(ex);
+          showErrorDialog(ERR_UNKNOWN, null, backListener, backCommand);
         }
       } else {
-        showSignedReferencesListDialog(signedReferences, okListener, okCommand);
+        showSignedReferencesListDialog(dataToBeSigned, backListener, backCommand);
       }
     }
     
     /**
      * has to be called from event dispatcher thread
+     * This method blocks until the dialog's close button is pressed.
      * @param hashDataText
      * @param saveListener
      * @param saveCommand
      */
-    private void showHashDataViewer(final HashDataInput hashDataInput, final ActionListener saveListener, final String saveCommand) {
+    private void showSecureViewer(HashDataInput dataToBeSigned) {
       
-      log.debug("show hashdata viewer");
-
-      ActionListener l = helpListener.getActionListener();
-      HashDataViewer.showHashDataInput(contentPane, hashDataInput, messages, saveListener, saveCommand, l);
+      log.debug("show secure viewer [" + Thread.currentThread().getName() + "]");
+      if (secureViewer == null) {
+        secureViewer = new SecureViewerDialog(null, messages,
+                helpListener.getActionListener());
+      }
+      secureViewer.setContent(dataToBeSigned);
+      log.trace("show secure viewer returned");
     }
     
-    private void showSignedReferencesListDialog(final List<HashDataInput> signedReferences, final ActionListener backListener, final String backCommand) {
+    private void showSignedReferencesListDialog(final List<HashDataInput> signedReferences,
+            final ActionListener backListener, final String backCommand) {
       
       log.debug("scheduling signed references list dialog");
       
@@ -1154,7 +1288,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
         @Override
         public void run() {
           
-          log.debug("show signed references list dialog");
+          log.debug("show signed references list dialog [" + Thread.currentThread().getName() + "]");
           
           mainPanel.removeAll();
           buttonPanel.removeAll();
@@ -1202,13 +1336,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   int selectionIdx = lsm.getMinSelectionIndex();
                   if (selectionIdx >= 0) {
                     final HashDataInput selection = signedReferences.get(selectionIdx);
-                    showHashDataViewer(selection, new ActionListener() {
-
-                      @Override
-                      public void actionPerformed(ActionEvent e) {
-                        showSaveHashDataInputDialog(Collections.singletonList(selection), null, null);
-                      }
-                    }, "save");
+                    showSecureViewer(selection);
                   }
                 }
               });
@@ -1255,9 +1383,8 @@ public class BKUGUIImpl implements BKUGUIFacade {
           buttonPanel.setLayout(buttonPanelLayout);
 
           buttonPanelLayout.setHorizontalGroup(buttonPanelLayout.createSequentialGroup()
-                  .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                   .addComponent(backButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-          buttonPanelLayout.setVerticalGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+          buttonPanelLayout.setVerticalGroup(buttonPanelLayout.createSequentialGroup()
                   .addComponent(backButton));
 
           contentPanel.validate();
@@ -1266,96 +1393,101 @@ public class BKUGUIImpl implements BKUGUIFacade {
     }
     
     /**
-     * 
-     * @param signedRefs
      * @param okListener may be null
-     * @param okCommand
      */
-    private void showSaveHashDataInputDialog(final List<HashDataInput> signedRefs, final ActionListener okListener, final String okCommand) {
-      
-      log.debug("scheduling save hashdatainput dialog");
-      
-      SwingUtilities.invokeLater(new Runnable() {
+//    private void showSaveDialog(final List<HashDataInput> signedRefs,
+//            final ActionListener okListener, final String okCommand) {
+//
+//      log.debug("scheduling save dialog");
+//
+//      SwingUtilities.invokeLater(new Runnable() {
+//
+//        @Override
+//        public void run() {
+//
+//          log.debug("show save dialog");
+//
+//          String userHome = System.getProperty("user.home");
+//
+//          JFileChooser fileDialog = new JFileChooser(userHome);
+//          fileDialog.setMultiSelectionEnabled(false);
+//          fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
+//          fileDialog.setFileHidingEnabled(true);
+//          if (signedRefs.size() == 1) {
+//            fileDialog.setDialogTitle(getMessage(WINDOWTITLE_SAVE));
+//            fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
+//            String mimeType = signedRefs.get(0).getMimeType();
+//            MimeFilter mimeFilter = new MimeFilter(mimeType, messages);
+//            fileDialog.setFileFilter(mimeFilter);
+//            String filename = getMessage(SAVE_HASHDATAINPUT_PREFIX) + MimeFilter.getExtension(mimeType);
+//            fileDialog.setSelectedFile(new File(userHome, filename));
+//          } else {
+//            fileDialog.setDialogTitle(getMessage(WINDOWTITLE_SAVEDIR));
+//            fileDialog.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+//          }
+//
+//          //parent contentPane -> placed over applet
+//          switch (fileDialog.showSaveDialog(fileDialog)) {
+//            case JFileChooser.APPROVE_OPTION:
+//              File f = fileDialog.getSelectedFile();
+//              for (HashDataInput hashDataInput : signedRefs) {
+//                String mimeType = hashDataInput.getMimeType();
+//                String id = hashDataInput.getReferenceId();
+//                File file;
+//                if (f.isDirectory()) {
+//                  String filename = getMessage(SAVE_HASHDATAINPUT_PREFIX) + '_' + id + MimeFilter.getExtension(mimeType);
+//                  file = new File(f, filename);
+//                } else {
+//                  file = f;
+//                }
+//                if (file.exists()) {
+//                  String ovrwrt = getMessage(MESSAGE_OVERWRITE);
+//                  int overwrite = JOptionPane.showConfirmDialog(fileDialog, MessageFormat.format(ovrwrt, file), getMessage(WINDOWTITLE_OVERWRITE), JOptionPane.OK_CANCEL_OPTION);
+//                  if (overwrite != JOptionPane.OK_OPTION) {
+//                    continue;
+//                  }
+//                }
+//                if (log.isDebugEnabled()) {
+//                    log.debug("writing hashdata input " + id + " (" + mimeType + ") to file " + file);
+//                }
+//                FileOutputStream fos = null;
+//                try {
+//                    fos = new FileOutputStream(file);
+//                    BufferedOutputStream bos = new BufferedOutputStream(fos);
+//                    InputStream hdi = hashDataInput.getHashDataInput();
+//                    int b;
+//                    while ((b = hdi.read()) != -1) {
+//                        bos.write(b);
+//                    }
+//                    bos.flush();
+//                    bos.close();
+//                } catch (IOException ex) {
+//                    log.error("Failed to write " + file + ": " + ex.getMessage());
+//                    showErrorDialog(ERR_WRITE_HASHDATA, new Object[] {ex.getMessage()}, null, null);
+//                    ex.printStackTrace();
+//                } finally {
+//                    try {
+//                        fos.close();
+//                    } catch (IOException ex) {
+//                    }
+//                }
+//              }
+//              break;
+//            case JFileChooser.CANCEL_OPTION :
+//              log.debug("cancelled save dialog");
+//              break;
+//          }
+//          if (okListener != null) {
+//            okListener.actionPerformed(new ActionEvent(fileDialog, ActionEvent.ACTION_PERFORMED, okCommand));
+//          }
+//        }
+//      });
+//    }
+
+    ////////////////////////////////////////////////////////////////////////////
+    // UTILITY METHODS
+    ////////////////////////////////////////////////////////////////////////////
 
-        @Override
-        public void run() {
-          
-          log.debug("show save hashdatainput dialog");
-      
-          String userHome = System.getProperty("user.home");
-          
-          JFileChooser fileDialog = new JFileChooser(userHome); 
-          fileDialog.setMultiSelectionEnabled(false);
-          fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
-          fileDialog.setFileHidingEnabled(true);
-          if (signedRefs.size() == 1) {
-            fileDialog.setDialogTitle(getMessage(WINDOWTITLE_SAVE));
-            fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
-            String mimeType = signedRefs.get(0).getMimeType();
-            MimeFilter mimeFilter = new MimeFilter(mimeType, messages);
-            fileDialog.setFileFilter(mimeFilter);
-            String filename = getMessage(SAVE_HASHDATAINPUT_PREFIX) + MimeFilter.getExtension(mimeType);
-            fileDialog.setSelectedFile(new File(userHome, filename));
-          } else {
-            fileDialog.setDialogTitle(getMessage(WINDOWTITLE_SAVEDIR));
-            fileDialog.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-          }
-          
-          //parent contentPane -> placed over applet
-          switch (fileDialog.showSaveDialog(fileDialog)) {
-            case JFileChooser.APPROVE_OPTION:
-              File f = fileDialog.getSelectedFile();
-              for (HashDataInput hashDataInput : signedRefs) {
-                String mimeType = hashDataInput.getMimeType();
-                String id = hashDataInput.getReferenceId();
-                File file;
-                if (f.isDirectory()) {
-                  String filename = getMessage(SAVE_HASHDATAINPUT_PREFIX) + '_' + id + MimeFilter.getExtension(mimeType);
-                  file = new File(f, filename);
-                } else {
-                  file = f;
-                }
-                if (file.exists()) {
-                  String ovrwrt = getMessage(MESSAGE_OVERWRITE);
-                  int overwrite = JOptionPane.showConfirmDialog(fileDialog, MessageFormat.format(ovrwrt, file), getMessage(WINDOWTITLE_OVERWRITE), JOptionPane.OK_CANCEL_OPTION);
-                  if (overwrite != JOptionPane.OK_OPTION) {
-                    continue;
-                  }
-                }
-                if (log.isDebugEnabled()) {
-                    log.debug("Writing HashDataInput " + id + " (" + mimeType + ") to file " + file);
-                }
-                FileOutputStream fos = null;
-                try {
-                    fos = new FileOutputStream(file);
-                    BufferedOutputStream bos = new BufferedOutputStream(fos);
-                    InputStream hdi = hashDataInput.getHashDataInput();
-                    int b;
-                    while ((b = hdi.read()) != -1) {
-                        bos.write(b);
-                    }
-                    bos.flush();
-                    bos.close();
-                } catch (IOException ex) {
-                    log.error("Failed to write HashDataInput to file " + file + ": " + ex.getMessage());
-                    showErrorDialog(ERR_WRITE_HASHDATA, new Object[] {ex.getMessage()}, null, null);
-                    ex.printStackTrace();
-                } finally {
-                    try {
-                        fos.close();
-                    } catch (IOException ex) {
-                    }
-                }    
-              }  
-          }
-          log.debug("done saving hashdatainput");
-          if (okListener != null) {
-            okListener.actionPerformed(new ActionEvent(fileDialog, ActionEvent.ACTION_PERFORMED, okCommand));
-          }
-        }
-      });
-    }
-    
     private void registerHelpListener(ActionListener helpListener) {
       if (helpListener != null) {
         this.helpListener = new HelpMouseListener(helpListener);
@@ -1371,6 +1503,11 @@ public class BKUGUIImpl implements BKUGUIFacade {
       }
     }
 
+
+    ////////////////////////////////////////////////////////////////////////////
+    // INITIALIZERS (MAY BE OVERRIDDEN BY SUBCLASSES)
+    ////////////////////////////////////////////////////////////////////////////
+
     /**
      * Called from constructor.
      * Subclasses may override this method to ensure the message bundle is loaded
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
deleted file mode 100644
index 6c097b2a..00000000
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataViewer.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.gui;
-
-import at.gv.egiz.bku.gui.html.RestrictedHTMLEditorKit;
-import at.gv.egiz.stal.HashDataInput;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
-import javax.swing.GroupLayout;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JEditorPane;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.LayoutStyle;
-import javax.swing.text.Document;
-import javax.swing.text.EditorKit;
-import javax.swing.text.StyledEditorKit;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class HashDataViewer extends JDialog
-        implements ActionListener {
-
-  public static final String PLAINTEXT_FONT = "Monospaced";
-  protected static final Log log = LogFactory.getLog(HashDataViewer.class);
-
-  private static HashDataViewer dialog;
-  
-  protected ResourceBundle messages;
-  
-  /**
-   * 
-   * @param signedReferences currently, only one hashdata input (the first in the list) is displayed
-   */
-  public static void showHashDataInput(HashDataInput hashDataInput,
-          ResourceBundle messages,
-          ActionListener saveListener,
-          String saveCommand,
-          ActionListener helpListener) {
-    showHashDataInput(null, hashDataInput, messages, saveListener, saveCommand, helpListener);
-  }
-  
-  /**
-   * 
-   * @param frameComp owner
-   */
-  public static void showHashDataInput(Component frameComp,
-          HashDataInput hashDataInput,
-          ResourceBundle messages,
-          ActionListener saveListener,
-          String saveCommand,
-          ActionListener helpListener) {
-    
-    Frame frame = null;
-    if (frameComp != null) {
-      JOptionPane.getFrameForComponent(frameComp);
-    }
-    dialog = new HashDataViewer(frame, 
-            messages,
-            hashDataInput, 
-            saveListener, 
-            saveCommand, 
-            helpListener);
-    dialog.setVisible(true);
-  }
-
-  private HashDataViewer(Frame frame,
-          ResourceBundle messages,
-          HashDataInput hashDataInput,
-          ActionListener saveListener,
-          String saveCommand,
-          ActionListener helpListener) {
-    super(frame, messages.getString(BKUGUIFacade.WINDOWTITLE_VIEWER), true);
-    this.messages = messages;
-
-    Charset cs;
-    if (hashDataInput.getEncoding() == null) {
-      cs = Charset.forName("UTF-8");
-    } else {
-      try {
-        cs = Charset.forName(hashDataInput.getEncoding());
-      } catch (Exception ex) {
-        log.debug("charset " + hashDataInput.getEncoding() + " not supported, assuming UTF-8: " + ex.getMessage());
-        cs = Charset.forName("UTF-8");
-      }  
-    }
-    
-    
-    InputStreamReader isr = new InputStreamReader(hashDataInput.getHashDataInput(), cs);
-    Reader content = new BufferedReader(isr);
-  
-    JPanel hashDataPanel = createViewerPanel(content, 
-            hashDataInput.getMimeType(), 
-            helpListener);
-    JPanel buttonPanel = createButtonPanel(saveListener, saveCommand);
-    initContentPane(new Dimension(600, 400), hashDataPanel, buttonPanel);
-
-    pack();
-    if (frame != null) {
-      setLocationRelativeTo(frame);
-    } else {
-      setLocationByPlatform(true);
-    }
-  }
-
-  private void initContentPane(Dimension preferredSize, JPanel viewerPanel, JPanel buttonPanel) {
-    Container contentPane = getContentPane();
-    contentPane.setPreferredSize(preferredSize);
-
-    GroupLayout mainLayout = new GroupLayout(contentPane);
-    contentPane.setLayout(mainLayout);
-
-    mainLayout.setHorizontalGroup(
-            mainLayout.createSequentialGroup().addContainerGap().addGroup(
-            mainLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)).addContainerGap());
-    mainLayout.setVerticalGroup(
-            mainLayout.createSequentialGroup()
-              .addContainerGap()
-              .addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-              .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED)
-              .addComponent(buttonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-              .addContainerGap());
-  }
-
-  /**
-   * 
-   * @param messages
-   * @param content
-   * @param mimeType defaults to text/plain if null 
-   * @param encoding must be null if document contains charset declaration (e.g. HTML page), otherwise the parser crashes
-   * @param helpListener may be null
-   * @return
-   */
-  private JPanel createViewerPanel(Reader content, 
-          String mimeType, 
-          final ActionListener helpListener) {
-
-    if (mimeType == null) {
-      mimeType = "text/plain";
-    }
-    log.debug("viewer dialog: " + mimeType);
-
-    JEditorPane viewer = new JEditorPane();
-    viewer.setEditable(false);
-    viewer.setContentType(mimeType);
-    
-    if ("text/plain".equals(mimeType)) {
-      viewer.setEditorKit(new StyledEditorKit());
-      viewer.setFont(new Font(PLAINTEXT_FONT, viewer.getFont().getStyle(), viewer.getFont().getSize()));
-//    } else if ("text/html".equals(mimeType)) {
-//      viewer.setEditorKit(new RestrictedHTMLEditorKit());
-    } else if ("application/xhtml+xml".equals(mimeType)) {
-      viewer.setContentType("text/html");
-    }
-    
-    EditorKit editorKit = viewer.getEditorKit();
-    Document document = editorKit.createDefaultDocument();
-//    document.putProperty("IgnoreCharsetDirective", new Boolean(true));
-    
-    try {
-        viewer.read(content, document);
-        content.close();
-    } catch (Exception ex) {
-      log.error(ex.getMessage(), ex);
-      String p = messages.getString(BKUGUIFacade.ERR_VIEWER);
-      viewer.setText(MessageFormat.format(p, ex.getMessage()));
-    }
-
-    JScrollPane scrollPane = new JScrollPane(viewer);
-    scrollPane.setPreferredSize(viewer.getPreferredSize());
-    scrollPane.setAlignmentX(LEFT_ALIGNMENT);
-    viewer.setCaretPosition(0);
-
-    JPanel viewerPanel = new JPanel();
-    GroupLayout viewerPanelLayout = new GroupLayout(viewerPanel);
-    viewerPanel.setLayout(viewerPanelLayout);
-
-    GroupLayout.SequentialGroup infoHorizontal = viewerPanelLayout.createSequentialGroup();
-    GroupLayout.ParallelGroup infoVertical = viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
-
-    if ("application/xhtml+xml".equals(mimeType)) {
-      JLabel viewerLabel = new JLabel();
-      viewerLabel.setText(messages.getString(BKUGUIFacade.WARNING_XHTML));
-      viewerLabel.setFont(viewerLabel.getFont().deriveFont(viewerLabel.getFont().getStyle() | java.awt.Font.BOLD));
-      viewerLabel.setLabelFor(viewer);
-
-      infoHorizontal.addComponent(viewerLabel);
-      infoVertical.addComponent(viewerLabel);
-    }
-
-    if (helpListener != null) {
-      JLabel helpLabel = new JLabel();
-      helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG)));
-      helpLabel.getAccessibleContext().setAccessibleName(messages.getString(BKUGUIFacade.ALT_HELP));
-      helpLabel.addMouseListener(new MouseAdapter() {
-
-        @Override
-        public void mouseClicked(MouseEvent arg0) {
-            ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, BKUGUIFacade.HELP_HASHDATAVIEWER);
-            helpListener.actionPerformed(e);
-        }
-      });
-      helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-
-      infoHorizontal
-              .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-              .addComponent(helpLabel);
-      infoVertical
-              .addComponent(helpLabel);
-    }
-
-    viewerPanelLayout.setHorizontalGroup(
-          viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-            .addGroup(infoHorizontal)
-            .addComponent(scrollPane));
-    viewerPanelLayout.setVerticalGroup(
-          viewerPanelLayout.createSequentialGroup()
-            .addGroup(infoVertical)
-            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-            .addComponent(scrollPane));
-
-    
-    return viewerPanel;
-  }
-  
-  private JPanel createButtonPanel(ActionListener saveListener, String saveCommand) {
-    JButton closeButton = new JButton();
-    closeButton.setText(messages.getString(BKUGUIFacade.BUTTON_CLOSE));
-    closeButton.addActionListener(this);
-
-    JButton saveButton = new JButton();
-    saveButton.setText(messages.getString(BKUGUIFacade.BUTTON_SAVE));
-    saveButton.setActionCommand(saveCommand);
-    saveButton.addActionListener(saveListener);
-
-    int buttonSize = closeButton.getPreferredSize().width;
-    if (saveButton.getPreferredSize().width > buttonSize) {
-      buttonSize = saveButton.getPreferredSize().width;
-    }
-
-    JPanel buttonPanel = new JPanel();
-    GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-    buttonPanel.setLayout(buttonPanelLayout);
-
-    buttonPanelLayout.setHorizontalGroup(
-            buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(saveButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(closeButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-    buttonPanelLayout.setVerticalGroup(
-            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(closeButton));
-
-    return buttonPanel;
-  }
-
-  @Override
-  public void actionPerformed(ActionEvent e) {
-    HashDataViewer.dialog.setVisible(false);
-  }
-}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
new file mode 100644
index 00000000..6a16306b
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
@@ -0,0 +1,371 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.stal.HashDataInput;
+import java.awt.Container;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.Charset;
+import java.text.MessageFormat;
+import java.util.ResourceBundle;
+import javax.swing.GroupLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JEditorPane;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.LayoutStyle;
+import javax.swing.SwingUtilities;
+import javax.swing.text.Document;
+import javax.swing.text.EditorKit;
+import javax.swing.text.StyledEditorKit;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class SecureViewerDialog extends JDialog implements ActionListener {
+
+  public static final String PLAINTEXT_FONT = "Monospaced";
+  public static final Dimension VIEWER_DIMENSION = new Dimension(600, 400);
+  protected static final Log log = LogFactory.getLog(SecureViewerDialog.class);
+
+//  private static SecureViewerDialog dialog;
+  protected ResourceBundle messages;
+  protected JEditorPane viewer;
+  protected JLabel viewerLabel;
+  protected JScrollPane scrollPane;
+  protected HashDataInput content; //remember for save dialog
+
+  /**
+   * Create and display a modal SecureViewer dialog.
+   * This method blocks until the dialog's close button is pressed.
+   * 
+   * @param owner, dialog is positioned relative to its owner
+   * (if null, at default location of native windowing system)
+   */
+//  public static void showDataToBeSigned(HashDataInput dataToBeSigned,
+//          ResourceBundle messages,
+//          ActionListener saveListener, String saveCommand,
+//          ActionListener helpListener) {
+//
+////      Frame ownerFrame = (owner != null) ?
+////        JOptionPane.getFrameForComponent(owner) :
+////        null;
+//    dialog = new SecureViewerDialog(null, messages,
+//            saveListener, saveCommand, helpListener);
+//    dialog.setContent(dataToBeSigned);
+//    dialog.setVisible(true);
+//  }
+  public SecureViewerDialog(Frame owner, ResourceBundle messages,
+//          ActionListener saveListener, String saveCommand,
+          ActionListener helpListener) {
+    super(owner, messages.getString(BKUGUIFacade.WINDOWTITLE_VIEWER), true);
+    this.messages = messages;
+
+    initContentPane(VIEWER_DIMENSION,
+            createViewerPanel(helpListener),
+            createButtonPanel()); //saveListener, saveCommand));
+
+    pack();
+    if (owner != null) {
+      setLocationRelativeTo(owner);
+    } else {
+      setLocationByPlatform(true);
+    }
+  }
+
+  private void initContentPane(Dimension preferredSize,
+          JPanel viewerPanel, JPanel buttonPanel) {
+    Container contentPane = getContentPane();
+    contentPane.setPreferredSize(preferredSize);
+
+    GroupLayout mainLayout = new GroupLayout(contentPane);
+    contentPane.setLayout(mainLayout);
+
+    mainLayout.setHorizontalGroup(
+            mainLayout.createSequentialGroup().addContainerGap().addGroup(
+            mainLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(buttonPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)).addContainerGap());
+    mainLayout.setVerticalGroup(
+            mainLayout.createSequentialGroup().addContainerGap().addComponent(viewerPanel, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED).addComponent(buttonPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE).addContainerGap());
+  }
+
+  /**
+   * @param helpListener may be null
+   */
+  private JPanel createViewerPanel(final ActionListener helpListener) {
+    viewer = new JEditorPane();
+    viewer.setEditable(false);
+
+    scrollPane = new JScrollPane();
+
+    JPanel viewerPanel = new JPanel();
+    GroupLayout viewerPanelLayout = new GroupLayout(viewerPanel);
+    viewerPanel.setLayout(viewerPanelLayout);
+
+    GroupLayout.SequentialGroup infoHorizontal = viewerPanelLayout.createSequentialGroup();
+    GroupLayout.ParallelGroup infoVertical = viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+
+    viewerLabel = new JLabel();
+    viewerLabel.setFont(viewerLabel.getFont().deriveFont(viewerLabel.getFont().getStyle() | java.awt.Font.BOLD));
+//    viewerLabel.setLabelFor(viewer);
+
+    infoHorizontal.addComponent(viewerLabel);
+    infoVertical.addComponent(viewerLabel);
+
+    if (helpListener != null) {
+      JLabel helpLabel = new JLabel();
+      helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG)));
+      helpLabel.getAccessibleContext().setAccessibleName(messages.getString(BKUGUIFacade.ALT_HELP));
+      helpLabel.addMouseListener(new MouseAdapter() {
+
+        @Override
+        public void mouseClicked(MouseEvent arg0) {
+          ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, BKUGUIFacade.HELP_HASHDATAVIEWER);
+          helpListener.actionPerformed(e);
+        }
+      });
+      helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+
+      infoHorizontal.addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE).addComponent(helpLabel);
+      infoVertical.addComponent(helpLabel);
+    }
+
+    viewerPanelLayout.setHorizontalGroup(
+            viewerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(infoHorizontal).addComponent(scrollPane));
+    viewerPanelLayout.setVerticalGroup(
+            viewerPanelLayout.createSequentialGroup().addGroup(infoVertical).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(scrollPane));
+
+    return viewerPanel;
+  }
+
+  /**
+   * Sets the hashdataInput to be displayed and makes the dialog visible.
+   * This method blocks until the dialog's close button is pressed.
+   * 
+   * @param mimeType defaults to text/plain if null
+   * @param encoding must be null if document contains charset declaration (e.g. HTML page), otherwise the parser crashes
+
+   * @param hashDataInput
+   */
+  public void setContent(HashDataInput hashDataInput) {
+
+    this.content = null;
+
+    String mimeType = hashDataInput.getMimeType();
+    if (mimeType == null) {
+      mimeType = "text/plain";
+    }
+    log.debug("secure viewer mime type: " + mimeType);
+    // loads editorkit for text/plain if unrecognized
+    viewer.setContentType(mimeType);
+
+    if ("text/plain".equals(mimeType)) {
+      viewer.setEditorKit(new StyledEditorKit());
+      viewer.setFont(new Font(PLAINTEXT_FONT, viewer.getFont().getStyle(), viewer.getFont().getSize()));
+//    } else if ("text/html".equals(mimeType)) {
+//      viewer.setEditorKit(new RestrictedHTMLEditorKit());
+    } else if ("application/xhtml+xml".equals(mimeType)) {
+      viewer.setContentType("text/html");
+    }
+
+    EditorKit editorKit = viewer.getEditorKit();
+    Document document = editorKit.createDefaultDocument();
+//    document.putProperty("IgnoreCharsetDirective", new Boolean(true));
+
+    try {
+      Charset cs = (hashDataInput.getEncoding() == null) ? Charset.forName("UTF-8") : Charset.forName(hashDataInput.getEncoding());
+      log.debug("secure viewer encoding: " + cs.toString());
+
+      InputStreamReader isr = new InputStreamReader(hashDataInput.getHashDataInput(), cs);
+      Reader contentReader = new BufferedReader(isr);
+      viewer.read(contentReader, document);
+      contentReader.close();
+
+      this.content = hashDataInput;
+
+//    } catch (IllegalCharsetNameException ex) {
+//    } catch (UnsupportedCharsetException ex) {
+    } catch (Exception ex) {
+      log.error(ex.getMessage(), ex);
+      String p = messages.getString(BKUGUIFacade.ERR_VIEWER);
+      viewer.setText(MessageFormat.format(p, ex.getMessage()));
+    }
+    viewer.setCaretPosition(0);
+
+    scrollPane.setViewportView(viewer);
+    scrollPane.setPreferredSize(viewer.getPreferredSize());
+    scrollPane.setAlignmentX(LEFT_ALIGNMENT);
+
+    if ("application/xhtml+xml".equals(mimeType)) {
+      viewerLabel.setText(messages.getString(BKUGUIFacade.WARNING_XHTML));
+    } else {
+      viewerLabel.setText("");
+    }
+
+    setVisible(true);
+  }
+
+  private JPanel createButtonPanel() { //ActionListener saveListener, String saveCommand) {
+    JButton closeButton = new JButton();
+    closeButton.setText(messages.getString(BKUGUIFacade.BUTTON_CLOSE));
+    closeButton.setActionCommand("close");
+    closeButton.addActionListener(this);
+    
+    JButton saveButton = new JButton();
+    saveButton.setText(messages.getString(BKUGUIFacade.BUTTON_SAVE));
+    saveButton.setActionCommand("save");
+    saveButton.addActionListener(this);
+
+    int buttonSize = closeButton.getPreferredSize().width;
+    if (saveButton.getPreferredSize().width > buttonSize) {
+      buttonSize = saveButton.getPreferredSize().width;
+    }
+
+    JPanel buttonPanel = new JPanel();
+    GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+    buttonPanel.setLayout(buttonPanelLayout);
+
+    buttonPanelLayout.setHorizontalGroup(
+            buttonPanelLayout.createSequentialGroup().addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE).addComponent(saveButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(closeButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+    buttonPanelLayout.setVerticalGroup(
+            buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(saveButton).addComponent(closeButton));
+
+    return buttonPanel;
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    if ("close".equals(e.getActionCommand())) {
+//    SecureViewerDialog.dialog.setVisible(false);
+      log.trace("closing secure viewer");
+      setVisible(false);
+      log.trace("secure viewer closed");
+    } else if ("save".equals(e.getActionCommand())) {
+      log.trace("display secure viewer save dialog");
+      showSaveDialog(content, null, null);
+      log.trace("done secure viewer save");
+    } else {
+      log.warn("unknown action command " + e.getActionCommand());
+    }
+  }
+
+  private void showSaveDialog(final HashDataInput hashDataInput,
+          final ActionListener okListener, final String okCommand) {
+
+    log.debug("scheduling save dialog [" + Thread.currentThread().getName() + "]");
+
+    SwingUtilities.invokeLater(new Runnable() {
+
+      @Override
+      public void run() {
+
+        log.debug("show save dialog [" + Thread.currentThread().getName() + "]");
+
+        String userHome = System.getProperty("user.home");
+
+        JFileChooser fileDialog = new JFileChooser(userHome);
+        fileDialog.setMultiSelectionEnabled(false);
+        fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
+        fileDialog.setFileHidingEnabled(true);
+        fileDialog.setDialogTitle(messages.getString(BKUGUIFacade.WINDOWTITLE_SAVE));
+        fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
+        String mimeType = hashDataInput.getMimeType();
+        MimeFilter mimeFilter = new MimeFilter(mimeType, messages);
+        fileDialog.setFileFilter(mimeFilter);
+        String filename = messages.getString(BKUGUIFacade.SAVE_HASHDATAINPUT_PREFIX) +
+                MimeFilter.getExtension(mimeType);
+        fileDialog.setSelectedFile(new File(userHome, filename));
+
+        //parent contentPane -> placed over applet
+        switch (fileDialog.showSaveDialog(fileDialog)) {
+          case JFileChooser.APPROVE_OPTION:
+            File file = fileDialog.getSelectedFile();
+            String id = hashDataInput.getReferenceId();
+            if (file.exists()) {
+              String msgPattern = messages.getString(BKUGUIFacade.MESSAGE_OVERWRITE);
+              int overwrite = JOptionPane.showConfirmDialog(fileDialog,
+                      MessageFormat.format(msgPattern, file),
+                      messages.getString(BKUGUIFacade.WINDOWTITLE_OVERWRITE),
+                      JOptionPane.OK_CANCEL_OPTION);
+              if (overwrite != JOptionPane.OK_OPTION) {
+                return;
+              }
+            }
+            if (log.isDebugEnabled()) {
+              log.debug("writing hashdata input " + id + " (" + mimeType + ") to file " + file);
+            }
+            FileOutputStream fos = null;
+            try {
+              fos = new FileOutputStream(file);
+              BufferedOutputStream bos = new BufferedOutputStream(fos);
+              InputStream hdi = hashDataInput.getHashDataInput();
+              int b;
+              while ((b = hdi.read()) != -1) {
+                bos.write(b);
+              }
+              bos.flush();
+              bos.close();
+            } catch (IOException ex) {
+              log.error("Failed to write " + file + ": " + ex.getMessage());
+              log.debug(ex);
+              String errPattern = messages.getString(BKUGUIFacade.ERR_WRITE_HASHDATA);
+              JOptionPane.showMessageDialog(fileDialog,
+                      MessageFormat.format(errPattern, ex.getMessage()),
+                      messages.getString(BKUGUIFacade.WINDOWTITLE_ERROR),
+                      JOptionPane.ERROR_MESSAGE);
+            } finally {
+              try {
+                if (fos != null) {
+                  fos.close();
+                }
+              } catch (IOException ex) {
+              }
+            }
+            break;
+          case JFileChooser.CANCEL_OPTION:
+            log.debug("cancelled save dialog");
+            break;
+        }
+        if (okListener != null) {
+          okListener.actionPerformed(new ActionEvent(fileDialog, ActionEvent.ACTION_PERFORMED, okCommand));
+        }
+      }
+    });
+  }
+}
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 6d651b2d..9bfe8fb1 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -25,6 +25,7 @@ title.retry=<html>Falsche PIN</html>
 title.wait=<html>Bitte warten</html>
 title.hashdata=<html>Signaturdaten</html>
 windowtitle.save=Signaturdaten speichern
+windowtitle.error=Fehler
 windowtitle.savedir=Signaturdaten in Verzeichnis speichern
 windowtitle.overwrite=Datei \u00FCberschreiben?
 windowtitle.viewer=Signaturdaten
@@ -79,7 +80,7 @@ error.unknown.param=<html>Ein Fehler trat auf: {0}</html>
 error.unknown=<html>Ein Fehler trat auf</html>
 error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
 error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
-error.card.notactivated=<html>B\u00FCrgerkartenfunktion ist nicht aktiviert</html>
+error.card.notactivated=<html>Die B\u00FCrgerkarte ist nicht aktiviert</html>
 error.pin.timeout=<html>Zeit\u00FCberschreitung bei Eingabe der PIN</html>
 error.viewer=Der Inhalt kann nicht dargestellt werden: {0}
 error.external.link=<html>Externer Link {0} wird nicht ge\u00F6ffnet</html>
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index 2fb66969..a36f9b83 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -25,6 +25,7 @@ title.retry=<html>Wrong PIN</html>
 title.wait=<html>Please wait</html>
 title.hashdata=<html>Signature data</html>
 windowtitle.save=Save signature data
+windowtitle.error=Error
 windowtitle.savedir=Save signature data to directory
 windowtitle.overwrite=Overwrite file?
 windowtitle.viewer=Signature data
diff --git a/BKUCommonGUI/src/main/resources/images/ChipperlingLogo.png b/BKUCommonGUI/src/main/resources/images/ChipperlingLogo.png
new file mode 100644
index 00000000..eee4be4f
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/images/ChipperlingLogo.png differ
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index c8cff617..b3eaf8c7 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -39,8 +39,9 @@ public class BKUGUITest {
     public void testBKUGUI() {
         JFrame testFrame = new JFrame("BKUGUITest");
         Container contentPane = testFrame.getContentPane();
-        contentPane.setPreferredSize(new Dimension(170, 150));
-        BKUGUIFacade gui = new BKUGUIImpl(contentPane, null, BKUGUIFacade.Style.tiny, null, null);
+//        contentPane.setPreferredSize(new Dimension(170, 150));
+        contentPane.setPreferredSize(new Dimension(290, 190));
+        BKUGUIFacade gui = new BKUGUIImpl(contentPane, null, BKUGUIFacade.Style.advanced, null, null);
         BKUGUIWorker worker = new BKUGUIWorker();
         worker.init(gui);
         testFrame.pack();
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 194e18b0..5475a45b 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
@@ -149,7 +149,9 @@ public class BKUGUIWorker implements Runnable {
 //            
 //            Thread.sleep(2000);
 //
-            gui.showSignaturePINDialog(signPinSpec, -1, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+//            gui.showSignaturePINDialog(signPinSpec, -1, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+
+    gui.showPinpadSignaturePINDialog(signPinSpec, -1, hashdataListener, "hashdata");
 //
 //            Thread.sleep(4000);
 //
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
index 5a0ba84a..3f560967 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
@@ -144,4 +144,12 @@ public class BKUGuiProxy implements BKUGUIFacade {
     showDialog();
     delegate.showMessageDialog(titleKey, msgKey);
   }
+
+  @Override
+  public void showPinpadSignaturePINDialog(PINSpec pinSpec, int numRetries,
+          ActionListener viewerListener, String viewerCommand) {
+    showDialog();
+    delegate.showPinpadSignaturePINDialog(pinSpec, numRetries,
+            viewerListener, viewerCommand);
+  }
 }
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
index 61cc7c4c..a782de1a 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
@@ -37,7 +37,8 @@ public class LocalBKUWorker extends AbstractBKUWorker {
   public LocalBKUWorker(BKUGUIFacade gui, JDialog container) {
     super(gui);
     this.container = container;
-    addRequestHandler(SignRequest.class, new LocalSignRequestHandler());
+    addRequestHandler(SignRequest.class, 
+            new LocalSignRequestHandler(new LocalSecureViewer(gui)));
   }
 
   @Override
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSecureViewer.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSecureViewer.java
new file mode 100644
index 00000000..cbe5af7a
--- /dev/null
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSecureViewer.java
@@ -0,0 +1,109 @@
+
+package at.gv.egiz.bku.local.stal;
+
+import at.gv.egiz.bku.slcommands.impl.DataObjectHashDataInput;
+import at.gv.egiz.bku.smccstal.SecureViewer;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.stal.HashDataInput;
+import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
+import at.gv.egiz.stal.signedinfo.ReferenceType;
+import at.gv.egiz.stal.signedinfo.SignedInfoType;
+import java.awt.event.ActionListener;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class LocalSecureViewer implements SecureViewer {
+
+  private static final Log log = LogFactory.getLog(LocalSignRequestHandler.class);
+  private List<HashDataInput> hashDataInputs = Collections.EMPTY_LIST;
+
+  protected BKUGUIFacade gui;
+
+  public LocalSecureViewer(BKUGUIFacade gui) {
+    this.gui = gui;
+  }
+
+  public void setDataToBeSigned(List<HashDataInput> dataToBeSigned) {
+    this.hashDataInputs = dataToBeSigned;
+  }
+
+  /**
+   *
+   * @param dsigReferences
+   * @throws java.lang.Exception
+   */
+  @Override
+  public void displayDataToBeSigned(SignedInfoType signedInfo,
+          ActionListener okListener, String okCommand)
+          throws Exception {
+    if (signedInfo.getReference().size() == 0) {
+      log.error("No hashdata input selected to be displayed: null");
+      throw new Exception("No HashData Input selected to be displayed");
+    }
+
+    ArrayList<HashDataInput> selectedHashDataInputs = new ArrayList<HashDataInput>();
+    for (ReferenceType dsigRef : signedInfo.getReference()) {
+      // don't get Manifest, QualifyingProperties, ...
+      if (dsigRef.getType() == null) {
+        String dsigRefId = dsigRef.getId();
+        if (dsigRefId != null) {
+          boolean hdiAvailable = false;
+          for (HashDataInput hashDataInput : hashDataInputs) {
+            if (dsigRefId.equals(hashDataInput.getReferenceId())) {
+              log.debug("display hashdata input for dsig:SignedReference " +
+                      dsigRefId);
+              selectedHashDataInputs.add(
+                      ensureCachedHashDataInput(hashDataInput));
+              hdiAvailable = true;
+              break;
+            }
+          }
+          if (!hdiAvailable) {
+            log.error("no hashdata input for dsig:SignedReference " + dsigRefId);
+            throw new Exception(
+              "No HashDataInput available for dsig:SignedReference " + dsigRefId);
+          }
+        } else {
+          throw new Exception(
+            "Cannot get HashDataInput for dsig:Reference without Id attribute");
+        }
+      }
+    }
+
+    if (selectedHashDataInputs.size() < 1) {
+      log.error("dsig:SignedInfo does not contain a data reference");
+      throw new Exception("dsig:SignedInfo does not contain a data reference");
+    }
+    gui.showSecureViewer(selectedHashDataInputs, okListener, okCommand);
+  }
+
+
+  private HashDataInput ensureCachedHashDataInput(HashDataInput hashDataInput)
+          throws IOException {
+    if (!(hashDataInput instanceof DataObjectHashDataInput)) {
+      
+      log.warn("expected DataObjectHashDataInput for LocalSignRequestHandler, got " +
+              hashDataInput.getClass().getName());
+
+      InputStream hdIs = hashDataInput.getHashDataInput();
+      ByteArrayOutputStream baos = new ByteArrayOutputStream(hdIs.available());
+      int b;
+      while ((b = hdIs.read()) != -1) {
+        baos.write(b);
+      }
+      hashDataInput = new ByteArrayHashDataInput(baos.toByteArray(),
+              hashDataInput.getReferenceId(),
+              hashDataInput.getMimeType(),
+              hashDataInput.getEncoding());
+    }
+    return hashDataInput;
+  }
+
+}
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
index 531e6591..492b8a05 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
@@ -16,9 +16,7 @@
  */
 package at.gv.egiz.bku.local.stal;
 
-import at.gv.egiz.bku.slcommands.impl.DataObjectHashDataInput;
-import java.io.IOException;
-import java.util.ArrayList;
+import at.gv.egiz.bku.smccstal.SecureViewer;
 import java.util.Collections;
 import java.util.List;
 
@@ -40,9 +38,16 @@ import java.io.InputStream;
  * @author clemens
  */
 public class LocalSignRequestHandler extends SignRequestHandler {
+//        implements SecureViewer {
 
   private static final Log log = LogFactory.getLog(LocalSignRequestHandler.class);
-  private List<HashDataInput> hashDataInputs = Collections.EMPTY_LIST;
+
+  protected LocalSecureViewer secureViewer;
+
+  public LocalSignRequestHandler(LocalSecureViewer secureViewer) {
+    super(secureViewer);
+  }
+
 
   /**
    * If the request is a SIGN request, it contains a list of DataObjectHashDataInput 
@@ -53,75 +58,13 @@ public class LocalSignRequestHandler extends SignRequestHandler {
    */
   @SuppressWarnings("unchecked")
   @Override
-  public STALResponse handleRequest(STALRequest request) throws InterruptedException {
+  public STALResponse handleRequest(STALRequest request) 
+          throws InterruptedException {
+    
     if (request instanceof SignRequest) {
       SignRequest signReq = (SignRequest) request;
-      hashDataInputs = signReq.getHashDataInput();
+      secureViewer.setDataToBeSigned(signReq.getHashDataInput());
     }
     return super.handleRequest(request);
   }
-
-  /**
-   * 
-   * @param dsigReferences
-   * @throws java.lang.Exception
-   */
-  @Override
-  public void displayDataToBeSigned(List<ReferenceType> dsigReferences) throws Exception {
-    if (dsigReferences == null || dsigReferences.size() < 1) {
-      log.error("No hashdata input selected to be displayed: null");
-      throw new Exception("No HashData Input selected to be displayed");
-    }
-
-    ArrayList<HashDataInput> selectedHashDataInputs = new ArrayList<HashDataInput>();
-    for (ReferenceType dsigRef : dsigReferences) {
-      // don't get Manifest, QualifyingProperties, ...
-      if (dsigRef.getType() == null) {
-        String dsigRefId = dsigRef.getId();
-        if (dsigRefId != null) {
-          boolean hdiAvailable = false;
-          for (HashDataInput hashDataInput : hashDataInputs) {
-            if (dsigRefId.equals(hashDataInput.getReferenceId())) {
-              log.debug("display hashdata input for dsig:SignedReference " + dsigRefId);
-              if (!(hashDataInput instanceof DataObjectHashDataInput)) {
-                log.warn(
-                  "expected DataObjectHashDataInput for LocalSignRequestHandler, got " + hashDataInput.getClass().getName());
-                hashDataInput = getByteArrayHashDataInput(hashDataInput);
-              }
-              selectedHashDataInputs.add(hashDataInput);
-              hdiAvailable = true;
-              break;
-            }
-          }
-          if (!hdiAvailable) {
-            log.error("no hashdata input for dsig:SignedReference " + dsigRefId);
-            throw new Exception(
-              "No HashDataInput available for dsig:SignedReference " + dsigRefId);
-          }
-        } else {
-          throw new Exception(
-            "Cannot get HashDataInput for dsig:Reference without Id attribute");
-        }
-      }
-    }
-
-    if (selectedHashDataInputs.size() < 1) {
-      log.error("dsig:SignedInfo does not contain a data reference");
-      throw new Exception("dsig:SignedInfo does not contain a data reference");
-    }
-    gui.showSecureViewer(selectedHashDataInputs, this, "hashDataDone");
-  }
-
-  private ByteArrayHashDataInput getByteArrayHashDataInput(HashDataInput hashDataInput) throws IOException {
-
-    InputStream hdIs = hashDataInput.getHashDataInput();
-    ByteArrayOutputStream baos = new ByteArrayOutputStream(hdIs.available());
-    int b;
-    while ((b = hdIs.read()) != -1) {
-      baos.write(b);
-    }
-    ByteArrayHashDataInput hdi = new ByteArrayHashDataInput(baos.toByteArray(), hashDataInput.getReferenceId(), hashDataInput.getMimeType(), hashDataInput.getEncoding());
-
-    return hdi;
-  }
 }
diff --git a/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties b/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties
index e2f07481..04c9c7bf 100644
--- a/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties
+++ b/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties
@@ -40,9 +40,12 @@ SSL.sslProtocol=TLS
 # warning do not set the following property to true
 # its intended for debugging and testing only 
 SSL.disableAllChecks=false
+#SSL.disableHostnameVerification=true
 
 # ------------ END SSL Config  --------------------
 
+#UserAgent=citizen-card-environment/1.2 MOCCA/1.0
+
 ValidateHashDataInputs=true
 AppletTimeout=300000
 
diff --git a/BKUOnline/src/main/resources/log4j.properties b/BKUOnline/src/main/resources/log4j.properties
index f608c83d..25ea9faa 100644
--- a/BKUOnline/src/main/resources/log4j.properties
+++ b/BKUOnline/src/main/resources/log4j.properties
@@ -30,7 +30,7 @@ log4j.appender.STDOUT.layout.ConversionPattern=%-5p | %t | %c %x - %m%n
 log4j.appender.file=org.apache.log4j.RollingFileAppender
 log4j.appender.file.maxFileSize=500KB
 log4j.appender.file.maxBackupIndex=9
-log4j.appender.file.File=${catalina.home}/logs/bkuonline.log
+log4j.appender.file.File=${catalina.base}/logs/bkuonline.log
 log4j.appender.file.threshold=trace
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p | %t | %c{1}:%L - %m%n
\ No newline at end of file
diff --git a/BKUOnline/src/main/webapp/SLRequestForm.html b/BKUOnline/src/main/webapp/SLRequestForm.html
index 9ff7b68a..4714e82f 100644
--- a/BKUOnline/src/main/webapp/SLRequestForm.html
+++ b/BKUOnline/src/main/webapp/SLRequestForm.html
@@ -103,6 +103,33 @@
 </sl:InfoboxReadRequest>
 -->
 <!--
+<?xml version="1.0" encoding="UTF-8"?>
+<sl:CreateXMLSignatureRequest
+   xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
+  <sl:KeyboxIdentifier>SecureSignatureKeypair</sl:KeyboxIdentifier>
+   <sl:DataObjectInfo Structure="enveloping">
+     <sl:DataObject>
+       <sl:XMLContent>Ich bin ein einfacher Text.</sl:XMLContent>
+     </sl:DataObject>
+    <sl:TransformsInfo>
+      <sl:FinalDataMetaInfo>
+       <sl:MimeType>text/plain</sl:MimeType>
+       </sl:FinalDataMetaInfo>
+    </sl:TransformsInfo>
+  </sl:DataObjectInfo>
+  <sl:DataObjectInfo Structure="enveloping">
+     <sl:DataObject>
+       <sl:XMLContent><html xmlns="http://www.w3.org/1999/xhtml"><head><title>TestXHTML</title><style/></head><body><p>Ich bin ein einfacher Text.</p></body></html></sl:XMLContent>
+     </sl:DataObject>
+    <sl:TransformsInfo>
+      <sl:FinalDataMetaInfo>
+       <sl:MimeType>application/xhtml+xml</sl:MimeType>
+       </sl:FinalDataMetaInfo>
+    </sl:TransformsInfo>
+  </sl:DataObjectInfo>
+</sl:CreateXMLSignatureRequest>
+-->
+<!--
 <?xml version='1.0' encoding='UTF-8'?>
 <sl10:InfoboxUpdateRequest xmlns:sl10='http://www.buergerkarte.at/namespaces/securitylayer/1.2#'>
     <sl10:InfoboxIdentifier>CardChannel</sl10:InfoboxIdentifier>
diff --git a/bkucommon/src/test/java/at/gv/egiz/bku/binding/ExpiryRemoverTest.java b/bkucommon/src/test/java/at/gv/egiz/bku/binding/ExpiryRemoverTest.java
index 61729567..0e64e7a2 100644
--- a/bkucommon/src/test/java/at/gv/egiz/bku/binding/ExpiryRemoverTest.java
+++ b/bkucommon/src/test/java/at/gv/egiz/bku/binding/ExpiryRemoverTest.java
@@ -14,54 +14,57 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package at.gv.egiz.bku.binding;
-
+package at.gv.egiz.bku.binding;
+
 import java.net.MalformedURLException;
 
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class ExpiryRemoverTest {
-  
-  @Test
-  public void testMe() throws InterruptedException, MalformedURLException {
-    BindingProcessorManager manager = new BindingProcessorManagerImpl(new DummyStalFactory(),
-        new SLCommandInvokerImpl());
-    BindingProcessor bp = manager.createBindingProcessor("http://www.at", null);
-    ExpiryRemover remover = new ExpiryRemover();
-    remover.setBindingProcessorManager(manager);
-    remover.execute();
-    manager.process(bp);
-    remover.execute();
-    assertTrue(manager.getManagedIds().size() == 1);
-    remover.setMaxAcceptedAge(1000);
-    Thread.sleep(500);
-    remover.execute();
-    assertTrue(manager.getManagedIds().size() == 1);
-    Thread.sleep(510);
-    remover.execute();
-    assertTrue(manager.getManagedIds().size() == 0);
-  }
-  
-  @Test
-  public void testMe2() throws InterruptedException, MalformedURLException {
-    BindingProcessorManager manager = new BindingProcessorManagerImpl(new DummyStalFactory(),
-        new SLCommandInvokerImpl());
-    BindingProcessor bp = manager.createBindingProcessor("http://www.iaik.at", null);
-    ExpiryRemover remover = new ExpiryRemover();
-    remover.setBindingProcessorManager(manager);
-    remover.execute();
-    manager.process(bp);
-    remover.execute();
-    assertTrue(manager.getManagedIds().size() == 1);
-    remover.setMaxAcceptedAge(1000);
-    Thread.sleep(500);
-    remover.execute();
-    assertTrue(manager.getManagedIds().size() == 1);
-    bp.updateLastAccessTime();
-    Thread.sleep(510);
-    remover.execute();
-    assertTrue(manager.getManagedIds().size() == 1);
-  }
-
-}
+import org.junit.Ignore;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class ExpiryRemoverTest {
+  
+  @Test
+  @Ignore
+  public void testMe() throws InterruptedException, MalformedURLException {
+    BindingProcessorManager manager = new BindingProcessorManagerImpl(new DummyStalFactory(),
+        new SLCommandInvokerImpl());
+    BindingProcessor bp = manager.createBindingProcessor("http://www.at", null);
+    ExpiryRemover remover = new ExpiryRemover();
+    remover.setBindingProcessorManager(manager);
+    remover.execute();
+    manager.process(bp);
+    remover.execute();
+    assertTrue(manager.getManagedIds().size() == 1);
+    remover.setMaxAcceptedAge(1000);
+    Thread.sleep(500);
+    remover.execute();
+    assertTrue(manager.getManagedIds().size() == 1);
+    Thread.sleep(510);
+    remover.execute();
+    assertTrue(manager.getManagedIds().size() == 0);
+  }
+  
+  @Test
+  @Ignore
+  public void testMe2() throws InterruptedException, MalformedURLException {
+    BindingProcessorManager manager = new BindingProcessorManagerImpl(new DummyStalFactory(),
+        new SLCommandInvokerImpl());
+    BindingProcessor bp = manager.createBindingProcessor("http://www.iaik.at", null);
+    ExpiryRemover remover = new ExpiryRemover();
+    remover.setBindingProcessorManager(manager);
+    remover.execute();
+    manager.process(bp);
+    remover.execute();
+    assertTrue(manager.getManagedIds().size() == 1);
+    remover.setMaxAcceptedAge(1000);
+    Thread.sleep(500);
+    remover.execute();
+    assertTrue(manager.getManagedIds().size() == 1);
+    bp.updateLastAccessTime();
+    Thread.sleep(510);
+    remover.execute();
+    assertTrue(manager.getManagedIds().size() == 1);
+  }
+
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
index 01b9155b..06e4a018 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
@@ -28,6 +28,7 @@
 //
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.ccid.CCID;
 import at.gv.egiz.smcc.util.SMCCHelper;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
@@ -41,7 +42,7 @@ import javax.smartcardio.ResponseAPDU;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
+public class ACOSCard extends AbstractSignatureCard {
 
   private static Log log = LogFactory.getLog(ACOSCard.class);
 
@@ -180,22 +181,23 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
         //new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("inf.pin.name"));
         
         int retries = -1;
-        char[] pin = null;
-        boolean pinRequiered = false;
+        boolean pinRequired = false;
 
         do {
-          if (pinRequiered) {
-            pin = provider.providePIN(spec, retries);
-          }
           try {
             getCard().beginExclusive();
-            return readTLVFile(AID_DEC, EF_INFOBOX, pin, KID_PIN_INF, EF_INFOBOX_MAX_SIZE);
+            if (pinRequired) {
+              char[] pin = provider.providePIN(spec, retries);
+              return readTLVFile(AID_DEC, EF_INFOBOX, pin, spec.getKID(), EF_INFOBOX_MAX_SIZE);
+            } else {
+              return readTLVFile(AID_DEC, EF_INFOBOX, EF_INFOBOX_MAX_SIZE);
+            }
           } catch (FileNotFoundException e) {
             throw new NotActivatedException();
           } catch (SecurityStatusNotSatisfiedException e) {
-            pinRequiered = true;
+            pinRequired = true;
           } catch (VerificationFailedException e) {
-            pinRequiered = true;
+            pinRequired = true;
             retries = e.getRetries();
           } finally {
             getCard().endExclusive();
@@ -402,10 +404,10 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
           throws LockedException, NotActivatedException, CancelledException, TimeoutException, SignatureCardException {
     try {
       byte[] sw;
-      if (ifdSupportsFeature(FEATURE_VERIFY_PIN_DIRECT)) {
+      if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
         log.debug("verify PIN on IFD");
-        sw = transmitControlCommand(
-                ifdCtrlCmds.get(FEATURE_VERIFY_PIN_DIRECT),
+        sw = reader.transmitControlCommand(
+                CCID.FEATURE_VERIFY_PIN_DIRECT,
                 getPINVerifyStructure(kid));
 //        int sw = (resp[resp.length-2] & 0xff) << 8 | resp[resp.length-1] & 0xff;
       } else {
@@ -466,10 +468,10 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
           throws LockedException, NotActivatedException, CancelledException, TimeoutException, SignatureCardException {
     try {
        byte[] sw;
-      if (ifdSupportsFeature(FEATURE_MODIFY_PIN_DIRECT)) {
+      if (reader.hasFeature(CCID.FEATURE_MODIFY_PIN_DIRECT)) {
         log.debug("modify PIN on IFD");
-        sw = transmitControlCommand(
-                ifdCtrlCmds.get(FEATURE_MODIFY_PIN_DIRECT),
+        sw = reader.transmitControlCommand(
+                CCID.FEATURE_MODIFY_PIN_DIRECT,
                 getPINModifyStructure(kid));
 //        int sw = (resp[resp.length-2] & 0xff) << 8 | resp[resp.length-1] & 0xff;
       } else {
@@ -543,34 +545,37 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
   }
   
   private byte[] getPINVerifyStructure(byte kid) {
-
-      byte bTimeOut = (byte) 00;            // Default time out
-      byte bTimeOut2 = (byte) 00;           // Default time out
-      byte bmFormatString = (byte) 0x82;      // 1 0001 0 01
+      
+      byte bTimeOut = reader.getbTimeOut();   
+      byte bTimeOut2 = reader.getbTimeOut2(); 
+      byte bmFormatString = (byte) 0x82;      // 1 0000 0 10
                                               // ^------------ System unit = byte
                                               //   ^^^^------- PIN position in the frame = 1 byte
                                               //        ^----- PIN justification left
-                                              //          ^^-- BCD format
-                                              // 1 0000 0 10
                                               //          ^^-- ASCII format
-      byte bmPINBlockString = (byte) 0x08;    // 0100 0111
-                                              // ^^^^--------- PIN length size: 4 bits
-                                              //      ^^^^---- Length PIN = 7 bytes
-      byte bmPINLengthFormat = (byte) 0x04;   // 000 0 0100
+      byte bmPINBlockString = (byte) 0x08;    // 0000 1000
+                                              // ^^^^--------- PIN length size: 0 bits
+                                              //      ^^^^---- Length PIN = 8 bytes
+      byte bmPINLengthFormat = (byte) 0x00;   // 000 0 0000
                                               //     ^-------- System bit units is bit
-                                              //       ^^^^--- PIN length is at the 4th position bit
-      byte wPINMaxExtraDigitL = (byte) 0x04;  // Max=4 digits
-      byte wPINMaxExtraDigitH = (byte) 0x04;  // Min=4 digits
-      byte bEntryValidationCondition = 0x02;  // Max size reach or Validation key pressed
+                                              //       ^^^^--- no PIN length
+      byte wPINMaxExtraDigitL =
+              (reader.getwPINMaxExtraDigitL() < (byte) 0x08) ?
+                reader.getwPINMaxExtraDigitL() : (byte) 0x08;
+      byte wPINMaxExtraDigitH =               
+              (reader.getwPINMaxExtraDigitH() > (byte) 0x00) ?
+                reader.getwPINMaxExtraDigitH() : (byte) 0x00;
+      byte bEntryValidationCondition = 
+              reader.getbEntryValidationCondition();
       byte bNumberMessage = (byte) 0x00;      // No message
-      byte wLangIdL = (byte) 0x0C;            // - English?
-      byte wLangIdH = (byte) 0x04;            // \
-      byte bMsgIndex = (byte) 0x00;           // Default Msg
+      byte wLangIdL = (byte) 0x0C;            
+      byte wLangIdH = (byte) 0x04;            
+      byte bMsgIndex = (byte) 0x00;           
 
       byte[] apdu = new byte[] {
-        (byte) 0x00, (byte) 0x20, (byte) 0x00, kid, (byte) 0x08,  // CLA INS P1 P2 LC
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,               // Data
-        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00                // Data
+        (byte) 0x00, (byte) 0x20, (byte) 0x00, kid, (byte) 0x08, 
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,      
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00       
       };
 
       int offset = 0;
@@ -603,40 +608,43 @@ public class ACOSCard extends AbstractSignatureCard implements SignatureCard {
   
   public byte[] getPINModifyStructure(byte kid) {
 
-      byte bTimeOut = (byte) 00;            // Default time out
-      byte bTimeOut2 = (byte) 00;           // Default time out
-      byte bmFormatString = (byte) 0x82;      // 1 0001 0 01
+      byte bTimeOut = reader.getbTimeOut();
+      byte bTimeOut2 = reader.getbTimeOut2();
+      byte bmFormatString = (byte) 0x82;      // 1 0000 0 10
                                               // ^------------ System unit = byte
                                               //   ^^^^------- PIN position in the frame = 1 byte
                                               //        ^----- PIN justification left
-                                              //          ^^-- BCD format
-                                              // 1 0000 0 10
                                               //          ^^-- ASCII format
-      byte bmPINBlockString = (byte) 0x08;    // 0100 0111
-                                              // ^^^^--------- PIN length size: 4 bits
-                                              //      ^^^^---- Length PIN = 7 bytes
-      byte bmPINLengthFormat = (byte) 0x00;   // 000 0 0100
+      byte bmPINBlockString = (byte) 0x08;    // 0000 1000
+                                              // ^^^^--------- PIN length size: 0 bits
+                                              //      ^^^^---- Length PIN = 8 bytes
+      byte bmPINLengthFormat = (byte) 0x00;   // 000 0 0000
                                               //     ^-------- System bit units is bit
-                                              //       ^^^^--- PIN length is at the 4th position bit
+                                              //       ^^^^--- no PIN length 
       byte bInsertionOffsetOld = (byte) 0x00; // insertion position offset in bytes
-      byte bInsertionOffsetNew = (byte) 0x00; // insertion position offset in bytes
-      byte wPINMaxExtraDigitL = (byte) 0x04;  // Min=4 digits
-      byte wPINMaxExtraDigitH = (byte) 0x04;  // Max=12 digits
-      byte bConfirmPIN = (byte) 0x00;         // ??? need for confirm pin
-      byte bEntryValidationCondition = 0x02;  // Max size reach or Validation key pressed
-      byte bNumberMessage = (byte) 0x00;      // No message
-      byte wLangIdL = (byte) 0x0C;            // - English?
-      byte wLangIdH = (byte) 0x04;            // \
-      byte bMsgIndex1 = (byte) 0x00;           // Default Msg
-      byte bMsgIndex2 = (byte) 0x00;           // Default Msg
-      byte bMsgIndex3 = (byte) 0x00;           // Default Msg
+      byte bInsertionOffsetNew = (byte) 0x08; 
+      byte wPINMaxExtraDigitL =
+              (reader.getwPINMaxExtraDigitL() < (byte) 0x08) ?
+                reader.getwPINMaxExtraDigitL() : (byte) 0x08;
+      byte wPINMaxExtraDigitH =
+              (reader.getwPINMaxExtraDigitH() > (byte) 0x00) ?
+                reader.getwPINMaxExtraDigitH() : (byte) 0x00;
+      byte bConfirmPIN = (byte) 0x03;
+      byte bEntryValidationCondition =
+              reader.getbEntryValidationCondition();
+      byte bNumberMessage = (byte) 0x03;      
+      byte wLangIdL = (byte) 0x0C;            
+      byte wLangIdH = (byte) 0x04;            
+      byte bMsgIndex1 = (byte) 0x00;           
+      byte bMsgIndex2 = (byte) 0x01;           
+      byte bMsgIndex3 = (byte) 0x02;           
 
       byte[] apdu = new byte[] {
-        (byte) 0x00, (byte) 0x24, (byte) 0x00, kid, (byte) 0x10,  // CLA INS P1 P2 LC
-        (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff,               // Data
-        (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,                // ...
-        (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff,               // Data
-        (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff                // ...
+        (byte) 0x00, (byte) 0x24, (byte) 0x00, kid, (byte) 0x10,  
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,       
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,       
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,       
+        (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00        
       };
 
       int offset = 0;
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
index 6587aaf9..47c27369 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
@@ -28,6 +28,9 @@
 //
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.ccid.CCID;
+import at.gv.egiz.smcc.ccid.DefaultReader;
+import at.gv.egiz.smcc.ccid.ReaderFactory;
 import at.gv.egiz.smcc.util.SMCCHelper;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -39,6 +42,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.smartcardio.ATR;
 import javax.smartcardio.Card;
 import javax.smartcardio.CardChannel;
@@ -54,14 +59,6 @@ public abstract class AbstractSignatureCard implements SignatureCard {
 
   private static Log log = LogFactory.getLog(AbstractSignatureCard.class);
 
-  static final short GET_FEATURE_REQUEST = 3400;
-  
-  private static int getCtrlCode(short function) {
-    return 0x310000 | ((0xFFFF & function) << 2);
-  }
-
-  protected Map<Byte, Long> ifdCtrlCmds;
-
   protected List<PINSpec> pinSpecs = new ArrayList<PINSpec>();
 
   private ResourceBundle i18n;
@@ -76,7 +73,8 @@ public abstract class AbstractSignatureCard implements SignatureCard {
   /**
    * The card terminal that connects the {@link #card_}.  
    */
-  private CardTerminal cardTerminal;
+//  private CardTerminal cardTerminal;
+  protected CCID reader;
 
   protected AbstractSignatureCard(String resourceBundleName) {
     this.resourceBundleName = resourceBundleName;
@@ -341,16 +339,34 @@ public abstract class AbstractSignatureCard implements SignatureCard {
    */
   protected byte[] readTLVFile(byte[] aid, byte[] ef, int maxLength)
       throws SignatureCardException, InterruptedException, CardException {
-    return readTLVFile(aid, ef, null, (byte) 0, maxLength);
+    // SELECT FILE (AID)
+    selectFileAID(aid);
+
+    // SELECT FILE (EF)
+    ResponseAPDU resp = selectFileFID(ef);
+    if (resp.getSW() == 0x6a82) {
+      // EF not found
+      throw new FileNotFoundException("EF " + toString(ef) + " not found.");
+    } else if (resp.getSW() != 0x9000) {
+      throw new SignatureCardException("SELECT FILE with "
+          + "FID="
+          + toString(ef)
+          + " failed ("
+          + "SW="
+          + Integer.toHexString(resp.getSW()) + ").");
+    }
+
+    return readBinaryTLV(maxLength, (byte) 0x30);
+//    return readTLVFile(aid, ef, null, (byte) 0, maxLength);
   }
 
   /**
-   * Read the content of a TLV file wich may require a PIN.
+   * Read the content of a TLV file wich requires a PIN.
    * 
    * @param aid the application ID (AID)
    * @param ef the elementary file (EF)
    * @param kid the key ID (KID) of the corresponding PIN
-   * @param provider the PINProvider
+   * @param pin the pin or null if VERIFY on pinpad
    * @param spec the PINSpec
    * @param maxLength the maximum length of the file
    * 
@@ -381,12 +397,10 @@ public abstract class AbstractSignatureCard implements SignatureCard {
     }
 
     // VERIFY
-    if (pin != null) {
       int retries = verifyPIN(kid, pin);
       if (retries != -1) {
         throw new VerificationFailedException(retries);
       }
-    }
    
     return readBinaryTLV(maxLength, (byte) 0x30);
       
@@ -443,16 +457,16 @@ public abstract class AbstractSignatureCard implements SignatureCard {
   }
 
   
+  @Override
   public void init(Card card, CardTerminal cardTerminal) {
-    card_ = card;
-    this.cardTerminal = cardTerminal;
+    this.card_ = card;
+    this.reader = ReaderFactory.getReader(card, cardTerminal);
     ATR atr = card.getATR();
     byte[] atrBytes = atr.getBytes();
     if (atrBytes.length >= 6) {
       ifs_ = 0xFF & atr.getBytes()[6];
       log.trace("Setting IFS (information field size) to " + ifs_);
     }
-    ifdCtrlCmds = queryIFDFeatures();
   }
   
   @Override
@@ -464,6 +478,11 @@ public abstract class AbstractSignatureCard implements SignatureCard {
     return card_.getBasicChannel();
   }
 
+  @Override
+  public CCID getReader() {
+    return reader;
+  }
+
   @Override
   public void setLocale(Locale locale) {
     if (locale == null) {
@@ -497,9 +516,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
       log.debug("Disconnect and reset smart card.");
       card_.disconnect(true);
       log.debug("Reconnect smart card.");
-      if (cardTerminal != null) {
-        card_ = cardTerminal.connect("*");
-      }
+      card_ = reader.connect();
     } catch (CardException e) {
       throw new SignatureCardException("Failed to reset card.", e);
     }
@@ -520,6 +537,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
         selectFileAID(pinSpec.getContextAID());
       }
 
+      // -1 if ok or unknown
       int retries = verifyPIN(pinSpec.getKID());
       do {
         char[] pin = pinProvider.providePIN(pinSpec, retries);
@@ -611,166 +629,4 @@ public abstract class AbstractSignatureCard implements SignatureCard {
           throws CancelledException, SignatureCardException, InterruptedException {
     throw new SignatureCardException("Unblock not supported yet");
   }
-
-  /////////////////////////////////////////////////////////////////////////////
-  // IFD related code
-  /////////////////////////////////////////////////////////////////////////////
-
-  /**
-   * TODO implement VERIFY_PIN_START/FINISH (feature 0x01/0x02)
-   * @return
-   */
-  @Override
-  public boolean ifdSupportsFeature(byte feature) {
-    if (ifdCtrlCmds != null) {
-      return ifdCtrlCmds.containsKey(feature);
-    }
-    return false;
-  }
-
-  protected Map<Byte, Long> queryIFDFeatures() {
-
-    if (card_ == null) {
-      throw new NullPointerException("Need connected smart card to query IFD features");
-    }
-
-    Map<Byte, Long> ifdFeatures = new HashMap<Byte, Long>();
-
-    try {
-      if (log.isTraceEnabled()) {
-        log.trace("GET_FEATURE_REQUEST CtrlCode " + Integer.toHexString(getCtrlCode(GET_FEATURE_REQUEST)));
-      }
-      byte[] resp = card_.transmitControlCommand(getCtrlCode(GET_FEATURE_REQUEST), new byte[]{});
-
-      if (log.isTraceEnabled()) {
-        log.trace("GET_FEATURE_REQUEST Response " + SMCCHelper.toString(resp));
-      }
-
-      for (int i = 0; i + 5 < resp.length; i += 6) {
-        Byte feature = new Byte(resp[i]);
-        Long ctrlCode = new Long(
-          ((0xFF & resp[i + 2]) << 24) |
-          ((0xFF & resp[i + 3]) << 16) |
-          ((0xFF & resp[i + 4]) << 8) |
-           (0xFF & resp[i + 5]));
-        if (log.isInfoEnabled()) {
-          log.info("IFD supports feature " + Integer.toHexString(feature.byteValue()) +
-                  ": " + Long.toHexString(ctrlCode.longValue()));
-        }
-        ifdFeatures.put(feature, ctrlCode);
-      }
-
-    } catch (CardException ex) {
-      log.debug("Failed to query IFD features: " + ex.getMessage());
-      log.trace(ex);
-      log.info("IFD does not support PINPad");
-      return null;
-    }
-    return ifdFeatures;
-  }
-
-
-  protected byte ifdGetKeyPressed() throws CardException {
-    if (ifdSupportsFeature(FEATURE_VERIFY_PIN_DIRECT)) {
-
-      Long controlCode = (Long) ifdCtrlCmds.get(new Byte((byte) 0x05));
-
-      byte key = 0x00;
-      while (key == 0x00) {
-
-        byte[] resp = card_.transmitControlCommand(controlCode.intValue(), new byte[] {});
-
-        if (resp != null && resp.length > 0) {
-          key = resp[0];
-        }
-      }
-
-      System.out.println("Key: " + key);
-
-    }
-
-    return 0x00;
-  }
-
-  protected byte[] ifdVerifyPINFinish() throws CardException {
-    if (ifdSupportsFeature(FEATURE_VERIFY_PIN_DIRECT)) {
-
-      Long controlCode = (Long) ifdCtrlCmds.get(new Byte((byte) 0x02));
-
-      byte[] resp = card_.transmitControlCommand(controlCode.intValue(), new byte[] {});
-
-      System.out.println("CommandResp: " + toString(resp));
-
-      return resp;
-
-    }
-
-    return null;
-  }
-
-
-  /**
-   * assumes ifdSupportsVerifyPIN() == true
-   * @param pinVerifyStructure
-   * @return
-   * @throws javax.smartcardio.CardException
-   */
-//  protected byte[] ifdVerifyPIN(byte[] pinVerifyStructure) throws CardException {
-//
-////      Long ctrlCode = (Long) ifdFeatures.get(FEATURE_IFD_PIN_PROPERTIES);
-////      if (ctrlCode != null) {
-////        if (log.isTraceEnabled()) {
-////          log.trace("PIN_PROPERTIES CtrlCode " + Integer.toHexString(ctrlCode.intValue()));
-////        }
-////        byte[] resp = card_.transmitControlCommand(ctrlCode.intValue(), new byte[] {});
-////
-////        if (log.isTraceEnabled()) {
-////          log.trace("PIN_PROPERTIES Response " + SMCCHelper.toString(resp));
-////        }
-////      }
-//
-//
-//      Long ctrlCode = (Long) ifdFeatures.get(FEATURE_VERIFY_PIN_DIRECT);
-//      if (ctrlCode == null) {
-//        throw new NullPointerException("no CtrlCode for FEATURE_VERIFY_PIN_DIRECT");
-//      }
-//
-//      if (log.isTraceEnabled()) {
-//        log.trace("VERIFY_PIN_DIRECT CtrlCode " + Integer.toHexString(ctrlCode.intValue()) +
-//                ", PIN_VERIFY_STRUCTURE " + SMCCHelper.toString(pinVerifyStructure));
-//      }
-//      byte[] resp = card_.transmitControlCommand(ctrlCode.intValue(), pinVerifyStructure);
-//
-//      if (log.isTraceEnabled()) {
-//        log.trace("VERIFY_PIN_DIRECT Response " + SMCCHelper.toString(resp));
-//      }
-//      return resp;
-//  }
-
-//  protected Long getControlCode(Byte feature) {
-//    if (ifdFeatures != null) {
-//      return ifdFeatures.get(feature);
-//    }
-//    return null;
-//  }
-
-  protected byte[] transmitControlCommand(Long ctrlCode, byte[] ctrlCommand)
-          throws CardException {
-//    Long ctrlCode = (Long) ifdFeatures.get(feature);
-    if (ctrlCode == null) {
-      throw new NullPointerException("ControlCode " +
-              Integer.toHexString(ctrlCode.intValue()) + " not supported");
-    }
-    if (log.isTraceEnabled()) {
-      log.trace("CtrlCommand (" + Integer.toHexString(ctrlCode.intValue()) +
-              ")  " + SMCCHelper.toString(ctrlCommand));
-    }
-    byte[] resp = card_.transmitControlCommand(ctrlCode.intValue(), ctrlCommand);
-
-    if (log.isTraceEnabled()) {
-      log.trace("CtrlCommand Response " + SMCCHelper.toString(resp));
-    }
-    return resp;
-  }
-
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
index 91245c50..bc6a2316 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
@@ -28,6 +28,7 @@
 //
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.ccid.DefaultReader;
 import at.gv.egiz.smcc.util.SMCCHelper;
 import java.util.Arrays;
 import javax.smartcardio.CardChannel;
@@ -38,7 +39,7 @@ import javax.smartcardio.ResponseAPDU;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-public class STARCOSCard extends AbstractSignatureCard implements SignatureCard {
+public class STARCOSCard extends AbstractSignatureCard {
 
   /**
    * Logging facility.
@@ -153,8 +154,8 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
 
   public static final byte KID_PIN_CARD = (byte) 0x01;
 
-  private static final int PINSPEC_CARD = 0;
-  private static final int PINSPEC_SS = 1;
+  public static final int PINSPEC_CARD = 0;
+  public static final int PINSPEC_SS = 1;
 
   /**
    * Creates an new instance.
@@ -217,28 +218,29 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
   
     try {
       if ("IdentityLink".equals(infobox)) {
- 
+
         PINSpec spec = pinSpecs.get(PINSPEC_CARD);
         //new PINSpec(4, 4, "[0-9]", getResourceBundle().getString("card.pin.name"));
-        
+
         int retries = -1;
-        char[] pin = null;
-        boolean pinRequiered = false;
+        boolean pinRequired = false;
 
         do {
-          if (pinRequiered) {
-            pin = provider.providePIN(spec, retries);
-          }
           try {
             getCard().beginExclusive();
-            return readTLVFile(AID_INFOBOX, EF_INFOBOX, pin, KID_PIN_CARD, 2000);
+            if (pinRequired) {
+              char[] pin = provider.providePIN(spec, retries);
+              return readTLVFile(AID_INFOBOX, EF_INFOBOX, pin, spec.getKID(), 2000);
+            } else {
+              return readTLVFile(AID_INFOBOX, EF_INFOBOX, 2000);
+            }
           } catch (FileNotFoundException e) {
             throw new NotActivatedException();
           } catch (SecurityStatusNotSatisfiedException e) {
-            pinRequiered = true;
+            pinRequired = true;
             retries = verifyPIN(KID_PIN_CARD);
           } catch (VerificationFailedException e) {
-            pinRequiered = true;
+            pinRequired = true;
             retries = e.getRetries();
           } finally {
             getCard().endExclusive();
@@ -246,54 +248,43 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
         } while (retries != 0);
 
         throw new LockedException();
-
         
       } else if ("EHIC".equals(infobox)) {
-        
         try {
           getCard().beginExclusive();
           return readTLVFile(AID_SV_PERSONENDATEN, FID_EHIC, 126);
         } finally {
           getCard().endExclusive();
         }
-        
       } else if ("Grunddaten".equals(infobox)) {
-        
         try {
           getCard().beginExclusive();
           return readTLVFile(AID_SV_PERSONENDATEN, FID_GRUNDDATEN, 550);
         } finally {
           getCard().endExclusive();
         }
-        
       } else if ("SV-Personenbindung".equals(infobox)) {
-        
         try {
           getCard().beginExclusive();
           return readTLVFile(AID_SV_PERSONENDATEN, FID_SV_PERSONENBINDUNG, 500);
         } finally {
           getCard().endExclusive();
         }
-        
       } else if ("Status".equals(infobox)) {
-        
         try {
           getCard().beginExclusive();
           return readRecords(AID_SV_PERSONENDATEN, FID_STATUS, 1, 5);
         } finally {
           getCard().endExclusive();
         }
-        
       } else {
         throw new IllegalArgumentException("Infobox '" + infobox
             + "' not supported.");
       }
-      
     } catch (CardException e) {
       log.warn(e);
       throw new SignatureCardException("Failed to access card.", e);
     }
-  
   }
 
   @Override
@@ -466,10 +457,10 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
           throws LockedException, NotActivatedException, SignatureCardException {
     try {
       byte[] sw;
-      if (ifdSupportsFeature(FEATURE_VERIFY_PIN_DIRECT)) {
+      if (reader.hasFeature(DefaultReader.FEATURE_VERIFY_PIN_DIRECT)) {
         log.debug("verify PIN on IFD");
-        sw = transmitControlCommand(
-                ifdCtrlCmds.get(FEATURE_VERIFY_PIN_DIRECT),
+        sw = reader.transmitControlCommand(
+                DefaultReader.FEATURE_VERIFY_PIN_DIRECT,
                 getPINVerifyStructure(kid));
 //        int sw = (resp[resp.length-2] & 0xff) << 8 | resp[resp.length-1] & 0xff;
       } else {
@@ -551,10 +542,10 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
           throws LockedException, NotActivatedException, CancelledException, TimeoutException, SignatureCardException {
     try {
       byte[] sw;
-      if (ifdSupportsFeature(FEATURE_MODIFY_PIN_DIRECT)) {
+      if (reader.hasFeature(DefaultReader.FEATURE_MODIFY_PIN_DIRECT)) {
         log.debug("modify PIN on IFD");
-        sw = transmitControlCommand(
-                ifdCtrlCmds.get(FEATURE_MODIFY_PIN_DIRECT),
+        sw = reader.transmitControlCommand(
+                DefaultReader.FEATURE_MODIFY_PIN_DIRECT,
                 getPINModifyStructure(kid));
 //        int sw = (resp[resp.length-2] & 0xff) << 8 | resp[resp.length-1] & 0xff;
       } else {
@@ -606,31 +597,43 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
   protected void activatePIN(byte kid, char[] pin)
           throws CancelledException, TimeoutException, SignatureCardException {
     try {
-      CardChannel channel = getCardChannel();
-      ResponseAPDU resp = transmit(channel,
-              new CommandAPDU(0x00, 0x24, 0x01, kid, encodePINBlock(pin)), false);
+      byte[] sw;
+      if (reader.hasFeature(DefaultReader.FEATURE_MODIFY_PIN_DIRECT)) {
+        log.debug("activate PIN on IFD");
+        sw = reader.transmitControlCommand(
+                DefaultReader.FEATURE_MODIFY_PIN_DIRECT,
+                getActivatePINModifyStructure(kid));
+//        int sw = (resp[resp.length-2] & 0xff) << 8 | resp[resp.length-1] & 0xff;
+      } else {
+        CardChannel channel = getCardChannel();
+        ResponseAPDU resp = transmit(channel,
+                new CommandAPDU(0x00, 0x24, 0x01, kid, encodePINBlock(pin)), false);
 
-      log.trace("activate pin returned SW=" + Integer.toHexString(resp.getSW()));
+        sw = new byte[2];
+        sw[0] = (byte) resp.getSW1();
+        sw[1] = (byte) resp.getSW2();
+        log.trace("activate pin returned SW=" + Integer.toHexString(resp.getSW()));
+      }
 
-      if (resp.getSW1() == 0x9000) {
+      if (sw[0] == (byte) 0x90 && sw[1] == (byte) 0x00) {
         return;
-      } else if (resp.getSW() == 0x6983) {
+      } else if (sw[0] == (byte) 0x69 && sw[1] == (byte) 0x83) {
         //Authentisierungsmethode gesperrt
         throw new LockedException("[69:83]");
-      } else if (resp.getSW() == 0x6984) {
-        //referenzierte Daten sind reversibel gesperrt (invalidated)
-        throw new NotActivatedException("[69:84]");
-      } else if (resp.getSW() == 0x6985) {
-        //Benutzungsbedingungen nicht erfüllt
-        throw new NotActivatedException("[69:85]");
-      } else if (resp.getSW() == 0x6400) {
+//      } else if (sw[0] == (byte) 0x69 && sw[1] == (byte) 0x84) {
+//        //referenzierte Daten sind reversibel gesperrt (invalidated)
+//        throw new NotActivatedException("[69:84]");
+//      } else if (sw[0] == (byte) 0x69 && sw[1] == (byte) 0x85) {
+//        //Benutzungsbedingungen nicht erfüllt
+//        throw new NotActivatedException("[69:85]");
+      } else if (sw[0] == (byte) 0x64 && sw[1] == (byte) 0x00) {
         throw new TimeoutException("[64:00]");
-      } else if (resp.getSW() == 0x6401) {
+      } else if (sw[0] == (byte) 0x64 && sw[1] == (byte) 0x01) {
         throw new CancelledException("[64:01]");
       }
-      log.error("Failed to activate pin: SW=" +
-              Integer.toHexString(resp.getSW()));
-      throw new SignatureCardException("[" + Integer.toHexString(resp.getSW()) + "]");
+      log.error("Failed to activate pin: SW="
+              + SMCCHelper.toString(sw));
+      throw new SignatureCardException(SMCCHelper.toString(sw));
 
     } catch (CardException ex) {
       log.error("smart card communication failed: " + ex.getMessage());
@@ -667,9 +670,8 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
   }
   
   private byte[] getPINVerifyStructure(byte kid) {
-      
-      byte bTimeOut = (byte) 00;            // Default time out
-      byte bTimeOut2 = (byte) 00;           // Default time out
+      byte bTimeOut = reader.getbTimeOut(); 
+      byte bTimeOut2 = reader.getbTimeOut2(); // time out after first entry
       byte bmFormatString = (byte) 0x89;      // 1 0001 0 01 
                                               // ^------------ System unit = byte
                                               //   ^^^^------- PIN position in the frame = 1 byte
@@ -681,9 +683,14 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
       byte bmPINLengthFormat = (byte) 0x04;   // 000 0 0100
                                               //     ^-------- System bit units is bit
                                               //       ^^^^--- PIN length is at the 4th position bit
-      byte wPINMaxExtraDigitL = (byte) 0x04;  // Max=4 digits
-      byte wPINMaxExtraDigitH = (byte) 0x04;  // Min=4 digits
-      byte bEntryValidationCondition = 0x02;  // Max size reach or Validation key pressed
+      byte wPINMaxExtraDigitL =               // Max=12 digits (Gemplus support max 8)
+              (reader.getwPINMaxExtraDigitL() < (byte) 0x12) ?
+                reader.getwPINMaxExtraDigitL() : (byte) 0x12;
+      byte wPINMaxExtraDigitH =               // Min=4/6 digits TODO card/ss pin (min: 4/6)
+              (reader.getwPINMaxExtraDigitH() > (byte) 0x04) ?
+                reader.getwPINMaxExtraDigitH() : (byte) 0x04;
+      byte bEntryValidationCondition = 
+              reader.getbEntryValidationCondition();  
       byte bNumberMessage = (byte) 0x00;      // No message
       byte wLangIdL = (byte) 0x0C;            // - English?
       byte wLangIdH = (byte) 0x04;            // \
@@ -725,38 +732,99 @@ public class STARCOSCard extends AbstractSignatureCard implements SignatureCard
 
   private byte[] getPINModifyStructure(byte kid) {
 
-      byte bTimeOut = (byte) 00;            // Default time out
-      byte bTimeOut2 = (byte) 00;           // Default time out
-      byte bmFormatString = (byte) 0x89;      // 1 0001 0 01
-                                              // ^------------ System unit = byte
-                                              //   ^^^^------- PIN position in the frame = 1 byte
-                                              //        ^----- PIN justification left
-                                              //          ^^-- BCD format
-      byte bmPINBlockString = (byte) 0x47;    // 0100 0111
-                                              // ^^^^--------- PIN length size: 4 bits
-                                              //      ^^^^---- Length PIN = 7 bytes
-      byte bmPINLengthFormat = (byte) 0x04;   // 000 0 0100
-                                              //     ^-------- System bit units is bit
-                                              //       ^^^^--- PIN length is at the 4th position bit
-      byte bInsertionOffsetOld = (byte) 0x01; // insertion position offset in bytes
-      byte bInsertionOffsetNew = (byte) 0x08; // insertion position offset in bytes
-      byte wPINMaxExtraDigitL = (byte) 0x04;  // Min=4 digits
-      byte wPINMaxExtraDigitH = (byte) 0x04;  // Max=12 digits
-      byte bConfirmPIN = (byte) 0x00;         // ??? need for confirm pin
-      byte bEntryValidationCondition = 0x02;  // Max size reach or Validation key pressed
-      byte bNumberMessage = (byte) 0x00;      // No message
-      byte wLangIdL = (byte) 0x0C;            // - English?
-      byte wLangIdH = (byte) 0x04;            // \
-      byte bMsgIndex1 = (byte) 0x00;           // Default Msg
-      byte bMsgIndex2 = (byte) 0x00;           // Default Msg
-      byte bMsgIndex3 = (byte) 0x00;           // Default Msg
+      byte bTimeOut = reader.getbTimeOut();   // s.o.
+      byte bTimeOut2 = reader.getbTimeOut2(); // s.o.
+      byte bmFormatString = (byte) 0x89;      // s.o.
+      byte bmPINBlockString = (byte) 0x47;    // s.o.
+      byte bmPINLengthFormat = (byte) 0x04;   // s.o.
+      byte bInsertionOffsetOld = (byte) 0x00; // insertion position offset in bytes
+      byte bInsertionOffsetNew = (byte) 0x08; // (add 1 from bmFormatString b3)
+      byte wPINMaxExtraDigitL = 
+              (reader.getwPINMaxExtraDigitL() < (byte) 0x12) ?
+                reader.getwPINMaxExtraDigitL() : (byte) 0x12;
+      byte wPINMaxExtraDigitH =               // Min=4/6 digits TODO card/ss pin (min: 4/6)
+              (reader.getwPINMaxExtraDigitH() > (byte) 0x04) ?
+                reader.getwPINMaxExtraDigitH() : (byte) 0x04;
+      byte bConfirmPIN = (byte) 0x03;         // current pin entry + confirmation
+      byte bEntryValidationCondition =
+              reader.getbEntryValidationCondition();
+      byte bNumberMessage = (byte) 0x03;      // 3 messages
+      byte wLangIdL = (byte) 0x0C;            
+      byte wLangIdH = (byte) 0x04;            
+      byte bMsgIndex1 = (byte) 0x00;          // insertion
+      byte bMsgIndex2 = (byte) 0x01;          // modification
+      byte bMsgIndex3 = (byte) 0x02;          // confirmation
 
       byte[] apdu = new byte[] {
-        (byte) 0x00, (byte) 0x24, (byte) 0x00, kid, (byte) 0x10,  // CLA INS P1 P2 LC
-        (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff,               // Data
-        (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,                // ...
-        (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff,               // Data
-        (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff                // ...
+        (byte) 0x00, (byte) 0x24, (byte) 0x00, kid, (byte) 0x10, 
+        (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff,      
+        (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,      
+        (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff,      
+        (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff       
+      };
+
+      int offset = 0;
+      byte[] pinModifyStructure = new byte[offset + 24 + apdu.length];
+      pinModifyStructure[offset++] = bTimeOut;
+      pinModifyStructure[offset++] = bTimeOut2;
+      pinModifyStructure[offset++] = bmFormatString;
+      pinModifyStructure[offset++] = bmPINBlockString;
+      pinModifyStructure[offset++] = bmPINLengthFormat;
+      pinModifyStructure[offset++] = bInsertionOffsetOld;
+      pinModifyStructure[offset++] = bInsertionOffsetNew;
+      pinModifyStructure[offset++] = wPINMaxExtraDigitL;
+      pinModifyStructure[offset++] = wPINMaxExtraDigitH;
+      pinModifyStructure[offset++] = bConfirmPIN;
+      pinModifyStructure[offset++] = bEntryValidationCondition;
+      pinModifyStructure[offset++] = bNumberMessage;
+      pinModifyStructure[offset++] = wLangIdL;
+      pinModifyStructure[offset++] = wLangIdH;
+      pinModifyStructure[offset++] = bMsgIndex1;
+      pinModifyStructure[offset++] = bMsgIndex2;
+      pinModifyStructure[offset++] = bMsgIndex3;
+
+      pinModifyStructure[offset++] = 0x00;
+      pinModifyStructure[offset++] = 0x00;
+      pinModifyStructure[offset++] = 0x00;
+
+      pinModifyStructure[offset++] = (byte) apdu.length;
+      pinModifyStructure[offset++] = 0x00;
+      pinModifyStructure[offset++] = 0x00;
+      pinModifyStructure[offset++] = 0x00;
+      System.arraycopy(apdu, 0, pinModifyStructure, offset, apdu.length);
+
+//      log.debug("PIN MODIFY " + SMCCHelper.toString(pinModifyStructure));
+      return pinModifyStructure;
+  }
+  private byte[] getActivatePINModifyStructure(byte kid) {
+
+      byte bTimeOut = reader.getbTimeOut();   
+      byte bTimeOut2 = reader.getbTimeOut2(); 
+      byte bmFormatString = (byte) 0x89;      
+      byte bmPINBlockString = (byte) 0x47;    
+      byte bmPINLengthFormat = (byte) 0x04;   
+      byte bInsertionOffsetOld = (byte) 0x00; // ignored
+      byte bInsertionOffsetNew = (byte) 0x00; 
+      byte wPINMaxExtraDigitL =
+              (reader.getwPINMaxExtraDigitL() < (byte) 0x12) ?
+                reader.getwPINMaxExtraDigitL() : (byte) 0x12;
+      byte wPINMaxExtraDigitH =               // Min=4/6 digits TODO card/ss pin (min: 4/6)
+              (reader.getwPINMaxExtraDigitH() > (byte) 0x04) ?
+                reader.getwPINMaxExtraDigitH() : (byte) 0x04;
+      byte bConfirmPIN = (byte) 0x01;         // confirm, no current pin entry
+      byte bEntryValidationCondition =
+              reader.getbEntryValidationCondition();
+      byte bNumberMessage = (byte) 0x02;      // 2 messages
+      byte wLangIdL = (byte) 0x0c;
+      byte wLangIdH = (byte) 0x04;
+      byte bMsgIndex1 = (byte) 0x01;          // modification prompt
+      byte bMsgIndex2 = (byte) 0x02;          // confirmation prompt
+      byte bMsgIndex3 = (byte) 0x00;           
+
+      byte[] apdu = new byte[] {
+        (byte) 0x00, (byte) 0x24, (byte) 0x01, kid, (byte) 0x08,
+        (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff,
+        (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff
       };
 
       int offset = 0;
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
index 293b9c71..253ac7a0 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
@@ -17,6 +17,7 @@
 
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.ccid.CCID;
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -44,6 +45,7 @@ import java.util.Locale;
 
 import java.util.Map;
 import javax.smartcardio.Card;
+import javax.smartcardio.CardException;
 import javax.smartcardio.CardTerminal;
 
 import org.apache.commons.logging.Log;
@@ -419,7 +421,50 @@ public class SWCard implements SignatureCard {
   }
 
   @Override
-  public boolean ifdSupportsFeature(byte feature) {
-    return false;
+  public CCID getReader() {
+    return new CCID() {
+
+      @Override
+      public boolean hasFeature(Byte feature) {
+        return false;
+      }
+
+      @Override
+      public byte[] transmitControlCommand(Byte feature, byte[] ctrlCommand)
+              throws SignatureCardException {
+        throw new SignatureCardException(CCID.FEATURES[feature.intValue()] +
+                " not supported");
+      }
+
+      @Override
+      public byte getbTimeOut() {
+        return 0;
+      }
+
+      @Override
+      public byte getbTimeOut2() {
+        return 0;
+      }
+
+      @Override
+      public byte getwPINMaxExtraDigitL() {
+        return 0x12;
+      }
+
+      @Override
+      public byte getwPINMaxExtraDigitH() {
+        return 0x00;
+      }
+
+      @Override
+      public byte getbEntryValidationCondition() {
+        return 0x02;
+      }
+
+      @Override
+      public Card connect() {
+        return null;
+      }
+    };
   }
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
index 2097e6d3..ad530ad5 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
@@ -28,6 +28,7 @@
 //
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.ccid.CCID;
 import java.util.List;
 import java.util.Locale;
 
@@ -36,14 +37,6 @@ import javax.smartcardio.CardTerminal;
 
 public interface SignatureCard {
 
-  /**
-   * IFD FEATURES
-   */
-  static final Byte FEATURE_VERIFY_PIN_DIRECT = new Byte((byte) 0x06);
-  static final Byte FEATURE_MODIFY_PIN_DIRECT = new Byte((byte) 0x07);
-  static final Byte FEATURE_MCT_READER_DIRECT = new Byte((byte) 0x08);
-  static final Byte FEATURE_IFD_PIN_PROPERTIES = new Byte((byte) 0x0a);
-
   public static class KeyboxName {
 
     public static KeyboxName SECURE_SIGNATURE_KEYPAIR = new KeyboxName(
@@ -143,11 +136,7 @@ public interface SignatureCard {
   public void unblockPIN(PINSpec pinSpec, PINProvider pukProvider)
           throws CancelledException, SignatureCardException, InterruptedException;
 
-  /**
-   * TODO
-   * @return
-   */
-  public boolean ifdSupportsFeature(byte feature);
+  public CCID getReader();
 
   /**
    * Sets the local for evtl. required callbacks (e.g. PINSpec)
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ccid/CCID.java b/smcc/src/main/java/at/gv/egiz/smcc/ccid/CCID.java
new file mode 100644
index 00000000..2c56ce98
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ccid/CCID.java
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.ccid;
+
+import at.gv.egiz.smcc.*;
+import javax.smartcardio.Card;
+import javax.smartcardio.CardException;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public interface CCID {
+
+
+  String[] FEATURES = new String[]{"NO_FEATURE",
+    "FEATURE_VERIFY_PIN_START",
+    "FEATURE_VERIFY_PIN_FINISH",
+    "FEATURE_MODIFY_PIN_START",
+    "FEATURE_MODIFY_PIN_FINISH",
+    "FEATURE_GET_KEY_PRESSED",
+    "FEATURE_VERIFY_PIN_DIRECT",
+    "FEATURE_MODIFY_PIN_DIRECT",
+    "FEATURE_MCT_READER_DIRECT",
+    "FEATURE_MCT_UNIVERSAL",
+    "FEATURE_IFD_PIN_PROPERTIES",
+    "FEATURE_ABORT",
+    "FEATURE_SET_SPE_MESSAGE",
+    "FEATURE_VERIFY_PIN_DIRECT_APP_ID",
+    "FEATURE_MODIFY_PIN_DIRECT_APP_ID",
+    "FEATURE_WRITE_DISPLAY",
+    "FEATURE_GET_KEY",
+    "FEATURE_IFD_DISPLAY_PROPERTIES"};
+  
+  Byte FEATURE_IFD_PIN_PROPERTIES = new Byte((byte) 10);
+  Byte FEATURE_MCT_READER_DIRECT = new Byte((byte) 8);
+  Byte FEATURE_MODIFY_PIN_DIRECT = new Byte((byte) 7);
+  Byte FEATURE_VERIFY_PIN_DIRECT = new Byte((byte) 6);
+  
+  Card connect() throws CardException;
+
+  boolean hasFeature(Byte feature);
+
+  /**
+   *
+   * @param feature the corresponding control code will be transmitted
+   * @param ctrlCommand
+   * @return
+   * @throws at.gv.egiz.smcc.SignatureCardException if feature is not supported
+   * or card communication fails
+   */
+  byte[] transmitControlCommand(Byte feature, byte[] ctrlCommand) throws SignatureCardException;
+
+  /**
+   * allow subclasses to override default (deal with reader bugs)
+   * @return
+   */
+  byte getbTimeOut();
+  byte getbTimeOut2();
+  byte getwPINMaxExtraDigitL();
+  byte getwPINMaxExtraDigitH();
+  byte getbEntryValidationCondition();
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ccid/DefaultReader.java b/smcc/src/main/java/at/gv/egiz/smcc/ccid/DefaultReader.java
new file mode 100644
index 00000000..2cc77dc9
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ccid/DefaultReader.java
@@ -0,0 +1,264 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.ccid;
+
+import at.gv.egiz.smcc.*;
+import at.gv.egiz.smcc.util.SMCCHelper;
+import java.util.HashMap;
+import java.util.Map;
+import javax.smartcardio.Card;
+import javax.smartcardio.CardException;
+import javax.smartcardio.CardTerminal;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class DefaultReader implements CCID {
+
+  protected final static Log log = LogFactory.getLog(DefaultReader.class);
+
+  private static int CTL_CODE(int code) {
+    return 0x42000000 + code;
+  }
+
+  int IOCTL_GET_FEATURE_REQUEST = CTL_CODE(3400);
+
+
+  protected Card icc;
+  protected CardTerminal ct;
+
+  /**
+   * supported features and respective control codes
+   */
+  protected Map<Byte, Integer> features;
+
+  public DefaultReader(Card icc, CardTerminal ct) {
+    if (icc == null || ct == null) {
+      throw new NullPointerException("no card or card terminal provided");
+    }
+    this.icc = icc;
+    this.ct = ct;
+    features = queryFeatures(); 
+  }
+
+  public Card connect() throws CardException { //SignatureCardException {
+//      try {
+    icc = ct.connect("*");
+    return icc;
+//      } catch (CardException ex) {
+//        log.error(ex.getMessage(), ex);
+//        throw new SignatureCardException("Failed to connect to card: " + ex.getMessage());
+//      }
+  }
+
+  Map<Byte, Integer> queryFeatures() {
+    Map<Byte, Integer> features = new HashMap<Byte, Integer>();
+
+    if (icc == null) {
+      log.warn("invalid card handle, cannot query ifd features");
+    } else {
+      try {
+        if (log.isTraceEnabled()) {
+          log.trace("GET_FEATURE_REQUEST " +
+                  Integer.toHexString(IOCTL_GET_FEATURE_REQUEST) +
+                  " on " + ct.getName());
+        }
+        byte[] resp = icc.transmitControlCommand(IOCTL_GET_FEATURE_REQUEST,
+                new byte[]{});
+
+        if (log.isTraceEnabled()) {
+          log.trace("Response TLV " + SMCCHelper.toString(resp));
+        }
+        // tag
+        // length in bytes (always 4)
+        // control code value for supported feature (in big endian)
+        for (int i = 0; i < resp.length; i += 6) {
+          Byte feature = new Byte(resp[i]);
+          int ioctlBigEndian = (resp[i + 2] << 24) |
+                  (resp[i + 3] << 16) | (resp[i + 4] << 8) | resp[i + 5];
+          Integer ioctl = new Integer(ioctlBigEndian);
+          if (log.isInfoEnabled()) {
+            log.info("CCID supports " + FEATURES[feature.intValue()] +
+                    ": " + Integer.toHexString(ioctl.intValue()));
+          }
+          features.put(feature, ioctl);
+        }
+      } catch (CardException ex) {
+        log.debug("Failed to query CCID features: " + ex.getMessage());
+        log.trace(ex);
+        log.info("CCID does not support PINPad");
+      }
+    }
+    return features;
+  }
+
+  @Override
+  public boolean hasFeature(Byte feature) {
+    if (features != null) {
+      return features.containsKey(feature);
+    }
+    return false;
+  }
+
+//  public Integer getIOCTL(Byte feature) {
+//    if (features != null) {
+//      return features.get(feature);
+//    }
+//    return null;
+//  }
+
+  @Override
+  public byte[] transmitControlCommand(Byte feature, byte[] ctrlCommand)
+          throws SignatureCardException {
+    try {
+      if (!features.containsKey(feature)) {
+        throw new SignatureCardException(FEATURES[feature.intValue()] + " not supported");
+      }
+      int ioctl = features.get(feature);
+      if (log.isTraceEnabled()) {
+        log.trace("CtrlCommand (" + Integer.toHexString(ioctl) +
+                ")  " + SMCCHelper.toString(ctrlCommand));
+      }
+      byte[] resp = icc.transmitControlCommand(ioctl, ctrlCommand);
+      if (log.isTraceEnabled()) {
+        log.trace("CtrlCommand Response " + SMCCHelper.toString(resp));
+      }
+      return resp;
+    } catch (CardException ex) {
+      log.error(ex.getMessage());
+      throw new SignatureCardException("Failed to transmit CtrlCommand for " +
+              FEATURES[feature.intValue()]);
+    }
+  }
+
+
+  @Override
+  public byte getbTimeOut() {
+    return (byte) 0x3c;    // (max 1min on ReinerSCT),
+                           // 0x00=default, 0x1e = 30sec
+  }
+
+  @Override
+  public byte getbTimeOut2() {
+    return (byte) 0x00;    // default
+  }
+
+  @Override
+  public byte getwPINMaxExtraDigitL() {
+    return (byte) 0x12;
+  }
+
+  @Override
+  public byte getwPINMaxExtraDigitH() {
+    return (byte) 0x00;
+  }
+
+  @Override
+  public byte getbEntryValidationCondition() {
+    return (byte) 0x02;    // validation key pressed
+  }
+
+
+  //  protected byte ifdGetKeyPressed() throws CardException {
+//    if (ifdSupportsFeature(FEATURE_VERIFY_PIN_DIRECT)) {
+//
+//      Long controlCode = (Long) IFD_IOCTL.get(new Byte((byte) 0x05));
+//
+//      byte key = 0x00;
+//      while (key == 0x00) {
+//
+//        byte[] resp = card_.transmitControlCommand(controlCode.intValue(), new byte[] {});
+//
+//        if (resp != null && resp.length > 0) {
+//          key = resp[0];
+//        }
+//      }
+//
+//      System.out.println("Key: " + key);
+//
+//    }
+//
+//    return 0x00;
+//  }
+//
+//  protected byte[] ifdVerifyPINFinish() throws CardException {
+//    if (ifdSupportsFeature(FEATURE_VERIFY_PIN_DIRECT)) {
+//
+//      Long controlCode = (Long) IFD_IOCTL.get(new Byte((byte) 0x02));
+//
+//      byte[] resp = card_.transmitControlCommand(controlCode.intValue(), new byte[] {});
+//
+//      System.out.println("CommandResp: " + toString(resp));
+//
+//      return resp;
+//
+//    }
+//
+//    return null;
+//  }
+
+
+  /**
+   * assumes ifdSupportsVerifyPIN() == true
+   * @param pinVerifyStructure
+   * @return
+   * @throws javax.smartcardio.CardException
+   */
+//  protected byte[] ifdVerifyPIN(byte[] pinVerifyStructure) throws CardException {
+//
+////      Long ctrlCode = (Long) ifdFeatures.get(FEATURE_IFD_PIN_PROPERTIES);
+////      if (ctrlCode != null) {
+////        if (log.isTraceEnabled()) {
+////          log.trace("PIN_PROPERTIES CtrlCode " + Integer.toHexString(ctrlCode.intValue()));
+////        }
+////        byte[] resp = card_.transmitControlCommand(ctrlCode.intValue(), new byte[] {});
+////
+////        if (log.isTraceEnabled()) {
+////          log.trace("PIN_PROPERTIES Response " + SMCCHelper.toString(resp));
+////        }
+////      }
+//
+//
+//      Long ctrlCode = (Long) ifdFeatures.get(FEATURE_VERIFY_PIN_DIRECT);
+//      if (ctrlCode == null) {
+//        throw new NullPointerException("no CtrlCode for FEATURE_VERIFY_PIN_DIRECT");
+//      }
+//
+//      if (log.isTraceEnabled()) {
+//        log.trace("VERIFY_PIN_DIRECT CtrlCode " + Integer.toHexString(ctrlCode.intValue()) +
+//                ", PIN_VERIFY_STRUCTURE " + SMCCHelper.toString(pinVerifyStructure));
+//      }
+//      byte[] resp = card_.transmitControlCommand(ctrlCode.intValue(), pinVerifyStructure);
+//
+//      if (log.isTraceEnabled()) {
+//        log.trace("VERIFY_PIN_DIRECT Response " + SMCCHelper.toString(resp));
+//      }
+//      return resp;
+//  }
+
+//  protected Long getControlCode(Byte feature) {
+//    if (ifdFeatures != null) {
+//      return ifdFeatures.get(feature);
+//    }
+//    return null;
+//  }
+
+  
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ccid/GemplusGemPCPinpad.java b/smcc/src/main/java/at/gv/egiz/smcc/ccid/GemplusGemPCPinpad.java
new file mode 100644
index 00000000..903b11fc
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ccid/GemplusGemPCPinpad.java
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.ccid;
+
+import javax.smartcardio.Card;
+import javax.smartcardio.CardTerminal;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class GemplusGemPCPinpad extends DefaultReader {
+
+  protected final static Log log = LogFactory.getLog(GemplusGemPCPinpad.class);
+
+  public GemplusGemPCPinpad(Card icc, CardTerminal ct) {
+    super(icc, ct);
+    log.info("Initializing Gemplus GemPC Pinpad reader");
+    log.info("Gemplus GemPC Pinpad allows PINs to have 4-8 digits");
+
+  }
+
+  @Override
+  public byte getbTimeOut() {
+    return (byte) 0x3c;    // 0x00 default = 15sec
+                           // max 40sec (?)
+  }
+
+  @Override
+  public byte getbTimeOut2() {
+    return (byte) 0x00;    // 0x00 default = 15sec
+  }
+
+  @Override
+  public byte getwPINMaxExtraDigitL() {
+    return (byte) 0x08; 
+  }
+
+  @Override
+  public byte getwPINMaxExtraDigitH() {
+    return (byte) 0x04;
+  }
+
+  @Override
+  public byte getbEntryValidationCondition() {
+    return (byte) 0x02;    // validation key pressed
+  }
+
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java b/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java
new file mode 100644
index 00000000..2cfcef19
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.smcc.ccid;
+
+import javax.smartcardio.Card;
+import javax.smartcardio.CardTerminal;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class ReaderFactory {
+
+  public static CCID getReader(Card icc, CardTerminal ct) {
+    if ("Gemplus GemPC Pinpad 00 00".equals(ct.getName())) {
+      return new GemplusGemPCPinpad(icc, ct);
+    }
+    return new DefaultReader(icc, ct);
+  }
+}
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/ACOSCardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/ACOSCardTest.java
new file mode 100644
index 00000000..5839d14a
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/ACOSCardTest.java
@@ -0,0 +1,135 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.smcc;
+
+import at.gv.egiz.smcc.SignatureCard.KeyboxName;
+import at.gv.egiz.smcc.util.SMCCHelper;
+import java.util.List;
+import java.util.Locale;
+import javax.smartcardio.ResponseAPDU;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author clemens
+ */
+@Ignore
+public class ACOSCardTest {
+
+  static ACOSCard card;
+  static PINSpec infPin, decPin, sigPin;
+
+    public ACOSCardTest() {
+    }
+
+  @BeforeClass
+  public static void setUpClass() throws Exception {
+    SMCCHelper smccHelper = new SMCCHelper();
+      switch (smccHelper.getResultCode()) {
+        case SMCCHelper.CARD_FOUND:
+          SignatureCard sigCard = smccHelper.getSignatureCard(Locale.GERMAN);
+          if (sigCard instanceof ACOSCard) {
+            System.out.println("ACOS card found");
+            card = (ACOSCard) sigCard;
+            List<PINSpec> pinSpecs = card.getPINSpecs();
+            infPin = pinSpecs.get(ACOSCard.PINSPEC_INF);
+            decPin = pinSpecs.get(ACOSCard.PINSPEC_DEC);
+            sigPin = pinSpecs.get(ACOSCard.PINSPEC_SIG);
+          } else {
+            throw new Exception("not STARCOS card: " + sigCard.toString());
+          }
+          break;
+        default:
+          throw new Exception("no card found");
+      }
+  }
+
+  @AfterClass
+  public static void tearDownClass() throws Exception {
+  }
+
+    @Before
+    public void setUp() {
+    }
+
+    @After
+    public void tearDown() {
+    }
+
+
+
+  /**
+   * Test of verifyPIN method, of class STARCOSCard.
+   */
+  @Test
+  @Ignore
+  public void testVerifyPIN_pinpad() throws Exception {
+    System.out.println("verifyPIN (pinpad)");
+    assertNotNull(card);
+
+    card.verifyPIN(decPin, new PINProvider() {
+
+      @Override
+      public char[] providePIN(PINSpec spec, int retries) {
+        return null;
+      }
+    });
+  }
+
+  /**
+   * Test of verifyPIN method, of class STARCOSCard.
+   */
+  @Test
+  @Ignore
+  public void testVerifyPIN_internal() throws Exception {
+    System.out.println("verifyPIN (internal)");
+    assertNotNull(card);
+
+    card.reset();
+
+    card.getCard().beginExclusive();
+
+    // 0x6700 without sending an APDU prior to send CtrlCmd
+    System.out.println("WARNING: this command will fail if no card " +
+            "communication took place prior to sending the CtrlCommand");
+    int retries = card.verifyPIN(decPin.getKID(), null); //"1397".toCharArray());
+
+    System.out.println("VERIFY PIN returned " + retries);
+    card.getCard().endExclusive();
+  }
+
+  /**
+   * Test of changePIN method, of class STARCOSCard.
+   */
+  @Test
+  @Ignore
+  public void testChangePIN() throws Exception {
+    System.out.println("changePIN");
+    assertNotNull(card);
+
+    card.reset();
+    int retries = card.changePIN(decPin.getKID(), null, null);
+
+    System.out.println("CHANGE PIN returned " + retries);
+  }
+
+  /**
+   * Test of reset method, of class STARCOSCard.
+   */
+  @Test
+  public void testReset() throws Exception {
+    System.out.println("reset");
+    assertNotNull(card);
+    card.reset();
+  }
+
+}
\ No newline at end of file
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java
new file mode 100644
index 00000000..9be8db00
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/STARCOSCardTest.java
@@ -0,0 +1,267 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.smcc;
+
+import at.gv.egiz.smcc.SignatureCard.KeyboxName;
+import at.gv.egiz.smcc.util.SMCCHelper;
+import java.util.List;
+import java.util.Locale;
+import javax.smartcardio.ResponseAPDU;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author clemens
+ */
+@Ignore
+public class STARCOSCardTest {
+
+  static STARCOSCard card;
+  static PINSpec cardPin, ssPin;
+
+    public STARCOSCardTest() {
+    }
+
+  @BeforeClass
+  public static void setUpClass() throws Exception {
+    SMCCHelper smccHelper = new SMCCHelper();
+      switch (smccHelper.getResultCode()) {
+        case SMCCHelper.CARD_FOUND:
+          SignatureCard sigCard = smccHelper.getSignatureCard(Locale.GERMAN);
+          if (sigCard instanceof STARCOSCard) {
+            System.out.println("STARCOS card found");
+            card = (STARCOSCard) sigCard;
+            List<PINSpec> pinSpecs = card.getPINSpecs();
+            cardPin = pinSpecs.get(STARCOSCard.PINSPEC_CARD);
+            ssPin = pinSpecs.get(STARCOSCard.PINSPEC_SS);
+
+          } else {
+            throw new Exception("not STARCOS card: " + sigCard.toString());
+          }
+          break;
+        default:
+          throw new Exception("no card found");
+      }
+  }
+
+  @AfterClass
+  public static void tearDownClass() throws Exception {
+  }
+
+    @Before
+    public void setUp() {
+    }
+
+    @After
+    public void tearDown() {
+    }
+
+  /**
+   * Test of getCertificate method, of class STARCOSCard.
+   */
+  @Test
+  @Ignore
+  public void testGetCertificate() throws Exception {
+    System.out.println("getCertificate");
+    KeyboxName keyboxName = null;
+    STARCOSCard instance = new STARCOSCard();
+    byte[] expResult = null;
+    byte[] result = instance.getCertificate(keyboxName);
+    assertEquals(expResult, result);
+    // TODO review the generated test code and remove the default call to fail.
+    fail("The test case is a prototype.");
+  }
+
+  /**
+   * Test of getInfobox method, of class STARCOSCard.
+   */
+  @Test
+  @Ignore
+  public void testGetInfobox() throws Exception {
+    System.out.println("getInfobox");
+    String infobox = "";
+    PINProvider provider = null;
+    String domainId = "";
+    STARCOSCard instance = new STARCOSCard();
+    byte[] expResult = null;
+    byte[] result = instance.getInfobox(infobox, provider, domainId);
+    assertEquals(expResult, result);
+    // TODO review the generated test code and remove the default call to fail.
+    fail("The test case is a prototype.");
+  }
+
+  /**
+   * Test of createSignature method, of class STARCOSCard.
+   */
+  @Test
+  @Ignore
+  public void testCreateSignature() throws Exception {
+    System.out.println("createSignature");
+    byte[] hash = null;
+    KeyboxName keyboxName = null;
+    PINProvider provider = null;
+    STARCOSCard instance = new STARCOSCard();
+    byte[] expResult = null;
+    byte[] result = instance.createSignature(hash, keyboxName, provider);
+    assertEquals(expResult, result);
+    // TODO review the generated test code and remove the default call to fail.
+    fail("The test case is a prototype.");
+  }
+
+  /**
+   * Test of selectFileFID method, of class STARCOSCard.
+   */
+  @Test
+  @Ignore
+  public void testSelectFileFID() throws Exception {
+    System.out.println("selectFileFID");
+    byte[] fid = null;
+    STARCOSCard instance = new STARCOSCard();
+    ResponseAPDU expResult = null;
+    ResponseAPDU result = instance.selectFileFID(fid);
+    assertEquals(expResult, result);
+    // TODO review the generated test code and remove the default call to fail.
+    fail("The test case is a prototype.");
+  }
+
+  /**
+   * Test of verifyPIN method, of class STARCOSCard.
+   */
+  @Test
+  @Ignore
+  public void testVerifyPIN_pinpad() throws Exception {
+    System.out.println("verifyPIN (pinpad)");
+    assertNotNull(card);
+
+    card.verifyPIN(cardPin, new PINProvider() {
+
+      @Override
+      public char[] providePIN(PINSpec spec, int retries) {
+        return null;
+      }
+    });
+  }
+
+  /**
+   * Test of verifyPIN method, of class STARCOSCard.
+   */
+  @Test
+  @Ignore
+  public void testVerifyPIN_internal() throws Exception {
+    System.out.println("verifyPIN (internal)");
+    assertNotNull(card);
+
+    card.reset();
+
+    card.getCard().beginExclusive();
+
+    // 0x6700 without sending an APDU prior to send CtrlCmd
+    System.out.println("WARNING: this command will fail if no card " +
+            "communication took place prior to sending the CtrlCommand");
+    int retries = card.verifyPIN(cardPin.getKID(), null); //"1397".toCharArray());
+
+    System.out.println("VERIFY PIN returned " + retries);
+    card.getCard().endExclusive();
+  }
+
+  /**
+   * Test of verifyPIN method, of class STARCOSCard.
+   */
+  @Test
+  @Ignore
+  public void testVerifyPIN_byte() throws Exception {
+    System.out.println("verifyPIN");
+    byte kid = 0;
+    STARCOSCard instance = new STARCOSCard();
+    int expResult = 0;
+    int result = instance.verifyPIN(kid);
+    assertEquals(expResult, result);
+    // TODO review the generated test code and remove the default call to fail.
+    fail("The test case is a prototype.");
+  }
+
+  /**
+   * Test of changePIN method, of class STARCOSCard.
+   */
+  @Test
+  @Ignore
+  public void testChangePIN() throws Exception {
+    System.out.println("changePIN");
+    assertNotNull(card);
+
+    card.reset();
+    int retries = card.changePIN(cardPin.getKID(), null, null);
+
+    System.out.println("CHANGE PIN returned " + retries);
+  }
+
+  /**
+   * Test of activatePIN method, of class STARCOSCard.
+   */
+  @Test
+  @Ignore
+  public void testActivatePIN() throws Exception {
+    System.out.println("activatePIN");
+    assertNotNull(card);
+
+    card.reset();
+    card.activatePIN(cardPin, new PINProvider() {
+
+      @Override
+      public char[] providePIN(PINSpec spec, int retries) throws CancelledException, InterruptedException {
+        return null;
+      }
+    });
+  }
+
+  /**
+   * Test of encodePINBlock method, of class STARCOSCard.
+   */
+  @Test
+  @Ignore
+  public void testEncodePINBlock() throws Exception {
+    System.out.println("encodePINBlock");
+    char[] pin = null;
+    STARCOSCard instance = new STARCOSCard();
+    byte[] expResult = null;
+    byte[] result = instance.encodePINBlock(pin);
+    assertEquals(expResult, result);
+    // TODO review the generated test code and remove the default call to fail.
+    fail("The test case is a prototype.");
+  }
+
+  /**
+   * Test of reset method, of class STARCOSCard.
+   */
+  @Test
+  public void testReset() throws Exception {
+    System.out.println("reset");
+    assertNotNull(card);
+    card.reset();
+  }
+
+  /**
+   * Test of toString method, of class STARCOSCard.
+   */
+  @Test
+  @Ignore
+  public void testToString() {
+    System.out.println("toString");
+    STARCOSCard instance = new STARCOSCard();
+    String expResult = "";
+    String result = instance.toString();
+    assertEquals(expResult, result);
+    // TODO review the generated test code and remove the default call to fail.
+    fail("The test case is a prototype.");
+  }
+
+}
\ No newline at end of file
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java
index e32f08d4..e2499023 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java
@@ -35,7 +35,7 @@ public abstract class AbstractPINProvider implements PINProvider, ActionListener
 
   protected String action;
 
-  private boolean actionPerformed;
+  protected boolean actionPerformed;
 
 //  protected void waitForAction() throws InterruptedException {
 //    super.wait();
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java
index 670b71dc..ce1b2d00 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java
@@ -18,6 +18,7 @@
 package at.gv.egiz.bku.smccstal;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.smcc.ccid.CCID;
 import at.gv.egiz.smcc.PINProvider;
 import at.gv.egiz.smcc.SignatureCard;
 import at.gv.egiz.stal.signedinfo.SignedInfoType;
@@ -32,7 +33,7 @@ public abstract class PINProviderFactory {
   
   public static PINProviderFactory getInstance(SignatureCard forCard,
           BKUGUIFacade gui) {
-    if (forCard.ifdSupportsFeature(SignatureCard.FEATURE_VERIFY_PIN_DIRECT)) {
+    if (forCard.getReader().hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
       return new PinpadPINProviderFactory(gui);
     } else {
       return new SoftwarePINProviderFactory(gui);
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PinpadPINProviderFactory.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PinpadPINProviderFactory.java
index 55321b72..c109ceba 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PinpadPINProviderFactory.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PinpadPINProviderFactory.java
@@ -21,9 +21,8 @@ import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.smcc.CancelledException;
 import at.gv.egiz.smcc.PINProvider;
 import at.gv.egiz.smcc.PINSpec;
-import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.stal.signedinfo.SignedInfoType;
-import java.util.List;
+import java.security.DigestException;
 
 /**
  *
@@ -51,8 +50,9 @@ public class PinpadPINProviderFactory extends PINProviderFactory {
 
 //    protected BKUGUIFacade gui;
     protected SecureViewer viewer;
+    protected ViewerThread viewerThread;
     protected SignedInfoType signedInfo;
-    protected List<HashDataInput> hashDataInputs;
+
 
     private SignaturePinProvider(SecureViewer viewer,
             SignedInfoType signedInfo) {
@@ -60,61 +60,92 @@ public class PinpadPINProviderFactory extends PINProviderFactory {
       this.signedInfo = signedInfo;
     }
 
+    protected class ViewerThread extends Thread {
+
+      PINSpec pinSpec;
+      int retries;
+
+      public ViewerThread(PINSpec pinSpec, int retries) {
+        this.pinSpec = pinSpec;
+        this.retries = retries;
+      }
+
+      @Override
+      public void run() {
+
+        try {
+
+          gui.showPinpadSignaturePINDialog(pinSpec, retries,
+              SignaturePinProvider.this, "secureViewer");
+
+          while (true) {
+            waitForAction();
+
+            if ("secureViewer".equals(action)) {
+              viewer.displayDataToBeSigned(signedInfo,
+                      SignaturePinProvider.this, "pinEntry");
+            } else if ("pinEntry".equals(action)) {
+              gui.showPinpadSignaturePINDialog(pinSpec, retries,
+                      SignaturePinProvider.this, "secureViewer");
+            } else {
+              log.error("unsupported action command: " + action);
+            }
+          }
+
+        } catch (DigestException ex) {
+          log.error("Bad digest value: " + ex.getMessage());
+          gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH,
+                  new Object[]{ex.getMessage()});
+        } catch (InterruptedException ex) {
+          log.info("pinpad secure viewer thread interrupted");
+        } catch (Exception ex) {
+          log.error("Could not display hashdata inputs: " +
+                  ex.getMessage());
+          gui.showErrorDialog(BKUGUIFacade.ERR_DISPLAY_HASHDATA,
+                  new Object[]{ex.getMessage()});
+        }
+      }
+    }
+
     @Override
     public char[] providePIN(PINSpec spec, int retries)
             throws CancelledException, InterruptedException {
 
-      showPinpadPINDialog(retries, spec);
+      if (viewerThread != null) {
+        updateViewerThread(retries);
+      } else {
+        viewerThread = new ViewerThread(spec, -1);
+        viewerThread.start();
+      }
+//      if (viewerThread != null) {
+//        log.trace("interrupt old secure viewer thread");
+//        viewerThread.interrupt();
+//      }
+//      viewerThread = new ViewerThread(spec, (retry) ? retries : -1);
+//      log.trace("start new secure viewer thread");
+//      viewerThread.start();
+
       retry = true;
       return null;
-
-//      do {
-//        waitForAction();
-//        gui.showWaitDialog(null);
-//
-//        if ("hashData".equals(action)) {
-//          // show pin dialog in background
-//          gui.showSignaturePINDialog(spec, (retry) ? retries : -1,
-//                  this, "sign",
-//                  this, "cancel",
-//                  this, "hashData");
-//
-//          viewer.displayDataToBeSigned(signedInfo.getReference());
-//
-//        } else if ("sign".equals(action)) {
-//          retry = true;
-//          return gui.getPin();
-//        } else if ("hashDataDone".equals(action)) {
-//          gui.showSignaturePINDialog(spec, (retry) ? retries : -1,
-//                  this, "sign",
-//                  this, "cancel",
-//                  this, "hashData");
-//        } else if ("cancel".equals(action) ||
-//                "error".equals(action)) {
-//          throw new CancelledException(spec.getLocalizedName() +
-//                  " entry cancelled");
-//        }
-//      } while (true);
     }
 
-    private void showPinpadPINDialog(int retries, PINSpec pinSpec) {
-      String title, message;
-      Object[] params;
-      if (retry) {
-        title = BKUGUIFacade.TITLE_RETRY;
-        message = BKUGUIFacade.MESSAGE_RETRIES;
-        params = new Object[]{String.valueOf(retries)};
-      } else {
-        title = BKUGUIFacade.TITLE_SIGN;
-        message = BKUGUIFacade.MESSAGE_ENTERPIN_PINPAD;
-        String pinSize = String.valueOf(pinSpec.getMinLength());
-        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-          pinSize += "-" + pinSpec.getMaxLength();
-        }
-        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
-      }
-      gui.showMessageDialog(title, message, params);
+    private synchronized void updateViewerThread(int retries) {
+      log.trace("update viewer thread");
+      viewerThread.retries = retries;
+      action = "pinEntry";
+      actionPerformed = true;
+      notify();
     }
+
+
+//    @Override
+//    protected void finalize() throws Throwable {
+//      if (viewerThread != null) {
+//        viewerThread.interrupt();
+//      }
+//      log.info("finalizing Pinpad SignaturePinProvider");
+//      super.finalize();
+//    }
   }
 
   class CardPinProvider extends AbstractPINProvider {
@@ -151,5 +182,5 @@ public class PinpadPINProviderFactory extends PINProviderFactory {
       gui.showMessageDialog(title, message, params);
     }
   }
-}
+  }
 
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SecureViewer.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SecureViewer.java
index c395679a..2ee37dc1 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SecureViewer.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SecureViewer.java
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package at.gv.egiz.bku.smccstal;
 
-import at.gv.egiz.stal.signedinfo.ReferenceType;
+import at.gv.egiz.stal.signedinfo.SignedInfoType;
+import java.awt.event.ActionListener;
 import java.security.DigestException;
-import java.util.List;
 
 /**
  *
@@ -38,7 +37,7 @@ public interface SecureViewer {
    * (or any other digest computation error occurs)
    * @throws java.lang.Exception
    */
-  void displayDataToBeSigned(List<ReferenceType> signedReferences) 
-          throws DigestException, Exception;
-
+  void displayDataToBeSigned(SignedInfoType signedInfo,
+          ActionListener okListener, String okCommand)
+        throws DigestException, Exception;
 }
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index ac510f38..7a4f6572 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -33,7 +33,6 @@ import org.apache.commons.logging.LogFactory;
 import at.gv.egiz.smcc.CancelledException;
 import at.gv.egiz.smcc.LockedException;
 import at.gv.egiz.smcc.NotActivatedException;
-import at.gv.egiz.smcc.PINProvider;
 import at.gv.egiz.smcc.SignatureCard;
 import at.gv.egiz.smcc.SignatureCardException;
 import at.gv.egiz.smcc.SignatureCard.KeyboxName;
@@ -47,11 +46,12 @@ import at.gv.egiz.stal.signedinfo.ObjectFactory;
 import at.gv.egiz.stal.signedinfo.SignedInfoType;
 import at.gv.egiz.stal.util.JCEAlgorithmNames;
 
-public abstract class SignRequestHandler extends AbstractRequestHandler implements SecureViewer {
+public class SignRequestHandler extends AbstractRequestHandler {
 
     private static Log log = LogFactory.getLog(SignRequestHandler.class);
     private static JAXBContext jaxbContext;
     private PINProviderFactory pinProviderFactory;
+    private SecureViewer secureViewer;
     
     static {
         try {
@@ -61,6 +61,10 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
         }
     }
 
+    public SignRequestHandler(SecureViewer secureViewer) {
+      this.secureViewer = secureViewer;
+    }
+
     @SuppressWarnings("unchecked")
     @Override
     public STALResponse handleRequest(STALRequest request) throws InterruptedException {
@@ -85,10 +89,8 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
                 if (pinProviderFactory == null) {
                   pinProviderFactory = PINProviderFactory.getInstance(card, gui);
                 }
-                PINProvider pinProvider = pinProviderFactory.
-                        getSignaturePINProvider(this, si.getValue());
-                
-                byte[] resp = card.createSignature(md.digest(), kb, pinProvider);
+                byte[] resp = card.createSignature(md.digest(), kb, 
+                        pinProviderFactory.getSignaturePINProvider(secureViewer, si.getValue()));
                 if (resp == null) {
                     return new ErrorResponse(6001);
                 }
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SoftwarePINProviderFactory.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SoftwarePINProviderFactory.java
index 54a34280..7d36c2c3 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SoftwarePINProviderFactory.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SoftwarePINProviderFactory.java
@@ -49,7 +49,6 @@ public class SoftwarePINProviderFactory extends PINProviderFactory {
 //    protected BKUGUIFacade gui;
     protected SecureViewer viewer;
     protected SignedInfoType signedInfo;
-    protected List<HashDataInput> hashDataInputs;
 
     private SignaturePinProvider(SecureViewer viewer,
             SignedInfoType signedInfo) {
@@ -64,22 +63,14 @@ public class SoftwarePINProviderFactory extends PINProviderFactory {
       gui.showSignaturePINDialog(spec, (retry) ? retries : -1,
               this, "sign",
               this, "cancel",
-              this, "hashData");
+              this, "secureViewer");
 
       do {
         waitForAction();
-        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
-                BKUGUIFacade.MESSAGE_WAIT);
-
-        if ("hashData".equals(action)) {
-          // show pin dialog in background
-          gui.showSignaturePINDialog(spec, (retry) ? retries : -1,
-                  this, "sign",
-                  this, "cancel",
-                  this, "hashData");
 
+        if ("secureViewer".equals(action)) {
           try {
-            viewer.displayDataToBeSigned(signedInfo.getReference());
+            viewer.displayDataToBeSigned(signedInfo, this, "pinEntry");
           } catch (DigestException ex) {
             log.error("Bad digest value: " + ex.getMessage());
             gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH,
@@ -93,17 +84,23 @@ public class SoftwarePINProviderFactory extends PINProviderFactory {
                     this, "error");
           }
         } else if ("sign".equals(action)) {
+          gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                BKUGUIFacade.MESSAGE_WAIT);
           retry = true;
           return gui.getPin();
-        } else if ("hashDataDone".equals(action)) {
+        } else if ("pinEntry".equals(action)) {
           gui.showSignaturePINDialog(spec, (retry) ? retries : -1,
                   this, "sign",
                   this, "cancel",
-                  this, "hashData");
+                  this, "secureViewer");
         } else if ("cancel".equals(action) ||
                 "error".equals(action)) {
+          gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                BKUGUIFacade.MESSAGE_WAIT);
           throw new CancelledException(spec.getLocalizedName() +
                   " entry cancelled");
+        } else {
+          log.error("unknown action command " + action);
         }
       } while (true);
     }
diff --git a/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java b/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
index 51dfe0da..1c1cb833 100644
--- a/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
+++ b/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
@@ -1,5 +1,6 @@
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.ccid.CCID;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -109,10 +110,10 @@ public class AbstractSMCCSTALTest extends AbstractSMCCSTAL implements
       }
 
       @Override
-      public boolean ifdSupportsFeature(byte feature) {
-        return false;
+      public CCID getReader() {
+        throw new UnsupportedOperationException("Not supported yet.");
       }
-     
+
    };
     return false;
   }
-- 
cgit v1.2.3


From 78728a96af022bae87e4d0d11855f420736d87b7 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 3 Apr 2009 15:04:26 +0000
Subject: applet dispatcher (prevent applet caching)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@326 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../smccstal/ext/ManagementPINProviderFactory.java |   6 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   2 +
 .../at/gv/egiz/bku/gui/Messages.properties         |   2 +
 .../at/gv/egiz/bku/gui/Messages_en.properties      |   2 +
 .../egiz/bku/online/webapp/AppletDispatcher.java   | 111 +++++++++++++++++++++
 .../egiz/bku/online/webapp/BKURequestHandler.java  |   2 +-
 BKUOnline/src/main/webapp/WEB-INF/web.xml          |  16 ++-
 BKUOnline/src/main/webapp/applet.jsp               |  38 +++----
 8 files changed, 155 insertions(+), 24 deletions(-)
 create mode 100644 BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/AppletDispatcher.java

(limited to 'BKUCommonGUI')

diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java
index 090caf50..f54f89d4 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java
@@ -122,8 +122,12 @@ public class ManagementPINProviderFactory extends PINProviderFactory {
       String title, message;
       Object[] params;
       if (retry) {
+        if (retries == 1) {
+          message = BKUGUIFacade.MESSAGE_LAST_RETRY_PINPAD;
+        } else {
+          message = BKUGUIFacade.MESSAGE_RETRIES_PINPAD;
+        }
         title = BKUGUIFacade.TITLE_RETRY;
-        message = BKUGUIFacade.MESSAGE_RETRIES;
         params = new Object[]{String.valueOf(retries)};
       } else if (type == PINManagementGUIFacade.DIALOG.VERIFY) {
         title = PINManagementGUIFacade.TITLE_VERIFY_PIN;
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 4b079428..79fbfd6c 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -77,6 +77,8 @@ public interface BKUGUIFacade {
   public static final String MESSAGE_HASHDATALIST = "hashdatalist";
   public static final String MESSAGE_RETRIES = "retries";
   public static final String MESSAGE_LAST_RETRY = "retries.last";
+  public static final String MESSAGE_RETRIES_PINPAD = "retries.pinpad";
+  public static final String MESSAGE_LAST_RETRY_PINPAD = "retries.pinpad.last";
   public static final String MESSAGE_OVERWRITE = "overwrite";
   public static final String MESSAGE_HELP = "help";
 
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 9bfe8fb1..146d9353 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -46,6 +46,8 @@ hashdatalink.tiny=<html><a href=\"anzeige\">Signaturdaten</a></html>
 hashdatalist=<html>{0} Signaturdaten:</html>
 retries.last=<html>Letzter Versuch!</html>
 retries=<html>Noch {0} Versuche</html>
+retries.pinpad.last=<html>Eingabe wiederholen, letzter Versuch!</html>
+retries.pinpad=<html>Eingabe wiederholen, noch {0} Versuche</html>
 overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
 help=<html>Hilfe zu {0}</html>
 
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index a36f9b83..1a40aeea 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -44,6 +44,8 @@ hashdatalink.tiny=<html><a href=\"anzeige\">signature data</a></html>
 hashdatalist=<html>{0} signature data objects:</html>
 retries.last=<html>Last try!</html>
 retries=<html>{0} tries left</html>
+retries.pinpad.last=<html>Re-enter pin, last try!</html>
+retries.pinpad=<html>Re-enter pin, {0} tries left</html>
 overwrite=<html>Overwrite {0}?</html>
 help=<html>Help topic {0}</html>
 
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/AppletDispatcher.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/AppletDispatcher.java
new file mode 100644
index 00000000..26349f7c
--- /dev/null
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/AppletDispatcher.java
@@ -0,0 +1,111 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.online.webapp;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * prevent applet caching, 
+ * could be removed once applet is loaded via jnlp
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class AppletDispatcher extends HttpServlet {
+
+  protected final static Log log = LogFactory.getLog(AppletDispatcher.class);
+
+  public static final String DISPATCH_CTX = "dispatch/";
+  public static final String RAND_PREFIX = "__";
+  public static final String RAND_ATTRIBUTE = "rand";
+  public static final Pattern ctxPattern = Pattern.compile(DISPATCH_CTX);
+  public static final Pattern archivePattern = Pattern.compile(RAND_PREFIX + "[a-zA-Z0-9]*\\.jar$");
+
+    /** 
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+
+//      String suffix = (String) request.getSession().getAttribute(RAND_CTX_ATTRIBUTE);
+//      log.trace("expecting random suffix " + suffix);
+      
+      String uri = request.getRequestURI();
+      uri = ctxPattern.matcher(uri).replaceAll("");
+//      uri = uri.replaceAll(suffix, ""); //only the applet jar requests contains the randCtx
+      uri = archivePattern.matcher(uri).replaceAll(".jar");
+
+      if (log.isTraceEnabled()) {
+        log.trace("dispatching request URI " + request.getRequestURI() +
+                " to " + uri);
+      }
+      
+      RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(uri);
+      dispatcher.forward(request, response);
+    } 
+
+    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+    /** 
+     * Handles the HTTP <code>GET</code> method.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        processRequest(request, response);
+    } 
+
+    /** 
+     * Handles the HTTP <code>POST</code> method.
+     * @param request servlet request
+     * @param response servlet response
+     * @throws ServletException if a servlet-specific error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+    throws ServletException, IOException {
+        processRequest(request, response);
+    }
+
+    /** 
+     * Returns a short description of the servlet.
+     * @return a String containing servlet description
+     */
+    @Override
+    public String getServletInfo() {
+        return "Short description";
+    }// </editor-fold>
+
+}
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
index 68a57fb5..1d0cb7e9 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
@@ -51,7 +51,7 @@ public class BKURequestHandler extends SpringBKUServlet {
 
   private static final long serialVersionUID = 1L;
 
-  public final static String REDIRECT_URL_SESSION_ATTRIBUTE="redirectUrl";
+  public final static String REDIRECT_URL_SESSION_ATTRIBUTE = "redirectUrl";
 
   protected Log log = LogFactory.getLog(BKURequestHandler.class);
 
diff --git a/BKUOnline/src/main/webapp/WEB-INF/web.xml b/BKUOnline/src/main/webapp/WEB-INF/web.xml
index 1a9b7d78..2987ac57 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/web.xml
+++ b/BKUOnline/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-	<!--
+<!--
 		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
@@ -12,9 +12,7 @@
 		the specific language governing permissions and limitations under the
 		License.
 	-->
-<web-app id="bkuonline" version="2.5"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+<web-app id="bkuonline" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 	<display-name>http-security-layer-request</display-name>
 
 	<!--  Begin Spring Config -->
@@ -52,6 +50,10 @@
         <servlet-name>BKUApplet</servlet-name>
         <jsp-file>/applet.jsp</jsp-file>
     </servlet>
+    <servlet>
+        <servlet-name>AppletDispatcher</servlet-name>
+        <servlet-class>at.gv.egiz.bku.online.webapp.AppletDispatcher</servlet-class>
+    </servlet>
     <servlet>
         <servlet-name>BKUAppletAlternative</servlet-name>
         <jsp-file>/appletAlternative.jsp</jsp-file>
@@ -76,6 +78,10 @@
       <servlet-name>help</servlet-name>
       <url-pattern>/help/*</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+      <servlet-name>AppletDispatcher</servlet-name>
+      <url-pattern>/applet/dispatch/*</url-pattern>
+    </servlet-mapping>
 
 	<!--  End BKU Config -->
 
@@ -106,4 +112,4 @@
 	<session-config>
 		<session-timeout>5</session-timeout>
 	</session-config>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
index 591ed1bf..6af81578 100644
--- a/BKUOnline/src/main/webapp/applet.jsp
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -15,7 +15,8 @@
   limitations under the License.
 -->
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-         pageEncoding="UTF-8"%>
+  pageEncoding="UTF-8" 
+  import="at.gv.egiz.bku.online.webapp.AppletDispatcher, org.apache.commons.lang.RandomStringUtils" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -41,16 +42,19 @@
         String guiStyle = (String) session.getAttribute("appletGuiStyle");
         String locale = (String) session.getAttribute("locale");
         String extension = (String) session.getAttribute("extension");
+        String rand = AppletDispatcher.RAND_PREFIX +
+                RandomStringUtils.randomAlphanumeric(16);
+                //(String) session.getAttribute(AppletDispatcher.RAND_ATTRIBUTE);
 
         String appletClass, appletArchive;
         if ("activation".equals(extension)) {
-            appletArchive = "BKUAppletExt.jar";
+            appletArchive = "BKUAppletExt";
             appletClass = "at.gv.egiz.bku.online.applet.ActivationApplet.class";
         } else if ("pin".equals(extension)) {
-            appletArchive = "BKUAppletExt.jar";
+            appletArchive = "BKUAppletExt";
             appletClass = "at.gv.egiz.bku.online.applet.PINManagementApplet.class";
         } else {
-            appletArchive = "BKUApplet.jar";
+            appletArchive = "BKUApplet";
             appletClass = "at.gv.egiz.bku.online.applet.BKUApplet.class";
         }
     %>
@@ -61,21 +65,21 @@
                     .write('<b>Diese Anwendung benötigt die Java Platform Version 1.6.0_04 oder höher.</b>' + '<input type="submit" value="Java Platform 1.6.0_02 installieren" onclick="deployJava.installLatestJRE();">');
                 } else {
                     var attributes = {
-                        codebase :'applet',
-                        code : '<%=appletClass%>',
-                        archive : '<%=appletArchive + ", commons-logging.jar, iaik_jce_me4se.jar"%>',
-                        width : <%=width%>,
-                        height :<%=height%>
+                      codebase :'<%="applet/" + AppletDispatcher.DISPATCH_CTX %>',
+                      code : '<%=appletClass%>',
+                      archive : '<%=appletArchive + rand +".jar, commons-logging.jar, iaik_jce_me4se.jar"%>',
+                      width : <%=width%>,
+                      height :<%=height%>
                     };
                     var parameters = {
-                        GuiStyle : '<%=guiStyle%>',
-                        Locale : '<%=locale%>',
-                        Background : '<%=backgroundImg%>',
-                        WSDL_URL :'../stal;jsessionid=<%=session.getId()%>?wsdl',
-                        HelpURL : '../help/',
-                        SessionID : '<%=session.getId()%>',
-                        RedirectURL : '../bkuResult',
-                        RedirectTarget: '_parent'
+                      GuiStyle : '<%=guiStyle%>',
+                      Locale : '<%=locale%>',
+                      Background : '<%=backgroundImg%>',
+                      WSDL_URL :'../../stal;jsessionid=<%=session.getId()%>?wsdl',
+                      HelpURL : '../../help/',
+                      SessionID : '<%=session.getId()%>',
+                      RedirectURL : '../../bkuResult',
+                      RedirectTarget: '_parent'
                     };
                     var version = '1.6.0_04';
                     deployJava.runApplet(attributes, parameters, version);
-- 
cgit v1.2.3


From 1a75d2ae8fa57011166110754fed3ab082a52302 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 7 Apr 2009 09:09:21 +0000
Subject: [maven-release-plugin] prepare release mocca-1.1.0

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@329 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUAppletExt/pom.xml | 14 +++++++-------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 24 ++++++++++++------------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 STALXService/pom.xml | 10 +++++-----
 bkucommon/pom.xml    | 17 +++++++----------
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 16 files changed, 81 insertions(+), 84 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index da5dbc6f..a0777ee6 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.0.5-SNAPSHOT</version>
+  <version>1.1.0</version>
   <build>
     <plugins>
       <plugin>
@@ -74,27 +74,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.0.5-SNAPSHOT</version>
+      <version>1.1.0</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.5-SNAPSHOT</version>
+      <version>1.1.0</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.0.5-SNAPSHOT</version>
+      <version>1.1.0</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.0.5-SNAPSHOT</version>
+      <version>1.1.0</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.0.5-SNAPSHOT</version>
+      <version>1.1.0</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 3ff88ed8..69daa021 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -3,34 +3,34 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.0.2-SNAPSHOT</version>
-    <description/>
+    <version>1.1.0</version>
+    <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 47cd7545..34a13fdd 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.1.0</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 5fd142a2..a211da42 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.5-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.3</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.0.5-SNAPSHOT</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.5-SNAPSHOT</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.0.5-SNAPSHOT</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.0.5-SNAPSHOT</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.0.5-SNAPSHOT</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.0.5-SNAPSHOT</version>
+			<version>1.1.0</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index bce6f584..d94b4893 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.5-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.3</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.0.3</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.0.5-SNAPSHOT</version>
+			<version>1.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index fc5f04fa..98090fcc 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.1.0</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
             <scope>compile</scope>
         </dependency>
 		<dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -68,7 +68,7 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALXService</artifactId>
-          <version>1.0.2-SNAPSHOT</version>
+          <version>1.1.0</version>
         </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUAppletExt</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -122,9 +122,9 @@
 
     </dependencies>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index d82d1adc..4b79ca38 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.5-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.0.5-SNAPSHOT</version>
+	<version>1.1.0</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.0.5-SNAPSHOT</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 81d5352f..bd3181ea 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.1.0</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 3f71e805..a1d050e7 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.1.0</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.0.5-SNAPSHOT</version>
+      <version>1.1.0</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index a341d292..a3ecdef4 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.1.0</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 379cb399..ace64eaa 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?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">
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.1.0</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.0.5-SNAPSHOT</version>
+      <version>1.1.0</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.1.0</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 5084abcb..bbba25f7 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -1,16 +1,15 @@
 <?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>
-		<version>1.0.5-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.0.5-SNAPSHOT</version>
+	<version>1.1.0</version>
 
 	<build>
 		<plugins>
@@ -25,14 +24,12 @@
 				<wsdlFile>MOA-SPSS-1.3.wsdl</wsdlFile> </wsdlFiles>
 				<sourceDestDir>${project.build.directory}/generated-sources/moaspss</sourceDestDir>
 				<staleFile>${project.build.directory}/generated-sources/moaspss/.staleFlag</staleFile>
-				<xnocompile>true</xnocompile> </configuration> </plugin
-			-->
+				<xnocompile>true</xnocompile> </configuration> </plugin -->
 			<!--
 				skip tests temporarily <plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId> <configuration>
-				<skip>true</skip> </configuration> </plugin
-			-->
+				<skip>true</skip> </configuration> </plugin -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
@@ -52,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.0.5-SNAPSHOT</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.0.2-SNAPSHOT</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 2ba2b2ae..98470ab0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.5-SNAPSHOT</version>
+	<version>1.1.0</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -41,9 +41,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 59128c43..e0e0526d 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.0.5-SNAPSHOT</version>
+  <version>1.1.0</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 02e80632..29362f30 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.1.0</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index aabab561..97938813 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.0.5-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.0.5-SNAPSHOT</version>
+	<version>1.1.0</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 47bc6ce0d569d7bff1bab891c2f6ce66cd2a544e Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 7 Apr 2009 09:13:32 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@331 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUAppletExt/pom.xml | 12 ++++++------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 24 ++++++++++++------------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 STALXService/pom.xml |  8 ++++----
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 16 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index a0777ee6..020ac7e2 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.1.0</version>
+  <version>1.1.1-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -74,27 +74,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 69daa021..936b7d3a 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -3,34 +3,34 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 34a13fdd..5d09b7a6 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index a211da42..3fdbbf44 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.0</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.3</version>
+	<version>1.0.4-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.1.0</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.0</version>
+			<version>1.0.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.1.0</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.1.0</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.1.0</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.1.0</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index d94b4893..8450c440 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.0</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.3</version>
+	<version>1.0.4-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.3</version>
+			<version>1.0.4-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.1.0</version>
+			<version>1.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 98090fcc..abf4bfc1 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.1.0</version>
+            <version>1.0.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 		<dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -68,7 +68,7 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALXService</artifactId>
-          <version>1.1.0</version>
+          <version>1.1.1-SNAPSHOT</version>
         </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUAppletExt</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -122,9 +122,9 @@
 
     </dependencies>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 4b79ca38..d6838c34 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.0</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.1.0</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.0</version>
+			<version>1.0.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index bd3181ea..3ad5acd2 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index a1d050e7..11a58cb5 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.1.0</version>
+  <version>1.1.1-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index a3ecdef4..e852e5c2 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index ace64eaa..2597d8fe 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.1.0</version>
+  <version>1.1.1-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.0</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.0</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index bbba25f7..91fd0810 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.0</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.1.0</version>
+	<version>1.0.6-SNAPSHOT</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.1.0</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.1.0</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 98470ab0..ac9d434a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.1.0</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -41,9 +41,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index e0e0526d..15f90f15 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.1.0</version>
+  <version>1.1.1-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 29362f30..daec5fe6 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 97938813..b160ccc2 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.0</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.1.0</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 8a336c8343f86f69680817153334d0d37da56010 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 20 Apr 2009 14:56:16 +0000
Subject: en localization of pinMgmt (verifyPin, cancelbutton) no java message
 (todo: localize)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@339 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java |  1 +
 .../at/gv/egiz/bku/gui/ActivationMessages.properties         |  2 +-
 .../at/gv/egiz/bku/gui/ActivationMessages_en.properties      |  2 ++
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java         | 12 ++++++------
 BKUOnline/src/main/webapp/applet.jsp                         |  2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
index 848cd17f..e8415dc3 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
@@ -28,6 +28,7 @@ import java.util.Map;
 public interface PINManagementGUIFacade extends BKUGUIFacade {
 
   public static final String HELP_PINMGMT = "help.pin.mgmt";
+//  public static final String HELP_VERIFY_PIN = "help.pin.verify";
   public static final String TITLE_PINMGMT = "title.pin.mgmt";
   public static final String TITLE_ACTIVATE_PIN = "title.activate.pin";
   public static final String TITLE_CHANGE_PIN = "title.change.pin";
diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
index 15fc2827..bdf077d4 100644
--- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
+++ b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
@@ -27,7 +27,7 @@ pin.mgmt=<html>Die Karte verf\u00FCgt \u00FCber {0} PINs</html>
 activate.pin=<html>{0} eingeben und best\u00E4tigen</html>
 change.pin=<html>{0} eingeben und best\u00E4tigen</html>
 unblock.pin=<html>PUK zu {0} eingeben</html>
-verify.pin=<html>{0} eingeben (TODO: Warning not activated)</html>
+verify.pin=<html>{0} eingeben</html>
 verify.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben (und best\u00E4tigen).</html>
 activate.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben und wiederholen (jeweils best\u00E4tigen).</html>
 change.pinpad=<html>Alte {0} ({1} stellig) am Kartenleser eingeben, danach neue {0} eingeben und wiederholen (jeweils best\u00E4tigen). </html>
diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
index 8cc9d01a..037ae091 100644
--- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
+++ b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
@@ -16,6 +16,7 @@
 title.activation=<html>Activation</html>
 title.pin.mgmt=<html>PIN Management</html>
 title.activate.pin=<html>Activate PIN</html>
+title.verify.pin=<html>Enter PIN</html>
 title.change.pin=<html>Change PIN</html>
 title.unblock.pin=<html>Unblock PIN</html>
 title.activate.success=<html>Success</html>
@@ -26,6 +27,7 @@ pin.mgmt=<html>The smartcard has {0} PINs</html>
 activate.pin=<html>Enter and confirm {0}</html>
 change.pin=<html>Enter and confirm {0}</html>
 unblock.pin=<html>Enter PUK for {0}</html>
+verify.pin=<html>Enter {0}</html>
 verify.pinpad=<html>Enter {0} ({1} digits) on cardreader (and confirm).</html>
 activate.pinpad=<html>Enter {0} ({1} digits) on cardreader and repeat (confirm in each case).</html>
 change.pinpad=<html>Enter old {0} ({1} digits) on cardreader, then enter new {0} and repeat (confirm in each case).</html>
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index a7eebbfd..e5cac7b7 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -1533,6 +1533,12 @@ public class BKUGUIImpl implements BKUGUIFacade {
       if (b.getPreferredSize().width > bs) {
         bs = b.getPreferredSize().width;
       }
+      // need cancel button for message dialog,
+      // even if renderCancelButton == false
+      b.setText(getMessage(BUTTON_CANCEL));
+      if (b.getPreferredSize().width > bs) {
+        bs = b.getPreferredSize().width;
+      }
       b.setText(getMessage(BUTTON_SIGN));
       if (b.getPreferredSize().width > bs) {
         bs = b.getPreferredSize().width;
@@ -1545,12 +1551,6 @@ public class BKUGUIImpl implements BKUGUIFacade {
       if (b.getPreferredSize().width > bs) {
         bs = b.getPreferredSize().width;
       }
-      if (renderCancelButton) {
-        b.setText(getMessage(BUTTON_CANCEL));
-        if (b.getPreferredSize().width > bs) {
-          bs = b.getPreferredSize().width;
-        }
-      }
       return bs;
     }
 }
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
index b2e54673..51f23bbc 100644
--- a/BKUOnline/src/main/webapp/applet.jsp
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -61,7 +61,7 @@
             <script>
                 if (!deployJava.versionCheck('1.6.0_04+')) {
                     document
-                    .write('<b>Diese Anwendung benötigt die Java Platform Version 1.6.0_04 oder höher.</b>' + '<input type="submit" value="Java Platform 1.6.0_02 installieren" onclick="deployJava.installLatestJRE();">');
+                    .write('<p>Diese Anwendung benötigt Version 6 Update 4 oder höher der <a href="" onclick="deployJava.installLatestJRE();">Java&trade; Laufzeitumgebung</a>.</p>');
                 } else {
                   // to enable applet caching, remove AppletDispatcher servlet,
                   // change codebase to 'applet',
-- 
cgit v1.2.3


From 1ad17f951032d8b33c351d95d2f336c98d040d4d Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 20 Apr 2009 15:01:52 +0000
Subject: [maven-release-plugin] prepare release mocca-1.1.1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@340 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUAppletExt/pom.xml | 12 ++++++------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 24 ++++++++++++------------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 STALXService/pom.xml |  8 ++++----
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 16 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 020ac7e2..cff0e483 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <build>
     <plugins>
       <plugin>
@@ -74,27 +74,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 936b7d3a..757adca3 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -3,34 +3,34 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 5d09b7a6..7b21bcd9 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index b882502f..8153a40e 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.4</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index dc1583c5..f07d9b88 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.4</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.4</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index d41e76b2..bbf93b37 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>compile</scope>
         </dependency>
 		<dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -68,7 +68,7 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALXService</artifactId>
-          <version>1.1.1-SNAPSHOT</version>
+          <version>1.1.1</version>
         </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUAppletExt</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -122,9 +122,9 @@
 
     </dependencies>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 33bd09b5..39257f2f 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 3ad5acd2..7be1864d 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 11a58cb5..646768de 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index e852e5c2..e0591eba 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 2597d8fe..d36f5ed8 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index decbb6e5..7c378ca6 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index ac9d434a..e2ce8e41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -41,9 +41,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 15f90f15..5682b112 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index daec5fe6..27726f04 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b160ccc2..b7a30626 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 3b5c56568c01f6f012888ce958df8e6d8f5fb18f Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 20 Apr 2009 15:30:31 +0000
Subject: [maven-release-plugin] rollback the release of mocca-1.1.1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@343 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUAppletExt/pom.xml | 12 ++++++------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 24 ++++++++++++------------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 STALXService/pom.xml |  8 ++++----
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 16 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index cff0e483..020ac7e2 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.1.1</version>
+  <version>1.1.1-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -74,27 +74,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 757adca3..936b7d3a 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -3,34 +3,34 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 7b21bcd9..5d09b7a6 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 8153a40e..b882502f 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.4</version>
+	<version>1.0.4-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index f07d9b88..dc1583c5 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.4</version>
+	<version>1.0.4-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.4-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index bbf93b37..d41e76b2 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 		<dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -68,7 +68,7 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALXService</artifactId>
-          <version>1.1.1</version>
+          <version>1.1.1-SNAPSHOT</version>
         </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUAppletExt</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -122,9 +122,9 @@
 
     </dependencies>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 39257f2f..33bd09b5 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.1.1</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 7be1864d..3ad5acd2 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 646768de..11a58cb5 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.1.1</version>
+  <version>1.1.1-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index e0591eba..e852e5c2 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index d36f5ed8..2597d8fe 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.1.1</version>
+  <version>1.1.1-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 7c378ca6..decbb6e5 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.1.1</version>
+	<version>1.1.1-SNAPSHOT</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index e2ce8e41..ac9d434a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.1.1</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -41,9 +41,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 5682b112..15f90f15 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.1.1</version>
+  <version>1.1.1-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 27726f04..daec5fe6 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b7a30626..b160ccc2 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.1.1</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 9a04c66553e1f7a088407176299bb3acbb463e5a Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 20 Apr 2009 15:41:17 +0000
Subject: [maven-release-plugin] prepare release mocca-1.1.1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@344 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUAppletExt/pom.xml | 12 ++++++------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 24 ++++++++++++------------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 STALXService/pom.xml |  8 ++++----
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 16 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 020ac7e2..cff0e483 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <build>
     <plugins>
       <plugin>
@@ -74,27 +74,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 936b7d3a..757adca3 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -3,34 +3,34 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 5d09b7a6..7b21bcd9 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index b882502f..8153a40e 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.4</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index dc1583c5..f07d9b88 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.4</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.4</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index d41e76b2..bbf93b37 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>compile</scope>
         </dependency>
 		<dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -68,7 +68,7 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALXService</artifactId>
-          <version>1.1.1-SNAPSHOT</version>
+          <version>1.1.1</version>
         </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUAppletExt</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -122,9 +122,9 @@
 
     </dependencies>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 33bd09b5..39257f2f 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 3ad5acd2..7be1864d 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 11a58cb5..646768de 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index e852e5c2..e0591eba 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 2597d8fe..d36f5ed8 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index decbb6e5..7c378ca6 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index ac9d434a..e2ce8e41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -41,9 +41,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 15f90f15..5682b112 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index daec5fe6..27726f04 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b160ccc2..b7a30626 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 0843cee3fde9b3c81410e219e311e8e03aa9afcd Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 20 Apr 2009 15:51:45 +0000
Subject: [maven-release-plugin] rollback the release of mocca-1.1.1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@345 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUAppletExt/pom.xml | 12 ++++++------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 24 ++++++++++++------------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 STALXService/pom.xml |  8 ++++----
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 16 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index cff0e483..020ac7e2 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.1.1</version>
+  <version>1.1.1-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -74,27 +74,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 757adca3..936b7d3a 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -3,34 +3,34 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 7b21bcd9..5d09b7a6 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 8153a40e..b882502f 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.4</version>
+	<version>1.0.4-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index f07d9b88..dc1583c5 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.4</version>
+	<version>1.0.4-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.4-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index bbf93b37..d41e76b2 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 		<dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -68,7 +68,7 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALXService</artifactId>
-          <version>1.1.1</version>
+          <version>1.1.1-SNAPSHOT</version>
         </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUAppletExt</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -122,9 +122,9 @@
 
     </dependencies>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 39257f2f..33bd09b5 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.1.1</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 7be1864d..3ad5acd2 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 646768de..11a58cb5 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.1.1</version>
+  <version>1.1.1-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index e0591eba..e852e5c2 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index d36f5ed8..2597d8fe 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.1.1</version>
+  <version>1.1.1-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 7c378ca6..decbb6e5 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.1.1</version>
+	<version>1.1.1-SNAPSHOT</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index e2ce8e41..ac9d434a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.1.1</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -41,9 +41,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 5682b112..15f90f15 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.1.1</version>
+  <version>1.1.1-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 27726f04..daec5fe6 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b7a30626..b160ccc2 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.1.1</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 64efe970e2b053b8d058f5230c5bf8e2fb4666d5 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 20 Apr 2009 15:57:58 +0000
Subject: [maven-release-plugin] prepare release mocca-1.1.1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@346 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUAppletExt/pom.xml | 12 ++++++------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 24 ++++++++++++------------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 STALXService/pom.xml |  8 ++++----
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 16 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 020ac7e2..cff0e483 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <build>
     <plugins>
       <plugin>
@@ -74,27 +74,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 936b7d3a..757adca3 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -3,34 +3,34 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 5d09b7a6..7b21bcd9 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index b882502f..8153a40e 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.4</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index dc1583c5..f07d9b88 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.4</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.4</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index d41e76b2..bbf93b37 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>compile</scope>
         </dependency>
 		<dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -68,7 +68,7 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALXService</artifactId>
-          <version>1.1.1-SNAPSHOT</version>
+          <version>1.1.1</version>
         </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUAppletExt</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -122,9 +122,9 @@
 
     </dependencies>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 33bd09b5..39257f2f 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 3ad5acd2..7be1864d 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 11a58cb5..646768de 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index e852e5c2..e0591eba 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 2597d8fe..d36f5ed8 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index decbb6e5..7c378ca6 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index ac9d434a..e2ce8e41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -41,9 +41,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 15f90f15..5682b112 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index daec5fe6..27726f04 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b160ccc2..b7a30626 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From bbd9833a9ae0cbbc350eb4db8a001849bb6637ac Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 20 Apr 2009 16:00:46 +0000
Subject: [maven-release-plugin] rollback the release of mocca-1.1.1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@347 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUAppletExt/pom.xml | 12 ++++++------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 24 ++++++++++++------------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 STALXService/pom.xml |  8 ++++----
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 16 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index cff0e483..020ac7e2 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.1.1</version>
+  <version>1.1.1-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -74,27 +74,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 757adca3..936b7d3a 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -3,34 +3,34 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 7b21bcd9..5d09b7a6 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 8153a40e..b882502f 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.4</version>
+	<version>1.0.4-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index f07d9b88..dc1583c5 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.4</version>
+	<version>1.0.4-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.4-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index bbf93b37..d41e76b2 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 		<dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -68,7 +68,7 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALXService</artifactId>
-          <version>1.1.1</version>
+          <version>1.1.1-SNAPSHOT</version>
         </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUAppletExt</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -122,9 +122,9 @@
 
     </dependencies>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 39257f2f..33bd09b5 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.1.1</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 7be1864d..3ad5acd2 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 646768de..11a58cb5 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.1.1</version>
+  <version>1.1.1-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index e0591eba..e852e5c2 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index d36f5ed8..2597d8fe 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.1.1</version>
+  <version>1.1.1-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 7c378ca6..decbb6e5 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.1.1</version>
+	<version>1.1.1-SNAPSHOT</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index e2ce8e41..ac9d434a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.1.1</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -41,9 +41,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 5682b112..15f90f15 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.1.1</version>
+  <version>1.1.1-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 27726f04..daec5fe6 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.1.1</version>
+    <version>1.1.1-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b7a30626..b160ccc2 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.1.1</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 420e23a4e9f105defc502e8ec351e1e313a6b225 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 20 Apr 2009 16:03:29 +0000
Subject: [maven-release-plugin] prepare release mocca-1.1.1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@348 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUAppletExt/pom.xml | 12 ++++++------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 24 ++++++++++++------------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 STALXService/pom.xml |  8 ++++----
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 16 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 020ac7e2..cff0e483 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <build>
     <plugins>
       <plugin>
@@ -74,27 +74,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 936b7d3a..757adca3 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -3,34 +3,34 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 5d09b7a6..7b21bcd9 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index b882502f..8153a40e 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.4</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index dc1583c5..f07d9b88 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>1.0.4</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.4</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index d41e76b2..bbf93b37 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>compile</scope>
         </dependency>
 		<dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -68,7 +68,7 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALXService</artifactId>
-          <version>1.1.1-SNAPSHOT</version>
+          <version>1.1.1</version>
         </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUAppletExt</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -122,9 +122,9 @@
 
     </dependencies>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 33bd09b5..39257f2f 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 3ad5acd2..7be1864d 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 11a58cb5..646768de 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index e852e5c2..e0591eba 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 2597d8fe..d36f5ed8 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index decbb6e5..7c378ca6 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index ac9d434a..e2ce8e41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -41,9 +41,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 15f90f15..5682b112 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index daec5fe6..27726f04 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b160ccc2..b7a30626 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.1</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 0ee51852335b820c51b7270df31c116a0826f9c7 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 20 Apr 2009 16:03:48 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@350 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUAppletExt/pom.xml | 12 ++++++------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKULocalApp/pom.xml  |  8 ++++----
 BKUOnline/pom.xml    | 24 ++++++++++++------------
 BKUViewer/pom.xml    |  6 +++---
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 STALXService/pom.xml |  8 ++++----
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 16 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index cff0e483..d879b274 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.1.1</version>
+  <version>1.1.2-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -74,27 +74,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.2-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 757adca3..fba8aa02 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -3,34 +3,34 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 7b21bcd9..0f8a0acf 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 8153a40e..8bcd0a0c 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.4</version>
+	<version>1.0.5-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.2-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml
index f07d9b88..7eb78aa9 100644
--- a/BKULocalApp/pom.xml
+++ b/BKULocalApp/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocalApp</artifactId>
 	<name>BKU Local App</name>
-	<version>1.0.4</version>
+	<version>1.0.5-SNAPSHOT</version>
 	<description />
 	<build>
 		<pluginManagement>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKULocal</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.5-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<artifactId>utils</artifactId>
 			<groupId>at.gv.egiz</groupId>
-			<version>1.1.1</version>
+			<version>1.1.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index bbf93b37..9ac1dac7 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 		<dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
         </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -68,7 +68,7 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALXService</artifactId>
-          <version>1.1.1</version>
+          <version>1.1.2-SNAPSHOT</version>
         </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUAppletExt</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -122,9 +122,9 @@
 
     </dependencies>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 39257f2f..d9211a64 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.1.1</version>
+	<version>1.1.2-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 7be1864d..fe697029 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 646768de..83071652 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.1.1</version>
+  <version>1.1.2-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index e0591eba..6bc4a922 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index d36f5ed8..9e69b0b3 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.1.1</version>
+  <version>1.1.2-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1</version>
+      <version>1.1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.1</version>
+      <version>1.1.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 7c378ca6..adeb1936 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.1.1</version>
+	<version>1.1.2-SNAPSHOT</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index e2ce8e41..10765f01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bku</artifactId>
 	<packaging>pom</packaging>
-	<version>1.1.1</version>
+	<version>1.1.2-SNAPSHOT</version>
 	<name>BKU</name>
 	<url>http://bku.egiz.gv.at</url>
 	<modules>
@@ -41,9 +41,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</connection>
-		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</developerConnection>
-		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.1</url>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+		<developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+		<url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
 	</scm>
 	<organization>
 		<name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 5682b112..6a9f52a3 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.1.1</version>
+  <version>1.1.2-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 27726f04..2af7c24e 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index b7a30626..74e8aab9 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.1.1</version>
+	<version>1.1.2-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 8c4be63080981cc85e1c1584f046dfd6035968c0 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 1 Jul 2009 15:05:23 +0000
Subject: [maven-release-plugin] prepare release mocca-1.2.0

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@385 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUAppletExt/pom.xml | 12 ++++++------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKUOnline/pom.xml    | 24 ++++++++++++------------
 BKUViewer/pom.xml    |  6 +++---
 BKUWebStart/pom.xml  | 10 +++++-----
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 STALXService/pom.xml |  8 ++++----
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 16 files changed, 77 insertions(+), 77 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index d879b274..5365846d 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.2.0</version>
   <build>
     <plugins>
       <plugin>
@@ -74,27 +74,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.1.2-SNAPSHOT</version>
+      <version>1.2.0</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.2-SNAPSHOT</version>
+      <version>1.2.0</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.1.2-SNAPSHOT</version>
+      <version>1.2.0</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.1.2-SNAPSHOT</version>
+      <version>1.2.0</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.1.2-SNAPSHOT</version>
+      <version>1.2.0</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index fba8aa02..7962392f 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -3,34 +3,34 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 0f8a0acf..37c8e226 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 8bcd0a0c..b32c9aa2 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.2-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.5-SNAPSHOT</version>
+	<version>1.0.5</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>1.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>1.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>1.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>1.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>1.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>1.2.0</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 17fa78b0..eb51b571 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -68,7 +68,7 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALXService</artifactId>
-          <version>1.1.2-SNAPSHOT</version>
+          <version>1.2.0</version>
         </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUAppletExt</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -122,9 +122,9 @@
 
     </dependencies>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index d9211a64..124caa87 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.2-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.1.2-SNAPSHOT</version>
+	<version>1.2.0</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>1.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 09574814..450361a2 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
@@ -14,7 +14,7 @@
    | IMPORTANT: update jnlp/resources/version.xml and
    | include-webstart profile in BKUOnline if version changes
    |-->
-  <version>1.0.4-SNAPSHOT</version>
+  <version>1.0.4</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung (MOCCA Web Start)</description>
 
@@ -199,13 +199,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKULocal</artifactId>
-      <version>1.0.5-SNAPSHOT</version>
+      <version>1.0.5</version>
       <type>war</type>
     </dependency>
     <dependency>
       <artifactId>utils</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.2-SNAPSHOT</version>
+      <version>1.2.0</version>
       <exclusions>
         <exclusion>
           <artifactId>iaik_ecc_signed</artifactId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index fe697029..32664530 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 83071652..4b1564a1 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.2.0</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.1.2-SNAPSHOT</version>
+      <version>1.2.0</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 6bc4a922..0313bbed 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 9e69b0b3..3e1fc49d 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.2.0</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.2-SNAPSHOT</version>
+      <version>1.2.0</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1.2-SNAPSHOT</version>
+      <version>1.2.0</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index adeb1936..1490e228 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.2-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.1.2-SNAPSHOT</version>
+	<version>1.2.0</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>1.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<version>1.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 8cc5aa6d..692bcded 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.2.0</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -43,9 +43,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index ce414318..4c6000cc 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.2.0</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 2af7c24e..0eb34c5b 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 74e8aab9..8ab9e8b1 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.1.2-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.1.2-SNAPSHOT</version>
+	<version>1.2.0</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From d23cff9c8f01f7fff85c183fd3b482b173bb3108 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 1 Jul 2009 15:07:04 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@387 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml    | 14 +++++++-------
 BKUAppletExt/pom.xml | 12 ++++++------
 BKUCommonGUI/pom.xml |  8 ++++----
 BKULocal/pom.xml     | 22 +++++++++++-----------
 BKUOnline/pom.xml    | 24 ++++++++++++------------
 BKUViewer/pom.xml    |  6 +++---
 BKUWebStart/pom.xml  |  8 ++++----
 STAL/pom.xml         |  4 ++--
 STALExt/pom.xml      |  6 +++---
 STALService/pom.xml  |  6 +++---
 STALXService/pom.xml |  8 ++++----
 bkucommon/pom.xml    |  8 ++++----
 pom.xml              |  8 ++++----
 smcc/pom.xml         |  4 ++--
 smccSTAL/pom.xml     | 10 +++++-----
 utils/pom.xml        |  4 ++--
 16 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 5365846d..32438d0f 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.0</version>
+  <version>1.2.1-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -74,27 +74,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.0</version>
+      <version>1.2.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.0</version>
+      <version>1.2.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.0</version>
+      <version>1.2.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.0</version>
+      <version>1.2.1-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.0</version>
+      <version>1.2.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 7962392f..ce9d9968 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -3,34 +3,34 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 37c8e226..065b1161 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index b32c9aa2..516157a8 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.0</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.5</version>
+	<version>1.0.6-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -56,22 +56,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -96,12 +96,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index eb51b571..258b978a 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
         </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -68,7 +68,7 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALXService</artifactId>
-          <version>1.2.0</version>
+          <version>1.2.1-SNAPSHOT</version>
         </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUAppletExt</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -122,9 +122,9 @@
 
     </dependencies>
     <scm>
-        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0/BKUOnline</developerConnection>
-        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0/BKUOnline</connection>
-        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0/BKUOnline</url>
+        <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 124caa87..a11796f9 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.0</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.2.0</version>
+	<version>1.2.1-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 450361a2..0ae3feec 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
@@ -14,7 +14,7 @@
    | IMPORTANT: update jnlp/resources/version.xml and
    | include-webstart profile in BKUOnline if version changes
    |-->
-  <version>1.0.4</version>
+  <version>1.0.5-SNAPSHOT</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung (MOCCA Web Start)</description>
 
@@ -199,13 +199,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKULocal</artifactId>
-      <version>1.0.5</version>
+      <version>1.0.6-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
       <artifactId>utils</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.0</version>
+      <version>1.2.1-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>iaik_ecc_signed</artifactId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 32664530..622f0af4 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 4b1564a1..19566f9d 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.0</version>
+  <version>1.2.1-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.0</version>
+      <version>1.2.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 0313bbed..dd60866d 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 3e1fc49d..31c56902 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.0</version>
+  <version>1.2.1-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.0</version>
+      <version>1.2.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.0</version>
+      <version>1.2.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 1490e228..e31b7b0d 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.0</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.0</version>
+	<version>1.2.1-SNAPSHOT</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 692bcded..4a3369a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.0</version>
+  <version>1.2.1-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -43,9 +43,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.0</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 4c6000cc..fdac2ac5 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.0</version>
+  <version>1.2.1-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 0eb34c5b..61f6b22d 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 8ab9e8b1..323ce538 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.0</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.0</version>
+	<version>1.2.1-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From cb4496d82e8271102cda305e5490d6bc55e63fb6 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 9 Jul 2009 12:07:40 +0000
Subject: log locale

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@403 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index e5cac7b7..4cab29e0 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -39,6 +39,7 @@ import java.text.MessageFormat;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import javax.swing.GroupLayout;
 import javax.swing.ImageIcon;
@@ -1509,6 +1510,9 @@ public class BKUGUIImpl implements BKUGUIFacade {
     ////////////////////////////////////////////////////////////////////////////
 
     /**
+     * Load applet messages bundle. Note that getBundle looks for classes based
+     * on the default Locale before it selects the base class!
+     * 
      * Called from constructor.
      * Subclasses may override this method to ensure the message bundle is loaded
      * once initButtonSize (called from constructor as well) is called.
@@ -1517,12 +1521,16 @@ public class BKUGUIImpl implements BKUGUIFacade {
      */
     protected void loadMessageBundle(Locale locale) {
       if (locale != null) {
+        // see [#378] Ignoring post parameter 'locale': bundle resolve-order not correct?!
         Locale lang = new Locale(locale.getLanguage().substring(0, 2));
         log.debug("loading applet resources for language: " + lang.toString());
         messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, lang);
       } else {
+        log.debug("loading default language applet resources");
         messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
       }
+      // how the f*** you know the default Messages.properties is de?!
+      log.debug("applet messages loaded: " + messages.getLocale());
     }
 
     protected int initButtonSize() {
-- 
cgit v1.2.3


From 5bff0a3288bd2b5e1f1030c6e47430735cd09463 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 9 Jul 2009 16:34:07 +0000
Subject: [#393] loading of default background fails

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@407 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |   4 +--
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   2 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   |  31 +++++----------------
 .../resources/images/BackgroundChipperling.png     | Bin 2041 -> 0 bytes
 .../src/main/resources/images/BackgroundMocca.png  | Bin 1287 -> 0 bytes
 .../main/resources/images/ChipperlingCutoff.png    | Bin 0 -> 1522 bytes
 .../src/main/resources/images/help_orig.png        | Bin 303 -> 0 bytes
 BKUOnline/src/main/webapp/applet.jsp               |   4 ++-
 .../src/main/webapp/img/ChipperlingCutoff.png      | Bin 0 -> 1522 bytes
 9 files changed, 13 insertions(+), 28 deletions(-)
 delete mode 100644 BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png
 delete mode 100644 BKUCommonGUI/src/main/resources/images/BackgroundMocca.png
 create mode 100644 BKUCommonGUI/src/main/resources/images/ChipperlingCutoff.png
 delete mode 100644 BKUCommonGUI/src/main/resources/images/help_orig.png
 create mode 100644 BKUOnline/src/main/webapp/img/ChipperlingCutoff.png

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 43bc2dae..95ac3553 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -116,7 +116,7 @@ public class BKUApplet extends JApplet {
       backgroundImgURL = getURLParameter(BACKGROUND_IMG, null);
       log.debug("setting background: " + backgroundImgURL);
     } catch (MalformedURLException ex) {
-      log.warn("failed to load applet background image: " + ex.getMessage() + ", using default");
+      log.warn("cannot load applet background image: " + ex.getMessage());
     }
 
     AbstractHelpListener helpListener = null;
@@ -236,7 +236,7 @@ public class BKUApplet extends JApplet {
 
   protected URL getURLParameter(String paramKey, String sessionId) throws MalformedURLException {
     String urlParam = getParameter(paramKey);
-    if (urlParam != null) {
+    if (urlParam != null && !"".equals(urlParam)) {
       URL codebase = getCodeBase();
       try {
         URL url;
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 79fbfd6c..06aad45f 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -42,7 +42,7 @@ public interface BKUGUIFacade {
   public static final String ERR_CONFIG = "error.config";
   
   public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
-  public static final String DEFAULT_BACKGROUND = "/images/BackgroundChipperling.png";
+  public static final String DEFAULT_BACKGROUND = "/images/ChipperlingCutoff.png";
   public static final String DEFAULT_ICON = "/images/ChipperlingLogo.png";
   public static final String HELP_IMG = "/images/help.png";
   public static final String HASHDATA_FONT = "Monospaced";
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 4cab29e0..16297218 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -28,25 +28,15 @@ import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionAdapter;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.text.MessageFormat;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
-import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import javax.swing.GroupLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
-import javax.swing.JFileChooser;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.JScrollPane;
@@ -153,10 +143,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                     initIconPanel(background);
                     initContentPanel(null);
                   } else {
-                    initContentPanel((background == null) ?
-                      getClass().getResource(DEFAULT_BACKGROUND) :
-                      background
-                    );
+                    initContentPanel(background);
                   }
                   
                   GroupLayout layout = new GroupLayout(contentPane);
@@ -220,20 +207,16 @@ public class BKUGUIImpl implements BKUGUIFacade {
 
     protected void initContentPanel(URL background) { 
 
-//      if (background == null) {
-//        background = getClass().getResource(DEFAULT_BACKGROUND);
-//      }
       if (background == null) {
         log.debug("no background image set");
+//        contentPanel = new ImagePanel(getClass().getResource(DEFAULT_BACKGROUND));
+        contentPanel = new JPanel();
+      } else if ("file".equals(background.getProtocol())) {
+          log.warn("file:// background images not permitted: " + background);
           contentPanel = new JPanel();
       } else {
-          if ("file".equals(background.getProtocol())) {
-            log.warn("file:// background images not permitted: " + background +
-                    ", loading default background");
-            background = getClass().getResource(DEFAULT_BACKGROUND);
-          }
-          log.debug("loading background " + background);
-          contentPanel = new ImagePanel(background);
+        log.debug("loading background " + background);
+        contentPanel = new ImagePanel(background);
       }
       mainPanel = new JPanel();
       mainPanel.setOpaque(false);
diff --git a/BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png b/BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png
deleted file mode 100644
index 5097aa6b..00000000
Binary files a/BKUCommonGUI/src/main/resources/images/BackgroundChipperling.png and /dev/null differ
diff --git a/BKUCommonGUI/src/main/resources/images/BackgroundMocca.png b/BKUCommonGUI/src/main/resources/images/BackgroundMocca.png
deleted file mode 100644
index 349d9ff0..00000000
Binary files a/BKUCommonGUI/src/main/resources/images/BackgroundMocca.png and /dev/null differ
diff --git a/BKUCommonGUI/src/main/resources/images/ChipperlingCutoff.png b/BKUCommonGUI/src/main/resources/images/ChipperlingCutoff.png
new file mode 100644
index 00000000..337b144b
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/images/ChipperlingCutoff.png differ
diff --git a/BKUCommonGUI/src/main/resources/images/help_orig.png b/BKUCommonGUI/src/main/resources/images/help_orig.png
deleted file mode 100644
index 5d6da3bf..00000000
Binary files a/BKUCommonGUI/src/main/resources/images/help_orig.png and /dev/null differ
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
index 0d8dc8b8..5564df2e 100644
--- a/BKUOnline/src/main/webapp/applet.jsp
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -36,7 +36,9 @@
                 : (Integer) session.getAttribute("appletWidth"); 
         int height = session.getAttribute("appletHeight") == null ? 130
                 : (Integer) session.getAttribute("appletHeight");
-        String backgroundImg = (String) session.getAttribute("appletBackground");
+        String backgroundImg = session.getAttribute("appletBackground") == null
+                ? "../img/ChipperlingCutoff.png"
+                : (String) session.getAttribute("appletBackground");
         String guiStyle = (String) session.getAttribute("appletGuiStyle");
         String locale = (String) session.getAttribute("locale");
         String extension = (String) session.getAttribute("extension");
diff --git a/BKUOnline/src/main/webapp/img/ChipperlingCutoff.png b/BKUOnline/src/main/webapp/img/ChipperlingCutoff.png
new file mode 100644
index 00000000..337b144b
Binary files /dev/null and b/BKUOnline/src/main/webapp/img/ChipperlingCutoff.png differ
-- 
cgit v1.2.3


From 2429c7e98cb9e47e36dc5ff07fd10bd18cc999bc Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 13 Aug 2009 09:11:09 +0000
Subject: [#436] resolve "#PIN digits" message via message resource bundle

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@419 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../java/at/gv/egiz/bku/gui/PINManagementGUI.java     | 15 +++------------
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java  | 19 +++----------------
 .../java/at/gv/egiz/bku/gui/DefaultHelpListener.java  |  7 +++----
 3 files changed, 9 insertions(+), 32 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
index d1ca6c00..9057b45b 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
@@ -259,11 +259,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
       } else {
         params[0] = pinSpec.getLocalizedName();
       }
-      String pinSize = String.valueOf(pinSpec.getMinLength());
-      if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-          pinSize += "-" + pinSpec.getMaxLength();
-      }
-      params[1] = pinSize;
+      params[1] = pinSpec.getLocalizedLength();
       if (type == DIALOG.CHANGE) {
         log.debug("show change pin dialog");
         title = TITLE_CHANGE_PIN;
@@ -361,11 +357,6 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                   mgmtLabel.setText(getMessage(TITLE));
                 }
 
-                String pinSize = String.valueOf(pinSpec.getMinLength());
-                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-                    pinSize += "-" + pinSpec.getMaxLength();
-                }
-
                 ////////////////////////////////////////////////////////////////
                 // COMMON LAYOUT SECTION
                 ////////////////////////////////////////////////////////////////
@@ -394,7 +385,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                   pinpadLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~Font.BOLD));
                   String pinpadPattern = getMessage(MESSAGE_VERIFYPIN_PINPAD);
                   pinpadLabel.setText(MessageFormat.format(pinpadPattern,
-                          new Object[] { pinSpec.getLocalizedName(), pinSize }));
+                          new Object[] { pinSpec.getLocalizedName(), pinSpec.getLocalizedLength() }));
                   
                   pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                           .addComponent(pinpadLabel);
@@ -489,7 +480,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                 JLabel pinsizeLabel = new JLabel();
                 pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~Font.BOLD, pinsizeLabel.getFont().getSize()-2));
                 String pinsizePattern = getMessage(LABEL_PINSIZE);
-                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSpec.getLocalizedLength()}));
 
                 ////////////////////////////////////////////////////////////////
                 // NON-PINPAD SPECIFIC LAYOUT SECTION
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 16297218..4f3a8f1e 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -581,11 +581,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 JLabel pinsizeLabel = new JLabel();
                 pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
                 String pinsizePattern = getMessage(LABEL_PINSIZE);
-                String pinSize = String.valueOf(pinSpec.getMinLength());
-                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-                    pinSize += "-" + pinSpec.getMaxLength();
-                }
-                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSpec.getLocalizedLength()}));
                 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
@@ -750,14 +746,9 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   helpListener.setHelpTopic(HELP_RETRY);
                 }
 
-                String pinSize = String.valueOf(pinSpec.getMinLength());
-                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-                    pinSize += "-" + pinSpec.getMaxLength();
-                }
-
                 String msgPattern = getMessage(MESSAGE_ENTERPIN_PINPAD);
                 String msg = MessageFormat.format(msgPattern, new Object[] {
-                  pinSpec.getLocalizedName(), pinSize });
+                  pinSpec.getLocalizedName(), pinSpec.getLocalizedLength() });
 
                 JLabel msgLabel = new JLabel();
                 msgLabel.setFont(msgLabel.getFont().deriveFont(msgLabel.getFont().getStyle() & ~Font.BOLD));
@@ -906,11 +897,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 JLabel pinsizeLabel = new JLabel();
                 pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
                 String pinsizePattern = getMessage(LABEL_PINSIZE);
-                String pinSize = String.valueOf(pinSpec.getMinLength());
-                if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-                    pinSize += "-" + pinSpec.getMaxLength();
-                }
-                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSpec.getLocalizedLength()}));
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
index c8594fe1..032c8fe5 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DefaultHelpListener.java
@@ -60,8 +60,7 @@ public class DefaultHelpListener extends AbstractHelpListener {
    * @param helpTopic ignored
    */
   @Override
-  public void showDocument(final URL helpURL, final String helpTopic)  {
-//    try {
+  public void showDocument(final URL helpURL, final String helpTopic) {
       log.debug("schedule help dialog");
 
       SwingUtilities.invokeLater(new Runnable() {
@@ -72,9 +71,9 @@ public class DefaultHelpListener extends AbstractHelpListener {
           log.debug("show help dialog");
 
           if (ctx == null) {
-            HelpViewer.showHelpDialog(helpURL, messages); // helpTopic, messages);
+            HelpViewer.showHelpDialog(helpURL, messages);
           } else {
-            HelpViewer.showHelpDialog(ctx, helpURL, messages); //helpTopic, messages);
+            HelpViewer.showHelpDialog(ctx, helpURL, messages);
           }
         }
       });
-- 
cgit v1.2.3


From d791931ac69b0a2a1201ef7cd2f7ca247e92ba8c Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 14 Aug 2009 10:46:26 +0000
Subject: [#436] resolve "#PIN digits" message via message resource bundle only
 for activation

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@431 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/java/at/gv/egiz/bku/gui/PINManagementGUI.java    | 11 ++++++++---
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java      | 15 ++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
index 9057b45b..3b77daa5 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
@@ -300,9 +300,13 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
             @Override
             public void run() {
 
-              String HELP_TOPIC, TITLE, MESSAGE_MGMT, MESSAGE_MGMT_PARAM;
+              String HELP_TOPIC, TITLE, MESSAGE_MGMT, MESSAGE_MGMT_PARAM, PINSIZE;
               HELP_TOPIC = HELP_PINMGMT;
 
+              PINSIZE = (pinSpec.getMaxLength() > pinSpec.getMinLength()) ?
+                pinSpec.getMinLength() + "-" + pinSpec.getMaxLength() :
+                String.valueOf(pinSpec.getMinLength());
+
               if (retries < 0) {
                 if (type == DIALOG.CHANGE) {
                   log.debug("show change pin dialog");
@@ -313,6 +317,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                   TITLE = TITLE_ACTIVATE_PIN;
                   MESSAGE_MGMT = MESSAGE_ACTIVATE_PIN;
                   oldPinField = null;
+                  PINSIZE = pinSpec.getLocalizedLength();
                 } else if (type == DIALOG.VERIFY) {
                   log.debug("show verify pin dialog");
                   TITLE = TITLE_VERIFY_PIN;
@@ -385,7 +390,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                   pinpadLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~Font.BOLD));
                   String pinpadPattern = getMessage(MESSAGE_VERIFYPIN_PINPAD);
                   pinpadLabel.setText(MessageFormat.format(pinpadPattern,
-                          new Object[] { pinSpec.getLocalizedName(), pinSpec.getLocalizedLength() }));
+                          new Object[] { pinSpec.getLocalizedName(), PINSIZE }));
                   
                   pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                           .addComponent(pinpadLabel);
@@ -480,7 +485,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                 JLabel pinsizeLabel = new JLabel();
                 pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~Font.BOLD, pinsizeLabel.getFont().getSize()-2));
                 String pinsizePattern = getMessage(LABEL_PINSIZE);
-                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSpec.getLocalizedLength()}));
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{PINSIZE}));
 
                 ////////////////////////////////////////////////////////////////
                 // NON-PINPAD SPECIFIC LAYOUT SECTION
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 4f3a8f1e..de9a91b9 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -581,7 +581,10 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 JLabel pinsizeLabel = new JLabel();
                 pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
                 String pinsizePattern = getMessage(LABEL_PINSIZE);
-                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSpec.getLocalizedLength()}));
+                String pinSize = (pinSpec.getMaxLength() > pinSpec.getMinLength()) ?
+                  pinSpec.getMinLength() + "-" + pinSpec.getMaxLength() :
+                  String.valueOf(pinSpec.getMinLength());
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
                 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
@@ -747,8 +750,11 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 }
 
                 String msgPattern = getMessage(MESSAGE_ENTERPIN_PINPAD);
+                String pinSize = (pinSpec.getMaxLength() > pinSpec.getMinLength()) ?
+                  pinSpec.getMinLength() + "-" + pinSpec.getMaxLength() :
+                  String.valueOf(pinSpec.getMinLength());
                 String msg = MessageFormat.format(msgPattern, new Object[] {
-                  pinSpec.getLocalizedName(), pinSpec.getLocalizedLength() });
+                  pinSpec.getLocalizedName(), pinSize });
 
                 JLabel msgLabel = new JLabel();
                 msgLabel.setFont(msgLabel.getFont().deriveFont(msgLabel.getFont().getStyle() & ~Font.BOLD));
@@ -897,7 +903,10 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 JLabel pinsizeLabel = new JLabel();
                 pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
                 String pinsizePattern = getMessage(LABEL_PINSIZE);
-                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSpec.getLocalizedLength()}));
+                String pinSize = (pinSpec.getMaxLength() > pinSpec.getMinLength()) ?
+                  pinSpec.getMinLength() + "-" + pinSpec.getMaxLength() :
+                  String.valueOf(pinSpec.getMinLength());
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
-- 
cgit v1.2.3


From fa928f387d17cb9658dd6f488c619cfcceab9801 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 14 Aug 2009 13:05:44 +0000
Subject: [maven-release-plugin] prepare release mocca-1.2.1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@440 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 16 ++++++++--------
 BKUAppletExt/pom.xml    | 15 +++++++--------
 BKUCertificates/pom.xml | 10 ++++------
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUHelp/pom.xml         | 10 ++++------
 BKULocal/pom.xml        | 24 ++++++++++++------------
 BKUOnline/pom.xml       | 28 ++++++++++++++--------------
 BKUViewer/pom.xml       |  6 +++---
 BKUWebStart/pom.xml     | 15 +++++++--------
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  8 ++++----
 pom.xml                 |  8 ++++----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 utils/pom.xml           |  4 ++--
 18 files changed, 92 insertions(+), 98 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index a12ffdbc..571b06de 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.1</version>
   <build>
     <plugins>
       <plugin>
@@ -87,7 +87,7 @@
               <type>PKCS11</type>
               <providerClass>iaik.pkcs.pkcs11.provider.IAIKPkcs11</providerClass>
               <alias>a-sit</alias>
-              <storepass></storepass>
+              <storepass />
             </configuration>
           </plugin>
         </plugins>
@@ -98,27 +98,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 105dfae7..a62f7034 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -1,36 +1,35 @@
-
 <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>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.1</version>
         </dependency>
     </dependencies>
     <build>
@@ -109,7 +108,7 @@
                 <type>PKCS11</type>
                 <providerClass>iaik.pkcs.pkcs11.provider.IAIKPkcs11</providerClass>
                 <alias>a-sit</alias>
-                <storepass></storepass>
+                <storepass />
               </configuration>
             </plugin>
           </plugins>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 0b39ca31..8148d594 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
   <name>BKU Certificates</name>
 
   <build>
@@ -32,4 +30,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 065b1161..95076bf8 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index d76719c2..46ce473e 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -1,14 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
   <name>BKU Help</name>
-</project>
+</project>
\ No newline at end of file
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index c70cec3d..bc1dbd5c 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.2.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.10-SNAPSHOT</version>
+	<version>1.0.10</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -76,27 +76,27 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1</version>
 		</dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -120,12 +120,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index a975bc35..a8895343 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.1</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -24,22 +24,22 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -63,13 +63,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -115,13 +115,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -132,9 +132,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index a11796f9..594d0604 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.2.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.1</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 67d0bc8e..368b6f92 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -1,9 +1,8 @@
-<?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">
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
@@ -14,7 +13,7 @@
    | IMPORTANT: update jnlp/resources/version.xml (BKUWebStart and utils) and
    | include-webstart profile in BKUOnline if version changes
    |-->
-  <version>1.0.10-SNAPSHOT</version>
+  <version>1.0.10</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -195,7 +194,7 @@
                 <storetype>PKCS11</storetype>
                 <providerClass>iaik.pkcs.pkcs11.provider.IAIKPkcs11</providerClass>
                 <alias>a-sit</alias>
-                <storepass></storepass>
+                <storepass />
                 <verify>true</verify>
                 <keystoreConfig>
                   <delete>false</delete>
@@ -237,18 +236,18 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKULocal</artifactId>
-      <version>1.0.10-SNAPSHOT</version>
+      <version>1.0.10</version>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCertificates</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <artifactId>utils</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
       <exclusions>
         <exclusion>
           <artifactId>iaik_ecc_signed</artifactId>
@@ -299,4 +298,4 @@
       <systemPath>${java.home}/lib/javaws.jar</systemPath>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 622f0af4..42b105bf 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 19566f9d..b4209e9b 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.1</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index dd60866d..49695b00 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.1</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 31c56902..6e6f883e 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.1</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index e31b7b0d..e69434cd 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.2.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.1</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index c67f64ea..ac3d1506 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.1</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -44,9 +44,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index fdac2ac5..cb8f3f79 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.1</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 61f6b22d..ce3aae70 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.1</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.1</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 323ce538..4545d913 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.2.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.1</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From a4e2fb04ca7e5e2bf2352c0881bb686cb83aaf74 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 14 Aug 2009 13:06:05 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@442 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 14 +++++++-------
 BKUAppletExt/pom.xml    | 12 ++++++------
 BKUCertificates/pom.xml |  2 +-
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUHelp/pom.xml         |  2 +-
 BKULocal/pom.xml        | 22 +++++++++++-----------
 BKUOnline/pom.xml       | 24 ++++++++++++------------
 BKUViewer/pom.xml       |  6 +++---
 BKUWebStart/pom.xml     |  8 ++++----
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  8 ++++----
 pom.xml                 |  8 ++++----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 utils/pom.xml           |  4 ++--
 18 files changed, 78 insertions(+), 78 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 571b06de..42416322 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.1</version>
+  <version>1.2.2-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -98,27 +98,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index a62f7034..79fc5600 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,34 +2,34 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 8148d594..f651a8fa 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 95076bf8..393a5756 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 46ce473e..a28285e7 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index bc1dbd5c..9704b7db 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.1</version>
+		<version>1.2.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.10</version>
+	<version>1.0.11-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -76,22 +76,22 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
@@ -120,12 +120,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUApplet</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>BKUViewer</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index a8895343..ea5f3854 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.1</version>
+  <version>1.2.2-SNAPSHOT</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -24,12 +24,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -63,13 +63,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -115,13 +115,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -132,9 +132,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 594d0604..0306d4a6 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.1</version>
+		<version>1.2.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU viewer components</name>
-	<version>1.2.1</version>
+	<version>1.2.2-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 368b6f92..2de61fdc 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
@@ -13,7 +13,7 @@
    | IMPORTANT: update jnlp/resources/version.xml (BKUWebStart and utils) and
    | include-webstart profile in BKUOnline if version changes
    |-->
-  <version>1.0.10</version>
+  <version>1.0.11-SNAPSHOT</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -236,7 +236,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKULocal</artifactId>
-      <version>1.0.10</version>
+      <version>1.0.11-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
@@ -247,7 +247,7 @@
     <dependency>
       <artifactId>utils</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>iaik_ecc_signed</artifactId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 42b105bf..5b56a464 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index b4209e9b..483f0f8c 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.1</version>
+  <version>1.2.2-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 49695b00..b6b2b8ce 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 6e6f883e..c466d3b8 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.1</version>
+  <version>1.2.2-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index e69434cd..21e47b4f 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.1</version>
+		<version>1.2.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.1</version>
+	<version>1.2.2-SNAPSHOT</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index ac3d1506..d2ae4af4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.1</version>
+  <version>1.2.2-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -44,9 +44,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.1</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index cb8f3f79..d4526a1f 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.1</version>
+  <version>1.2.2-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index ce3aae70..b816025b 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 4545d913..6f4ff172 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.1</version>
+		<version>1.2.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.1</version>
+	<version>1.2.2-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 22001c93bca360d1b15c252cb22d2a4147ff350d Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 20 Aug 2009 16:24:55 +0000
Subject:  [#430] Activation/PIN-management in MOCCA Web Start - new Modules:
 smccSTALExt, BKUGuiExt in order not to depend on BKUAppletExt in BKULocal -
 provide stal-request handler de-registration in abstractSMCCSTAL

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@448 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/src/main/java/META-INF/MANIFEST.MF       |   3 -
 BKUAppletExt/pom.xml                               |  10 +
 .../java/at/gv/egiz/bku/gui/ActivationGUI.java     | 249 --------
 .../at/gv/egiz/bku/gui/ActivationGUIFacade.java    |  33 -
 .../main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java  |  70 ---
 .../java/at/gv/egiz/bku/gui/PINManagementGUI.java  | 669 --------------------
 .../at/gv/egiz/bku/gui/PINManagementGUIFacade.java | 117 ----
 .../java/at/gv/egiz/bku/gui/PINSpecRenderer.java   |  39 --
 .../java/at/gv/egiz/bku/gui/PINStatusRenderer.java |  61 --
 .../at/gv/egiz/bku/gui/PINStatusTableModel.java    |  58 --
 .../egiz/bku/online/applet/ActivationApplet.java   |   2 +-
 .../bku/online/applet/PINManagementBKUWorker.java  |  16 +-
 .../bku/smccstal/ext/CardMgmtRequestHandler.java   | 177 ------
 .../bku/smccstal/ext/GetPINStatusException.java    |  41 --
 .../smccstal/ext/ManagementPINProviderFactory.java | 262 --------
 .../smccstal/ext/PINManagementRequestHandler.java  | 244 --------
 .../gv/egiz/bku/gui/ActivationMessages.properties  |  69 ---
 .../egiz/bku/gui/ActivationMessages_en.properties  |  68 ---
 .../java/at/gv/egiz/bku/gui/ActivationGuiTest.java |  62 --
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java | 202 -------
 BKUCommonGUI/pom.xml                               |   2 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   |   2 +-
 BKUGuiExt/pom.xml                                  |  27 +
 .../java/at/gv/egiz/bku/gui/ActivationGUI.java     | 250 ++++++++
 .../at/gv/egiz/bku/gui/ActivationGUIFacade.java    |  34 ++
 .../main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java  |  71 +++
 .../java/at/gv/egiz/bku/gui/PINManagementGUI.java  | 670 +++++++++++++++++++++
 .../at/gv/egiz/bku/gui/PINManagementGUIFacade.java | 118 ++++
 .../java/at/gv/egiz/bku/gui/PINSpecRenderer.java   |  39 ++
 .../java/at/gv/egiz/bku/gui/PINStatusRenderer.java |  61 ++
 .../at/gv/egiz/bku/gui/PINStatusTableModel.java    |  58 ++
 .../gv/egiz/bku/gui/ActivationMessages.properties  |  69 +++
 .../egiz/bku/gui/ActivationMessages_en.properties  |  68 +++
 .../java/at/gv/egiz/bku/gui/ActivationGuiTest.java |  63 ++
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java | 203 +++++++
 BKULocal/pom.xml                                   |  25 +-
 .../java/at/gv/egiz/bku/local/gui/GUIProxy.java    |  55 ++
 .../at/gv/egiz/bku/local/stal/BKUGuiProxy.java     | 156 -----
 .../at/gv/egiz/bku/local/stal/LocalBKUWorker.java  |   6 +-
 .../gv/egiz/bku/local/stal/LocalSTALFactory.java   |  18 +-
 .../bku/local/webapp/PINManagementServlet.java     | 167 +++++
 BKULocal/src/main/webapp/WEB-INF/web.xml           |  10 +-
 BKULocal/src/main/webapp/index.html                |   7 +-
 .../java/at/gv/egiz/bku/webstart/Launcher.java     | 104 +++-
 .../bku/webstart/gui/PINManagementInvoker.java     |  71 +++
 .../gv/egiz/bku/webstart/gui/TrayMenuListener.java |  75 ---
 BKUWebStart/src/main/jnlp/resources/version.xml    |  12 +-
 .../at/gv/egiz/bku/webstart/messages.properties    |   1 +
 pom.xml                                            |   2 +
 .../at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java  |   5 +
 smccSTALExt/pom.xml                                |  27 +
 .../egiz/bku/smccstal/CardMgmtRequestHandler.java  | 177 ++++++
 .../egiz/bku/smccstal/GetPINStatusException.java   |  41 ++
 .../bku/smccstal/ManagementPINProviderFactory.java | 262 ++++++++
 .../bku/smccstal/PINManagementRequestHandler.java  | 245 ++++++++
 55 files changed, 2947 insertions(+), 2706 deletions(-)
 delete mode 100644 BKUApplet/src/main/java/META-INF/MANIFEST.MF
 delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java
 delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUIFacade.java
 delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java
 delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
 delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
 delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINSpecRenderer.java
 delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
 delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java
 delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/CardMgmtRequestHandler.java
 delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/GetPINStatusException.java
 delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java
 delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
 delete mode 100644 BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
 delete mode 100644 BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
 delete mode 100644 BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java
 delete mode 100644 BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
 create mode 100644 BKUGuiExt/pom.xml
 create mode 100644 BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java
 create mode 100644 BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUIFacade.java
 create mode 100644 BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java
 create mode 100644 BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
 create mode 100644 BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
 create mode 100644 BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINSpecRenderer.java
 create mode 100644 BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
 create mode 100644 BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java
 create mode 100644 BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
 create mode 100644 BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
 create mode 100644 BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java
 create mode 100644 BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
 create mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/gui/GUIProxy.java
 delete mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
 create mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/PINManagementServlet.java
 create mode 100644 BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/PINManagementInvoker.java
 delete mode 100644 BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/TrayMenuListener.java
 create mode 100644 smccSTALExt/pom.xml
 create mode 100644 smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/CardMgmtRequestHandler.java
 create mode 100644 smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetPINStatusException.java
 create mode 100644 smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/ManagementPINProviderFactory.java
 create mode 100644 smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PINManagementRequestHandler.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/META-INF/MANIFEST.MF b/BKUApplet/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e949512..00000000
--- a/BKUApplet/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 79fc5600..98502ab2 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -31,6 +31,16 @@
             <artifactId>BKUApplet</artifactId>
             <version>1.2.2-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>at.gv.egiz</groupId>
+            <artifactId>BKUGuiExt</artifactId>
+            <version>1.2.2-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>at.gv.egiz</groupId>
+            <artifactId>smccSTALExt</artifactId>
+            <version>1.2.2-SNAPSHOT</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java
deleted file mode 100644
index 8134ac5f..00000000
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.gui;
-
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.event.ActionListener;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Locale;
-import java.util.ResourceBundle;
-import javax.swing.GroupLayout;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JProgressBar;
-import javax.swing.LayoutStyle;
-import javax.swing.SwingUtilities;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class ActivationGUI extends CardMgmtGUI implements ActivationGUIFacade {
-
-  public static final String TITLE_ACTIVATION = "title.activation";
-  public static final String LABEL_ACTIVATION = "label.activation";
-  public static final String LABEL_ACTIVATION_STEP = "label.activation.step";
-  public static final String LABEL_ACTIVATION_IDLE = "label.activation.idle";
-
-  public static final String HELP_ACTIVATION = "help.activation";
-  
-  protected JProgressBar progressBar;
-  
-  public ActivationGUI(Container contentPane,
-          Locale locale,
-          Style guiStyle,
-          URL backgroundImgURL,
-          AbstractHelpListener helpListener) {
-    super(contentPane, locale, guiStyle, backgroundImgURL, helpListener);
-
-    progressBar = new JProgressBar();
-  }
-
-  @Override
-  public void showActivationProgressDialog(final int currentStep, final int maxProgress, final ActionListener cancelListener, final String cancelCommand) {
-
-    log.debug("scheduling activation progress dialog (step " + currentStep + ")");
-
-    SwingUtilities.invokeLater(new Runnable() {
-      
-      @Override
-      public void run() {
-
-        log.debug("show activation progress dialog (step " + currentStep + ")");
-
-        mainPanel.removeAll();
-        buttonPanel.removeAll();
-
-        mainPanel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-
-
-        JLabel infoLabel = new JLabel();
-        infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-
-        if (renderHeaderPanel) {
-          titleLabel.setText(cardmgmtMessages.getString(TITLE_ACTIVATION));
-          infoLabel.setText(cardmgmtMessages.getString(LABEL_ACTIVATION));
-        } else {
-          infoLabel.setText(cardmgmtMessages.getString(TITLE_ACTIVATION));
-        }
-
-        helpListener.setHelpTopic(HELP_ACTIVATION);
-
-        progressBar.setIndeterminate(false);
-        progressBar.setStringPainted(true);
-        progressBar.setString(null); //reset to percentage
-        progressBar.setMinimum(0);
-        progressBar.setMaximum(maxProgress);
-
-        JLabel stepLabel = new JLabel();
-        stepLabel.setFont(stepLabel.getFont().deriveFont(stepLabel.getFont().getStyle() & ~java.awt.Font.BOLD, stepLabel.getFont().getSize()-2));
-        String stepPattern = cardmgmtMessages.getString(LABEL_ACTIVATION_STEP);
-        stepLabel.setText(MessageFormat.format(stepPattern, new Object[]{ currentStep }));
-
-        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-        mainPanel.setLayout(mainPanelLayout);
-
-        GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup().addComponent(infoLabel);
-        GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(infoLabel);
-
-        if (!renderHeaderPanel) {
-          infoHorizontal.addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE).addComponent(helpLabel);
-          infoVertical.addComponent(helpLabel);
-        }
-
-        mainPanelLayout.setHorizontalGroup(
-                mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addGroup(infoHorizontal)
-                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addComponent(stepLabel)
-                    .addComponent(progressBar)));
-
-        mainPanelLayout.setVerticalGroup(
-                mainPanelLayout.createSequentialGroup()
-                  .addGroup(infoVertical)
-                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                  .addGroup(mainPanelLayout.createSequentialGroup()
-                    .addComponent(stepLabel)
-                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addComponent(progressBar)));
-
-          JButton cancelButton = new JButton();
-          cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-          cancelButton.setText(messages.getString(BUTTON_CANCEL));
-          cancelButton.addActionListener(cancelListener);
-          cancelButton.setActionCommand(cancelCommand);
-
-          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-          buttonPanel.setLayout(buttonPanelLayout);
-
-          buttonPanelLayout.setHorizontalGroup(
-            buttonPanelLayout.createSequentialGroup()
-                  .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                  .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-          buttonPanelLayout.setVerticalGroup(
-            buttonPanelLayout.createSequentialGroup()
-              .addComponent(cancelButton));
-
-        contentPanel.validate();
-
-      }
-    });
-
-  }
-
-  @Override
-  public void incrementProgress() {
-    SwingUtilities.invokeLater(new Runnable() {
-
-      @Override
-      public void run() {
-        progressBar.setValue(progressBar.getValue() + 1);
-      }
-    });
-    
-  }
-
-  @Override
-  public void showIdleDialog(final ActionListener cancelListener, final String cancelCommand) {
-    log.debug("scheduling idle dialog");
-
-    SwingUtilities.invokeLater(new Runnable() {
-
-      @Override
-      public void run() {
-
-        log.debug("show idle dialog");
-
-        mainPanel.removeAll();
-        buttonPanel.removeAll();
-
-        mainPanel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-
-
-        JLabel infoLabel = new JLabel();
-        infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-
-        if (renderHeaderPanel) {
-          titleLabel.setText(cardmgmtMessages.getString(TITLE_ACTIVATION));
-          infoLabel.setText(cardmgmtMessages.getString(LABEL_ACTIVATION));
-        } else {
-          infoLabel.setText(cardmgmtMessages.getString(TITLE_ACTIVATION));
-        }
-
-        helpListener.setHelpTopic(HELP_ACTIVATION);
-
-        progressBar.setIndeterminate(true);
-        progressBar.setStringPainted(true);
-        progressBar.setString(""); //not string painted progressbar is smaller
-
-        JLabel stepLabel = new JLabel();
-        stepLabel.setFont(stepLabel.getFont().deriveFont(stepLabel.getFont().getStyle() & ~java.awt.Font.BOLD, stepLabel.getFont().getSize()-2));
-        stepLabel.setText(cardmgmtMessages.getString(LABEL_ACTIVATION_IDLE));
-
-        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-        mainPanel.setLayout(mainPanelLayout);
-
-        GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup().addComponent(infoLabel);
-        GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(infoLabel);
-
-        if (!renderHeaderPanel) {
-          infoHorizontal.addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE).addComponent(helpLabel);
-          infoVertical.addComponent(helpLabel);
-        }
-
-        mainPanelLayout.setHorizontalGroup(
-                mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addGroup(infoHorizontal)
-                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addComponent(stepLabel)
-                    .addComponent(progressBar)));
-
-        mainPanelLayout.setVerticalGroup(
-                mainPanelLayout.createSequentialGroup()
-                  .addGroup(infoVertical)
-                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                  .addGroup(mainPanelLayout.createSequentialGroup()
-                    .addComponent(stepLabel)
-                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addComponent(progressBar)));
-
-          JButton cancelButton = new JButton();
-          cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-          cancelButton.setText(messages.getString(BUTTON_CANCEL));
-          cancelButton.addActionListener(cancelListener);
-          cancelButton.setActionCommand(cancelCommand);
-
-          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-          buttonPanel.setLayout(buttonPanelLayout);
-
-          buttonPanelLayout.setHorizontalGroup(
-            buttonPanelLayout.createSequentialGroup()
-                  .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                  .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-          buttonPanelLayout.setVerticalGroup(
-            buttonPanelLayout.createSequentialGroup()
-              .addComponent(cancelButton));
-
-        contentPanel.validate();
-
-      }
-    });
-
-  }
-}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUIFacade.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUIFacade.java
deleted file mode 100644
index 860a1097..00000000
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUIFacade.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.gui;
-
-import java.awt.event.ActionListener;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public interface ActivationGUIFacade extends BKUGUIFacade {
-
-  public void showActivationProgressDialog(int currentStep, int maxProgress, ActionListener cancelListener, String cancelCommand);
-
-  public void incrementProgress();
-
-  public void showIdleDialog(ActionListener cancelListener, String cancelCommand);
-
-}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java
deleted file mode 100644
index ac9ab78b..00000000
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.gui;
-
-import java.awt.Container;
-import java.net.URL;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-/**
- * Common superclass for Activation and PinManagement GUIs
- * 
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class CardMgmtGUI extends BKUGUIImpl {
-
-  public static final String CARDMGMT_MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/ActivationMessages";
-
-  protected ResourceBundle cardmgmtMessages;
-
-  public CardMgmtGUI(Container contentPane,
-          Locale locale,
-          Style guiStyle,
-          URL backgroundImgURL,
-          AbstractHelpListener helpListener) {
-    super(contentPane, locale, guiStyle, backgroundImgURL, helpListener);
-
-  }
-
-  @Override
-  protected void loadMessageBundle(Locale locale) {
-    super.loadMessageBundle(locale);
-
-    if (locale != null) {
-        Locale lang = new Locale(locale.getLanguage().substring(0,2));
-        log.debug("loading applet resources for language: " + lang.toString());
-        cardmgmtMessages = ResourceBundle.getBundle(CARDMGMT_MESSAGES_BUNDLE, lang);
-    } else {
-        cardmgmtMessages = ResourceBundle.getBundle(CARDMGMT_MESSAGES_BUNDLE);
-    }
-  }
-
-  @Override
-  protected String getMessage(String key) {
-    if (super.hasMessage(key)) {
-      return super.getMessage(key);
-    }
-    return cardmgmtMessages.getString(key);
-  }
-
-  @Override
-  protected boolean hasMessage(String key) {
-    return (cardmgmtMessages.containsKey(key) || super.hasMessage(key));
-  }
-}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
deleted file mode 100644
index 3b77daa5..00000000
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
+++ /dev/null
@@ -1,669 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.gui;
-
-import at.gv.egiz.smcc.PINSpec;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Font;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionAdapter;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Locale;
-import java.util.Map;
-import javax.swing.GroupLayout;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPasswordField;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.LayoutStyle;
-import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * TODO pull out ResourceBundle to common superclass for activationGUI and pinMgmtGUI
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFacade {
-
-  protected static final Log log = LogFactory.getLog(PINManagementGUI.class);
-  
-  /** remember the pinfield to return to worker */
-  protected JPasswordField oldPinField;
-  /** remember the pinSpec to return to worker */
-  protected PINSpec pinSpec;
-
-  public PINManagementGUI(Container contentPane,
-          Locale locale,
-          Style guiStyle,
-          URL backgroundImgURL,
-          AbstractHelpListener helpListener) {
-    super(contentPane, locale, guiStyle, backgroundImgURL, helpListener);
-  }
-
-  @Override
-  public char[] getOldPin() {
-    if (oldPinField != null) {
-      char[] pin = oldPinField.getPassword();
-      oldPinField = null;
-      return pin;
-    }
-    return null;
-  }
-
-  @Override
-  public PINSpec getSelectedPINSpec() {
-    return pinSpec;
-  }
-
-  @Override
-  public void showPINManagementDialog(final Map<PINSpec, STATUS> pins, 
-          final ActionListener activateListener,
-          final String activateCmd,
-          final String changeCmd,
-          final String unblockCmd,
-          final String verifyCmd,
-          final ActionListener cancelListener,
-          final String cancelCmd) {
-
-      log.debug("scheduling PIN managment dialog");
-    
-      SwingUtilities.invokeLater(new Runnable() {
-
-        @Override
-        public void run() {
-          log.debug("show PIN management dialog");
-
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                helpListener.setHelpTopic(HELP_PINMGMT);
-
-                JLabel mgmtLabel = new JLabel();
-                mgmtLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-
-                if (renderHeaderPanel) {
-                  titleLabel.setText(getMessage(TITLE_PINMGMT));
-                  String infoPattern = getMessage(MESSAGE_PINMGMT);
-                  mgmtLabel.setText(MessageFormat.format(infoPattern, pins.size()));
-                } else {
-                  mgmtLabel.setText(getMessage(TITLE_PINMGMT));
-                }
-
-                final PINStatusTableModel tableModel = new PINStatusTableModel(pins);
-                final JTable pinStatusTable = new JTable(tableModel);
-                pinStatusTable.setDefaultRenderer(PINSpec.class, new PINSpecRenderer());
-                pinStatusTable.setDefaultRenderer(STATUS.class, new PINStatusRenderer(cardmgmtMessages));
-                pinStatusTable.setTableHeader(null);
-                pinStatusTable.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-//                pinStatusTable.addMouseMotionListener(new MouseMotionAdapter() {
-//
-//                  @Override
-//                  public void mouseMoved(MouseEvent e) {
-//                    if (pinStatusTable.columnAtPoint(e.getPoint()) == 0) {
-//                      pinStatusTable.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-//                    } else {
-//                      pinStatusTable.setCursor(Cursor.getDefaultCursor());
-//                    }
-//                  }
-//                });
-
-                final JButton activateButton = new JButton();
-                activateButton.setFont(activateButton.getFont().deriveFont(activateButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                activateButton.addActionListener(activateListener);
-
-                pinStatusTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-                pinStatusTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-
-                  @Override
-                  public void valueChanged(final ListSelectionEvent e) {
-                    //invoke later to allow thread to paint selection background
-                    SwingUtilities.invokeLater(new Runnable() {
-
-                      @Override
-                      public void run() {
-                        ListSelectionModel lsm = (ListSelectionModel) e.getSource();
-                        int selectionIdx = lsm.getMinSelectionIndex();
-                        if (selectionIdx >= 0) {
-                          pinSpec = (PINSpec) tableModel.getValueAt(selectionIdx, 0);
-                          STATUS status = (STATUS) tableModel.getValueAt(selectionIdx, 1);
-
-                          if (status == STATUS.NOT_ACTIV) {
-                            activateButton.setText(getMessage(BUTTON_ACTIVATE));
-                            activateButton.setEnabled(true);
-                            activateButton.setActionCommand(activateCmd);
-                          } else if (status == STATUS.BLOCKED) {
-                            activateButton.setText(getMessage(BUTTON_UNBLOCK));
-                            activateButton.setEnabled(true);
-                            activateButton.setActionCommand(unblockCmd);
-                          } else if (status == STATUS.ACTIV) {
-                            activateButton.setText(getMessage(BUTTON_CHANGE));
-                            activateButton.setEnabled(true);
-                            activateButton.setActionCommand(changeCmd);
-                          } else if (status == STATUS.UNKNOWN) {
-                            activateButton.setText(getMessage(BUTTON_VERIFY));
-                            activateButton.setEnabled(true);
-                            activateButton.setActionCommand(verifyCmd);
-                          }
-                        }
-                      }
-                    });
-                  }
-                });
-
-                //select first entry
-                pinStatusTable.getSelectionModel().setSelectionInterval(0, 0);
-
-                JScrollPane pinStatusScrollPane = new JScrollPane(pinStatusTable);
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
-                        .addComponent(mgmtLabel);
-                GroupLayout.Group messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                        .addComponent(mgmtLabel);
-                if (!renderHeaderPanel) {
-                  messageHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel);
-                  messageVertical
-                          .addComponent(helpLabel);
-                }
-
-                mainPanelLayout.setHorizontalGroup(
-                mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                  .addGroup(messageHorizontal)
-                  .addComponent(pinStatusScrollPane, 0, 0, Short.MAX_VALUE));
-
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addGroup(messageVertical)
-                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addComponent(pinStatusScrollPane, 0, 0, pinStatusTable.getPreferredSize().height+3));
-
-                JButton cancelButton = new JButton();
-                cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                cancelButton.setText(getMessage(BUTTON_CLOSE));
-                cancelButton.setActionCommand(cancelCmd);
-                cancelButton.addActionListener(cancelListener);
-
-                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                buttonPanel.setLayout(buttonPanelLayout);
-
-                GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
-                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(activateButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
-
-                GroupLayout.Group buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                          .addComponent(activateButton)
-                          .addComponent(cancelButton);
-
-                buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
-                buttonPanelLayout.setVerticalGroup(buttonVertical);
-
-                contentPanel.validate();
-        }
-      });
-  }
-
-  @Override
-  public void showPINDialog(DIALOG type, PINSpec pinSpec,
-          ActionListener okListener, String okCommand,
-          ActionListener cancelListener, String cancelCommand) {
-    showPINDialog(type, pinSpec, -1, false,
-            okListener, okCommand, cancelListener, cancelCommand);
-  }
-
-  @Override
-  public void showPINDialog(DIALOG type, PINSpec pinSpec, int retries,
-          ActionListener okListener, String okCommand,
-          ActionListener cancelListener, String cancelCommand) {
-    showPINDialog(type, pinSpec, retries, false,
-            okListener, okCommand, cancelListener, cancelCommand);
-  }
-
-  @Override
-  public void showPinpadPINDialog(DIALOG type, PINSpec pinSpec, int retries) {
-    String title, msg;
-    Object[] params;
-    if (retries < 0) {
-      params = new Object[2];
-      if (shortText) {
-        params[0] = "PIN";
-      } else {
-        params[0] = pinSpec.getLocalizedName();
-      }
-      params[1] = pinSpec.getLocalizedLength();
-      if (type == DIALOG.CHANGE) {
-        log.debug("show change pin dialog");
-        title = TITLE_CHANGE_PIN;
-        msg = MESSAGE_CHANGEPIN_PINPAD;
-      } else if (type == DIALOG.ACTIVATE) {
-        log.debug("show activate pin dialog");
-        title = TITLE_ACTIVATE_PIN;
-        msg = MESSAGE_ENTERPIN_PINPAD;
-      } else if (type == DIALOG.VERIFY) {
-        log.debug("show verify pin dialog");
-        title = TITLE_VERIFY_PIN;
-        msg = MESSAGE_ENTERPIN_PINPAD;
-      } else {
-        log.debug("show unblock pin dialog");
-        title = TITLE_UNBLOCK_PIN;
-        msg = MESSAGE_ENTERPIN_PINPAD;
-      }
-
-    } else {
-      log.debug("show retry pin dialog");
-      title = TITLE_RETRY;
-      msg = (retries < 2) ?
-        MESSAGE_LAST_RETRY : MESSAGE_RETRIES;
-      params = new Object[] {String.valueOf(retries)};
-    }
-    showMessageDialog(title, msg, params);
-  }
-
-  private void showPINDialog(final DIALOG type, final PINSpec pinSpec,
-          final int retries, final boolean pinpad,
-          final ActionListener okListener, final String okCommand,
-          final ActionListener cancelListener, final String cancelCommand) {
-
-    log.debug("scheduling pin dialog");
-
-      SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-
-              String HELP_TOPIC, TITLE, MESSAGE_MGMT, MESSAGE_MGMT_PARAM, PINSIZE;
-              HELP_TOPIC = HELP_PINMGMT;
-
-              PINSIZE = (pinSpec.getMaxLength() > pinSpec.getMinLength()) ?
-                pinSpec.getMinLength() + "-" + pinSpec.getMaxLength() :
-                String.valueOf(pinSpec.getMinLength());
-
-              if (retries < 0) {
-                if (type == DIALOG.CHANGE) {
-                  log.debug("show change pin dialog");
-                  TITLE = TITLE_CHANGE_PIN;
-                  MESSAGE_MGMT = MESSAGE_CHANGE_PIN;
-                } else if (type == DIALOG.ACTIVATE) {
-                  log.debug("show activate pin dialog");
-                  TITLE = TITLE_ACTIVATE_PIN;
-                  MESSAGE_MGMT = MESSAGE_ACTIVATE_PIN;
-                  oldPinField = null;
-                  PINSIZE = pinSpec.getLocalizedLength();
-                } else if (type == DIALOG.VERIFY) {
-                  log.debug("show verify pin dialog");
-                  TITLE = TITLE_VERIFY_PIN;
-                  MESSAGE_MGMT = MESSAGE_VERIFY_PIN;
-                } else {
-                  log.debug("show unblock pin dialog");
-                  TITLE = TITLE_UNBLOCK_PIN;
-                  MESSAGE_MGMT = MESSAGE_UNBLOCK_PIN;
-                }
-                if (shortText) {
-                  MESSAGE_MGMT_PARAM = "PIN";
-                } else {
-                  MESSAGE_MGMT_PARAM = pinSpec.getLocalizedName();
-                }
-              } else {
-                log.debug("show retry pin dialog");
-                TITLE = TITLE_RETRY;
-                MESSAGE_MGMT = (retries < 2) ?
-                  MESSAGE_LAST_RETRY : MESSAGE_RETRIES;
-                MESSAGE_MGMT_PARAM = String.valueOf(retries);
-              }
-
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
-
-                helpListener.setHelpTopic(HELP_TOPIC);
-
-                JLabel mgmtLabel = new JLabel();
-                if (retries < 0) {
-                  mgmtLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~Font.BOLD));
-                } else {
-                  mgmtLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() | Font.BOLD));
-                  mgmtLabel.setForeground(ERROR_COLOR);
-                  helpListener.setHelpTopic(HELP_RETRY);
-                }
-
-                if (renderHeaderPanel) {
-                  titleLabel.setText(getMessage(TITLE));
-                  String mgmtPattern = getMessage(MESSAGE_MGMT);
-                  mgmtLabel.setText(MessageFormat.format(mgmtPattern, MESSAGE_MGMT_PARAM));
-                } else {
-                  mgmtLabel.setText(getMessage(TITLE));
-                }
-
-                ////////////////////////////////////////////////////////////////
-                // COMMON LAYOUT SECTION
-                ////////////////////////////////////////////////////////////////
-
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
-
-                GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
-                          .addComponent(mgmtLabel);
-                GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                          .addComponent(mgmtLabel);
-
-                if (!renderHeaderPanel) {
-                  infoHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel);
-                  infoVertical
-                          .addComponent(helpLabel);
-                }
-
-                GroupLayout.ParallelGroup pinHorizontal;
-                GroupLayout.SequentialGroup pinVertical;
-
-                if (pinpad) {
-                  JLabel pinpadLabel = new JLabel();
-                  pinpadLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~Font.BOLD));
-                  String pinpadPattern = getMessage(MESSAGE_VERIFYPIN_PINPAD);
-                  pinpadLabel.setText(MessageFormat.format(pinpadPattern,
-                          new Object[] { pinSpec.getLocalizedName(), PINSIZE }));
-                  
-                  pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                          .addComponent(pinpadLabel);
-                  pinVertical = mainPanelLayout.createSequentialGroup()
-                          .addComponent(pinpadLabel);
-                } else {
-
-                JButton okButton = new JButton();
-                okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~Font.BOLD));
-                okButton.setText(getMessage(BUTTON_OK));
-                okButton.setEnabled(pinSpec.getMinLength() <= 0);
-                okButton.setActionCommand(okCommand);
-                okButton.addActionListener(okListener);
-
-                JLabel oldPinLabel = null;
-                JLabel repeatPinLabel = null;
-                JLabel pinLabel = new JLabel();
-                pinLabel.setFont(pinLabel.getFont().deriveFont(pinLabel.getFont().getStyle() & ~Font.BOLD));
-                String pinLabelPattern = (type == DIALOG.CHANGE) ? getMessage(LABEL_NEW_PIN) : getMessage(LABEL_PIN);
-                pinLabel.setText(MessageFormat.format(pinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
-
-                final JPasswordField repeatPinField = new JPasswordField();
-                pinField = new JPasswordField();
-                pinField.setText("");
-                pinField.setActionCommand(okCommand);
-                pinField.addActionListener(new ActionListener() {
-
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        if (pinField.getPassword().length >= pinSpec.getMinLength()) {
-                          if (type == DIALOG.VERIFY) {
-                            okListener.actionPerformed(e);
-                          } else {
-                            repeatPinField.requestFocusInWindow();
-                          }
-                        }
-                    }
-                });
-
-                if (type != DIALOG.VERIFY) {
-                  pinField.setDocument(new PINDocument(pinSpec, null));
-                  repeatPinLabel = new JLabel();
-                  repeatPinLabel.setFont(pinLabel.getFont());
-                  String repeatPinLabelPattern = getMessage(LABEL_REPEAT_PIN);
-                  repeatPinLabel.setText(MessageFormat.format(repeatPinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
-
-                  repeatPinField.setText("");
-//                  repeatPinField.setDocument(new PINDocument(pinSpec, okButton, pinField.getDocument()));
-                  repeatPinField.setActionCommand(okCommand);
-                  repeatPinField.addActionListener(new ActionListener() {
-
-                      @Override
-                      public void actionPerformed(ActionEvent e) {
-                          if (pinField.getPassword().length >= pinSpec.getMinLength()) {
-                              okListener.actionPerformed(e);
-                          }
-                      }
-                  });
-
-                  if (type == DIALOG.CHANGE) {
-                    oldPinLabel = new JLabel();
-                    oldPinLabel.setFont(oldPinLabel.getFont().deriveFont(oldPinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                    String oldPinLabelPattern = getMessage(LABEL_OLD_PIN);
-                    oldPinLabel.setText(MessageFormat.format(oldPinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
-
-                    oldPinField = new JPasswordField();
-                    oldPinField.setText("");
-                    oldPinField.setDocument(new PINDocument(pinSpec, null));
-                    oldPinField.setActionCommand(okCommand);
-                    oldPinField.addActionListener(new ActionListener() {
-
-                        @Override
-                        public void actionPerformed(ActionEvent e) {
-                            if (oldPinField.getPassword().length >= pinSpec.getMinLength()) {
-                              pinField.requestFocusInWindow();
-                            }
-                        }
-                    });
-
-                    repeatPinField.setDocument(new PINDocument(
-                            pinSpec, okButton,
-                            pinField.getDocument(), oldPinField.getDocument()));
-                  } else {
-                    // else -> ACTIVATE (not verify, not change)
-                    repeatPinField.setDocument(new PINDocument(
-                            pinSpec, okButton, pinField.getDocument()));
-                  }
-                } else {
-                  pinField.setDocument(new PINDocument(pinSpec, okButton));
-                }
-
-                JLabel pinsizeLabel = new JLabel();
-                pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~Font.BOLD, pinsizeLabel.getFont().getSize()-2));
-                String pinsizePattern = getMessage(LABEL_PINSIZE);
-                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{PINSIZE}));
-
-                ////////////////////////////////////////////////////////////////
-                // NON-PINPAD SPECIFIC LAYOUT SECTION
-                ////////////////////////////////////////////////////////////////
-
-                pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
-                pinVertical = mainPanelLayout.createSequentialGroup();
-
-//                if (pinLabelPos == PinLabelPosition.ABOVE) {
-//                  if (changePin) {
-//                      pinHorizontal
-//                              .addComponent(oldPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-//                              .addComponent(oldPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE);
-//                      pinVertical
-//                              .addComponent(oldPinLabel)
-//                              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-//                              .addComponent(oldPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-//                              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
-//                  }
-//                  pinHorizontal
-//                          .addComponent(pinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-//                          .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-//                          .addComponent(repeatPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-//                          .addComponent(repeatPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-//                          .addGroup(mainPanelLayout.createSequentialGroup()
-//                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-//                            .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
-//                  pinVertical
-//                          .addComponent(pinLabel)
-//                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-//                          .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-//                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-//                          .addComponent(repeatPinLabel)
-//                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-//                          .addComponent(repeatPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-//                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-//                          .addComponent(pinsizeLabel);
-//                } else {
-
-
-                  if (type == DIALOG.CHANGE) {
-                    pinHorizontal
-                          .addGroup(mainPanelLayout.createSequentialGroup()
-                            .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                              .addComponent(oldPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                              .addComponent(pinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                              .addComponent(repeatPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
-                            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                            .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                              .addComponent(oldPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                              .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                              .addComponent(repeatPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
-
-                    pinVertical
-                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                            .addComponent(oldPinLabel)
-                            .addComponent(oldPinField))
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                            .addComponent(pinLabel)
-                            .addComponent(pinField))
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                            .addComponent(repeatPinLabel)
-                            .addComponent(repeatPinField))
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
-                  } else if (type == DIALOG.ACTIVATE) {
-                    pinHorizontal
-                          .addGroup(mainPanelLayout.createSequentialGroup()
-                            .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                              .addComponent(pinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                              .addComponent(repeatPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
-                            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                            .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                              .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                              .addComponent(repeatPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
-
-                    pinVertical
-                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                            .addComponent(pinLabel)
-                            .addComponent(pinField))
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                            .addComponent(repeatPinLabel)
-                            .addComponent(repeatPinField))
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
-                  } else { // VERIFY
-                    pinHorizontal
-                          .addGroup(mainPanelLayout.createSequentialGroup()
-                            .addComponent(pinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                            .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE));
-
-                    pinVertical
-                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                            .addComponent(pinLabel)
-                            .addComponent(pinField))
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
-                  }
-                  pinHorizontal
-                          .addGroup(mainPanelLayout.createSequentialGroup()
-                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                            .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
-                  pinVertical
-                          .addComponent(pinsizeLabel);
-
-                  GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-                  buttonPanel.setLayout(buttonPanelLayout);
-
-                  GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
-                          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                          .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
-                  GroupLayout.Group buttonVertical;
-
-                  JButton cancelButton = new JButton();
-                  cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-                  cancelButton.setText(getMessage(BUTTON_CANCEL));
-                  cancelButton.setActionCommand(cancelCommand);
-                  cancelButton.addActionListener(cancelListener);
-
-                  buttonHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
-                  buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
-                          .addComponent(okButton)
-                          .addComponent(cancelButton);
-
-                  buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
-                  buttonPanelLayout.setVerticalGroup(buttonVertical);
-
-                  if (oldPinField != null) {
-                    oldPinField.requestFocusInWindow();
-                  } else {
-                    pinField.requestFocusInWindow();
-                  }
-
-                } // END NON-PINPAD SECTION
-
-                mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addGroup(infoHorizontal)
-                    .addGroup(pinHorizontal));
-
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addGroup(infoVertical)
-                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addGroup(pinVertical));
-
-                contentPanel.validate();
-
-            }
-        });
-  }
-
-  @Override
-  protected int initButtonSize() {
-    int bs = super.initButtonSize();
-
-    JButton b = new JButton();
-    b.setText(getMessage(BUTTON_ACTIVATE));
-    if (b.getPreferredSize().width > bs) {
-      bs = b.getPreferredSize().width;
-    }
-    b.setText(getMessage(BUTTON_CHANGE));
-    if (b.getPreferredSize().width > bs) {
-      bs = b.getPreferredSize().width;
-    }
-    b.setText(getMessage(BUTTON_UNBLOCK));
-    if (b.getPreferredSize().width > bs) {
-      bs = b.getPreferredSize().width;
-    }
-    b.setText(getMessage(BUTTON_CANCEL));
-    if (b.getPreferredSize().width > bs) {
-      bs = b.getPreferredSize().width;
-    }
-
-    return bs;
-  }
-
-}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
deleted file mode 100644
index f99bcfd1..00000000
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.gui;
-
-import at.gv.egiz.smcc.PINSpec;
-import java.awt.event.ActionListener;
-import java.util.Map;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public interface PINManagementGUIFacade extends BKUGUIFacade {
-
-  public static final String HELP_PINMGMT = "help.pin.mgmt";
-//  public static final String HELP_VERIFY_PIN = "help.pin.verify";
-  public static final String TITLE_PINMGMT = "title.pin.mgmt";
-  public static final String TITLE_ACTIVATE_PIN = "title.activate.pin";
-  public static final String TITLE_CHANGE_PIN = "title.change.pin";
-  public static final String TITLE_VERIFY_PIN = "title.verify.pin";
-  public static final String TITLE_UNBLOCK_PIN = "title.unblock.pin";
-  public static final String TITLE_ACTIVATE_SUCCESS = "title.activate.success";
-  public static final String TITLE_CHANGE_SUCCESS = "title.change.success";
-
-  // removed message.* prefix to reuse keys as help keys
-  public static final String MESSAGE_ACTIVATE_SUCCESS = "activate.success";
-  public static final String MESSAGE_CHANGE_SUCCESS = "change.success";
-  public static final String MESSAGE_PINMGMT = "pin.mgmt";
-//  public static final String MESSAGE_PINPAD = "pinpad";
-  public static final String MESSAGE_ACTIVATE_PIN = "activate.pin";
-  public static final String MESSAGE_CHANGE_PIN = "change.pin";
-  public static final String MESSAGE_VERIFY_PIN = "verify.pin";
-  public static final String MESSAGE_UNBLOCK_PIN = "unblock.pin";
-  public static final String MESSAGE_ACTIVATEPIN_PINPAD = "activate.pinpad";
-  public static final String MESSAGE_CHANGEPIN_PINPAD = "change.pinpad";
-  public static final String MESSAGE_VERIFYPIN_PINPAD = "verify.pinpad";
-  public static final String MESSAGE_UNBLOCKPIN_PINPAD = "unblock.pinpad";
-
-  public static final String LABEL_OLD_PIN = "label.old.pin";
-  public static final String LABEL_NEW_PIN = "label.new.pin";
-  public static final String LABEL_REPEAT_PIN = "label.repeat.pin";
-
-  public static final String ERR_STATUS = "err.status";
-  public static final String ERR_ACTIVATE = "err.activate";
-  public static final String ERR_CHANGE = "err.change";
-  public static final String ERR_UNBLOCK = "err.unblock";
-  public static final String ERR_VERIFY = "err.verify";
-  public static final String ERR_RETRIES = "err.retries";
-  public static final String ERR_LOCKED = "err.locked";
-  public static final String ERR_NOT_ACTIVE = "err.not.active";
-  public static final String ERR_PIN_FORMAT = "err.pin.format";
-  public static final String ERR_PIN_CONFIRMATION = "err.pin.confirmation";
-  public static final String ERR_PIN_OPERATION_ABORTED = "err.pin.operation.aborted";
-  public static final String ERR_UNSUPPORTED_CARD = "err.unsupported.card";
-
-  public static final String BUTTON_ACTIVATE = "button.activate";
-  public static final String BUTTON_UNBLOCK = "button.unblock";
-  public static final String BUTTON_CHANGE = "button.change";
-  public static final String BUTTON_VERIFY = "button.verify";
-
-  public static final String STATUS_ACTIVE = "status.active";
-  public static final String STATUS_BLOCKED = "status.blocked";
-  public static final String STATUS_NOT_ACTIVE = "status.not.active";
-  public static final String STATUS_UNKNOWN = "status.unknown";
-
-  public enum STATUS { ACTIV, NOT_ACTIV, BLOCKED, UNKNOWN };
-  public enum DIALOG { VERIFY, ACTIVATE, CHANGE, UNBLOCK };
-
-  public void showPINManagementDialog(Map<PINSpec, STATUS> pins,
-          ActionListener activateListener, String activateCmd, String changeCmd, String unblockCmd, String verifyCmd,
-          ActionListener cancelListener, String cancelCmd);
-
-  public void showPINDialog(DIALOG type, PINSpec pin,
-          ActionListener okListener, String okCmd,
-          ActionListener cancelListener, String cancelCmd);
-
-  public void showPINDialog(DIALOG type, PINSpec pin, int retries,
-          ActionListener okListener, String okCmd,
-          ActionListener cancelListener, String cancelCmd);
-
-  public void showPinpadPINDialog(DIALOG type, PINSpec pin, int retries);
-
-//  public void showActivatePINDialog(PINSpec pin,
-//          ActionListener okListener, String okCmd,
-//          ActionListener cancelListener, String cancelCmd);
-//
-//  public void showChangePINDialog(PINSpec pin,
-//          ActionListener okListener, String okCmd,
-//          ActionListener cancelListener, String cancelCmd);
-//
-//  public void showUnblockPINDialog(PINSpec pin,
-//          ActionListener okListener, String okCmd,
-//          ActionListener cancelListener, String cancelCmd);
-//
-//  public void showVerifyPINDialog(PINSpec pin,
-//          ActionListener okListener, String okCmd,
-//          ActionListener cancelListener, String cancelCmd);
-
-  public char[] getOldPin();
-
-  public PINSpec getSelectedPINSpec();
-}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINSpecRenderer.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINSpecRenderer.java
deleted file mode 100644
index e3d73e1f..00000000
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINSpecRenderer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.gui;
-
-import at.gv.egiz.smcc.PINSpec;
-import javax.swing.table.DefaultTableCellRenderer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class PINSpecRenderer extends DefaultTableCellRenderer {
-
-  private static final Log log = LogFactory.getLog(PINSpecRenderer.class);
-
-  @Override
-  protected void setValue(Object value) {
-    PINSpec pinSpec = (PINSpec) value;
-    super.setText(pinSpec.getLocalizedName());
-  }
-
-}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
deleted file mode 100644
index 83ff74f2..00000000
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.gui;
-
-import at.gv.egiz.bku.gui.PINManagementGUIFacade.STATUS;
-import java.awt.Color;
-import java.awt.Font;
-import java.util.ResourceBundle;
-import javax.swing.table.DefaultTableCellRenderer;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class PINStatusRenderer extends DefaultTableCellRenderer {
-  
-//  private static final Log log = LogFactory.getLog(PINStatusRenderer.class);
-
-  public static final Color RED = new Color(0.9f, 0.0f, 0.0f);
-  public static final Color GREEN = new Color(0.0f, 0.8f, 0.0f);
-  protected ResourceBundle messages;
-
-  public PINStatusRenderer(ResourceBundle messages) {
-    this.messages = messages;
-  }
-
-  @Override
-  protected void setValue(Object value) {
-    STATUS pinStatus = (STATUS) value;
-    super.setFont(super.getFont().deriveFont(super.getFont().getStyle() | Font.BOLD));
-      
-    if (pinStatus == STATUS.NOT_ACTIV) {
-      super.setForeground(RED);
-      super.setText("<html>" + messages.getString(PINManagementGUIFacade.STATUS_NOT_ACTIVE) + "</html>");
-    } else if (pinStatus == STATUS.ACTIV) {
-      super.setForeground(GREEN);
-      super.setText("<html>" + messages.getString(PINManagementGUIFacade.STATUS_ACTIVE) + "</html>");
-    } else if (pinStatus == STATUS.BLOCKED) {
-      super.setForeground(RED);
-      super.setText("<html>" + messages.getString(PINManagementGUIFacade.STATUS_BLOCKED) + "</html>");
-    } else {
-      super.setForeground(Color.BLACK);
-      super.setText("<html>" + messages.getString(PINManagementGUIFacade.STATUS_UNKNOWN) + "</html>");
-    }
-  }
-}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java
deleted file mode 100644
index 052c13b2..00000000
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.gui;
-
-import at.gv.egiz.bku.gui.PINManagementGUIFacade.STATUS;
-import at.gv.egiz.smcc.PINSpec;
-import java.util.Map;
-import javax.swing.table.DefaultTableModel;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class PINStatusTableModel extends DefaultTableModel {
-
-//  protected static final Log log = LogFactory.getLog(PINStatusTableModel.class);
-  protected Class[] types;
-
-  public PINStatusTableModel(Map<PINSpec, STATUS> pinStatuses) {
-    super(0, 2);
-    if (pinStatuses == null) {
-      throw new RuntimeException("pinStatuses must not be null");
-    }
-//    log.trace(pinStatuses.size() + " PINs");
-    types = new Class[] { PINSpec.class, STATUS.class };
-    for (PINSpec pinSpec : pinStatuses.keySet()) {
-      addRow(new Object[] { pinSpec, pinStatuses.get(pinSpec) });
-    }
-//    PINSpec activePIN = new PINSpec(0, 1, null, "active-PIN", (byte) 0x01);
-//    PINSpec blockedPIN = new PINSpec(0, 1, null, "blocked-PIN", (byte) 0x01);
-//    addRow(new Object[] { activePIN, PINStatusProvider.STATUS.ACTIV });
-//    addRow(new Object[] { blockedPIN, PINStatusProvider.STATUS.BLOCKED });
-  }
-
-  @Override
-  public Class getColumnClass(int columnIndex) {
-    return types[columnIndex];
-  }
-
-  @Override
-  public boolean isCellEditable(int rowIndex, int columnIndex) {
-    return false;
-  }
-}
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 68f0cb72..cfd1e200 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
@@ -22,7 +22,7 @@ import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.BKUGUIFacade.Style;
 import at.gv.egiz.bku.online.applet.BKUApplet;
 import at.gv.egiz.bku.smccstal.AbstractSMCCSTAL;
-import at.gv.egiz.bku.smccstal.ext.CardMgmtRequestHandler;
+import at.gv.egiz.bku.smccstal.CardMgmtRequestHandler;
 import at.gv.egiz.stal.ext.APDUScriptRequest;
 import at.gv.egiz.stal.service.STALPortType;
 import at.gv.egiz.stal.service.translator.STALTranslator;
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 81b635f8..d06c2865 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
@@ -18,11 +18,16 @@ package at.gv.egiz.bku.online.applet;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.PINManagementGUIFacade;
-import at.gv.egiz.bku.smccstal.ext.PINManagementRequestHandler;
+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;
 
@@ -36,7 +41,8 @@ public class PINManagementBKUWorker extends AppletBKUWorker {
 
   public PINManagementBKUWorker(BKUApplet applet, PINManagementGUIFacade gui) {
     super(applet, gui);
-    handlerMap.clear();
+    removeRequestHandler(InfoboxReadRequest.class);
+    removeRequestHandler(SignRequest.class);
     addRequestHandler(PINManagementRequest.class, new PINManagementRequestHandler());
   }
 
@@ -46,7 +52,11 @@ public class PINManagementBKUWorker extends AppletBKUWorker {
             BKUGUIFacade.MESSAGE_WELCOME);
 
     try {
-      List<STALResponse> responses = handleRequest(Collections.singletonList(new PINManagementRequest()));
+
+      ArrayList<STALRequest> reqs = new ArrayList<STALRequest>();
+      reqs.add(new PINManagementRequest());
+      reqs.add(new QuitRequest());
+      List<STALResponse> responses = handleRequest(reqs);
 
       if (responses.size() == 1) {
         STALResponse response = responses.get(0);
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/CardMgmtRequestHandler.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/CardMgmtRequestHandler.java
deleted file mode 100644
index 769342e7..00000000
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/CardMgmtRequestHandler.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-* 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.
-*/
-/**
- * 
- */
-package at.gv.egiz.bku.smccstal.ext;
-
-import at.gv.egiz.bku.gui.ActivationGUIFacade;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.smartcardio.Card;
-import javax.smartcardio.CardChannel;
-import javax.smartcardio.CardException;
-import javax.smartcardio.CommandAPDU;
-import javax.smartcardio.ResponseAPDU;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.bku.smccstal.AbstractRequestHandler;
-import at.gv.egiz.smcc.SignatureCardException;
-import at.gv.egiz.stal.ErrorResponse;
-import at.gv.egiz.stal.STALRequest;
-import at.gv.egiz.stal.STALResponse;
-import at.gv.egiz.stal.ext.APDUScriptRequest;
-import at.gv.egiz.stal.ext.APDUScriptResponse;
-import at.gv.egiz.stal.ext.APDUScriptRequest.Command;
-import at.gv.egiz.stal.ext.APDUScriptRequest.RequestScriptElement;
-import at.gv.egiz.stal.ext.APDUScriptRequest.Reset;
-import at.gv.egiz.stal.ext.APDUScriptResponse.Response;
-import at.gv.egiz.stal.ext.APDUScriptResponse.ATR;
-import at.gv.egiz.stal.ext.APDUScriptResponse.ResponseScriptElement;
-import java.awt.event.ActionListener;
-
-/**
- * @author mcentner
- *
- */
-public class CardMgmtRequestHandler extends AbstractRequestHandler implements ActionListener {
-
-  /**
-   * Logging facility.
-   */
-  private static Log log = LogFactory.getLog(CardMgmtRequestHandler.class);
-  
-  /**
-   * The sequence counter.
-   */
-  private int sequenceNum = 0;
-
-  /**
-   * display script num
-   */
-  private int currentActivationScript = 0;
-
-  @Override
-  public STALResponse handleRequest(STALRequest request)
-      throws InterruptedException {
-
-    // APDU Script Request
-    if (request instanceof APDUScriptRequest) {
-
-      currentActivationScript++;
-      log.debug("handling APDU script " + currentActivationScript);
-      
-      Card icc = card.getCard();
-
-      if (icc == null) {
-        log.error("SignatureCard instance '" + card.getClass().getName() + "' does not support card management requests.");
-        return new ErrorResponse(1000);
-      }
-
-      List<RequestScriptElement> script = ((APDUScriptRequest) request).getScript();
-      ArrayList<ResponseScriptElement> responses = new ArrayList<ResponseScriptElement>(script.size());
-
-      ((ActivationGUIFacade) gui).showActivationProgressDialog(currentActivationScript, script.size(), this, "cancel");
-
-      try {
-        log.trace("begin exclusive");
-        icc.beginExclusive();
-
-        for (RequestScriptElement scriptElement : script) {
-          ((ActivationGUIFacade) gui).incrementProgress();
-          
-          if (scriptElement instanceof Command) {
-            log.trace("handling APDU script element COMMAND");
-            Command command = (Command) scriptElement;
-            CommandAPDU commandAPDU = new CommandAPDU(command.getCommandAPDU());
-
-            log.trace("get basicchannel");
-            CardChannel channel = icc.getBasicChannel();
-            
-            sequenceNum = command.getSequence();
-            log.debug("Transmit APDU (sequence=" + sequenceNum + ")");
-            log.trace(commandAPDU.toString());
-            ResponseAPDU responseAPDU = channel.transmit(commandAPDU);
-            log.trace(responseAPDU.toString());
-            
-            byte[] sw = new byte[] { 
-                (byte) (0xFF & responseAPDU.getSW1()),
-                (byte) (0xFF & responseAPDU.getSW2()) }; 
-            
-            responses.add(new Response(sequenceNum, responseAPDU.getData(), sw, 0));
-            
-            if (command.getExpectedSW() != null && 
-              !Arrays.equals(sw, command.getExpectedSW())) {
-              // unexpected SW
-              log.warn("Got unexpected SW. APDU-script execution stopped.");
-              break;
-            }
-            
-          } else if (scriptElement instanceof Reset) {
-
-            log.trace("handling APDU script element RESET");
-            sequenceNum = 0;
-            card.reset();
-            javax.smartcardio.ATR atr = icc.getATR();
-            log.trace("got ATR: " + atr.toString());
-            responses.add(new ATR(atr.getBytes()));
-
-            log.trace("regain exclusive access to card");
-            icc = card.getCard();
-            icc.beginExclusive();
-          }
-          
-        }
-
-      } catch (CardException e) {
-        log.info("Failed to execute APDU script.", e);
-        responses.add(new Response(sequenceNum, null, null, Response.RC_UNSPECIFIED));
-      } catch (SignatureCardException e) {
-        log.info("Failed to reset smart card.", e);
-        responses.add(new Response(sequenceNum, null, null, Response.RC_UNSPECIFIED));
-      } catch (RuntimeException e) {
-        log.error(e);
-        throw e;
-      } finally {
-        try {
-          icc.endExclusive();
-        } catch (CardException e) {
-          log.info(e);
-        }
-      }
-
-      log.trace("done handling APDU script " + currentActivationScript + ", return response containing " + responses.size() + " elements");
-      ((ActivationGUIFacade) gui).showIdleDialog(this, "cancel");
-      return new APDUScriptResponse(responses);
-      
-    } else {
-      log.error("Got unexpected STAL request: " + request);
-      return new ErrorResponse(1000);
-    }
-    
-  }
-
-  @Override
-  public boolean requireCard() {
-    return true;
-  }
-
-}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/GetPINStatusException.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/GetPINStatusException.java
deleted file mode 100644
index abbe66a1..00000000
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/GetPINStatusException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.smccstal.ext;
-
-import at.gv.egiz.smcc.SignatureCardException;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class GetPINStatusException extends SignatureCardException {
-
-    /**
-     * Creates a new instance of <code>GetStatusException</code> without detail message.
-     */
-    public GetPINStatusException() {
-    }
-
-
-    /**
-     * Constructs an instance of <code>GetStatusException</code> with the specified detail message.
-     * @param msg the detail message.
-     */
-    public GetPINStatusException(String msg) {
-        super(msg);
-    }
-}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java
deleted file mode 100644
index f54f89d4..00000000
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/ManagementPINProviderFactory.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.smccstal.ext;
-
-import at.gv.egiz.bku.gui.BKUGUIFacade;
-import at.gv.egiz.smcc.ChangePINProvider;
-import at.gv.egiz.bku.gui.PINManagementGUIFacade;
-import at.gv.egiz.bku.smccstal.AbstractPINProvider;
-import at.gv.egiz.bku.smccstal.PINProviderFactory;
-import at.gv.egiz.smcc.CancelledException;
-import at.gv.egiz.smcc.ccid.CCID;
-import at.gv.egiz.smcc.PINProvider;
-import at.gv.egiz.smcc.PINSpec;
-import at.gv.egiz.smcc.SignatureCard;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class ManagementPINProviderFactory extends PINProviderFactory {
-
-  public ManagementPINProviderFactory(CCID reader, PINManagementGUIFacade gui) {
-    super(reader, gui);
-  }
-  
-//  public static ManagementPINProviderFactory getInstance(SignatureCard forCard,
-//          PINManagementGUIFacade gui) {
-//    if (forCard.getReader().hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
-//      return new PinpadPINProviderFactory(gui);
-//
-//    } else {
-//      return new SoftwarePINProviderFactory(gui);
-//    }
-//  }
-
-  public PINProvider getVerifyPINProvider() {
-    if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_START)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.VERIFY);
-    } else if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.VERIFY);
-    } else {
-      return new SoftwareGenericPinProvider(PINManagementGUIFacade.DIALOG.VERIFY);
-    }
-  }
-
-  public PINProvider getActivatePINProvider() {
-    if (reader.hasFeature(CCID.FEATURE_MODIFY_PIN_START)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.ACTIVATE);
-    } else if (reader.hasFeature(CCID.FEATURE_MODIFY_PIN_DIRECT)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.ACTIVATE);
-    } else {
-      return new SoftwareGenericPinProvider(PINManagementGUIFacade.DIALOG.ACTIVATE);
-    }
-  }
-
-  public ChangePINProvider getChangePINProvider() {
-    if (reader.hasFeature(CCID.FEATURE_MODIFY_PIN_START)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.CHANGE);
-    } else if (reader.hasFeature(CCID.FEATURE_MODIFY_PIN_DIRECT)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.CHANGE);
-    } else {
-      return new ChangePinProvider();
-    }
-  }
-
-  public PINProvider getUnblockPINProvider() {
-    if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_START)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.UNBLOCK);
-    } else if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.UNBLOCK);
-    } else {
-      return new SoftwareGenericPinProvider(PINManagementGUIFacade.DIALOG.UNBLOCK);
-    }
-  }
-
-  class PinpadGenericPinProvider extends AbstractPINProvider
-          implements ChangePINProvider {
-
-    protected PINManagementGUIFacade.DIALOG type;
-
-    private PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG type) {
-      this.type = type;
-    }
-
-    @Override
-    public char[] providePIN(PINSpec spec, int retries)
-            throws CancelledException, InterruptedException {
-
-      showPinpadPINDialog(retries, spec);
-      retry = true;
-      return null;
-    }
-
-    /**
-     * do not call this method without calling providePIN()
-     * (no message is displayed)
-     * @param spec
-     * @param retries
-     * @return
-     */
-    @Override
-    public char[] provideOldPIN(PINSpec spec, int retries) {
-      return null;
-    }
-
-    private void showPinpadPINDialog(int retries, PINSpec pinSpec) {
-      String title, message;
-      Object[] params;
-      if (retry) {
-        if (retries == 1) {
-          message = BKUGUIFacade.MESSAGE_LAST_RETRY_PINPAD;
-        } else {
-          message = BKUGUIFacade.MESSAGE_RETRIES_PINPAD;
-        }
-        title = BKUGUIFacade.TITLE_RETRY;
-        params = new Object[]{String.valueOf(retries)};
-      } else if (type == PINManagementGUIFacade.DIALOG.VERIFY) {
-        title = PINManagementGUIFacade.TITLE_VERIFY_PIN;
-        message = BKUGUIFacade.MESSAGE_ENTERPIN_PINPAD;
-        String pinSize = String.valueOf(pinSpec.getMinLength());
-        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-          pinSize += "-" + pinSpec.getMaxLength();
-        }
-        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
-      } else if (type == PINManagementGUIFacade.DIALOG.ACTIVATE) {
-        title = PINManagementGUIFacade.TITLE_ACTIVATE_PIN;
-        message = PINManagementGUIFacade.MESSAGE_ACTIVATEPIN_PINPAD;
-        String pinSize = String.valueOf(pinSpec.getMinLength());
-        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-          pinSize += "-" + pinSpec.getMaxLength();
-        }
-        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
-      } else if (type == PINManagementGUIFacade.DIALOG.CHANGE) {
-        title = PINManagementGUIFacade.TITLE_CHANGE_PIN;
-        message = PINManagementGUIFacade.MESSAGE_CHANGEPIN_PINPAD;
-        String pinSize = String.valueOf(pinSpec.getMinLength());
-        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-          pinSize += "-" + pinSpec.getMaxLength();
-        }
-        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
-      } else { //if (type == DIALOG.UNBLOCK) {
-        title = PINManagementGUIFacade.TITLE_UNBLOCK_PIN;
-        message = PINManagementGUIFacade.MESSAGE_UNBLOCKPIN_PINPAD;
-        String pinSize = String.valueOf(pinSpec.getMinLength());
-        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-          pinSize += "-" + pinSpec.getMaxLength();
-        }
-        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
-      }
-      gui.showMessageDialog(title, message, params);
-    }
-  }
-
-
-  class SoftwareGenericPinProvider extends AbstractPINProvider {
-
-//    protected PINManagementGUIFacade gui;
-    protected PINManagementGUIFacade.DIALOG type;
-
-    private SoftwareGenericPinProvider(PINManagementGUIFacade.DIALOG type) {
-      this.type = type;
-    }
-
-    @Override
-    public char[] providePIN(PINSpec spec, int retries)
-            throws CancelledException, InterruptedException {
-
-      ((PINManagementGUIFacade) gui).showPINDialog(type, spec,
-              (retry) ? retries : -1,
-              this, "exec",
-              this, "back");
-
-      waitForAction();
-
-      if ("exec".equals(action)) {
-        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
-                BKUGUIFacade.MESSAGE_WAIT);
-        retry = true;
-        return gui.getPin();
-      } else if ("back".equals(action)) {
-        throw new CancelledException();
-      } else {
-        log.error("unsupported command " + action);
-        throw new CancelledException();
-      }
-    }
-  }
-
-  class ChangePinProvider extends AbstractPINProvider
-          implements ChangePINProvider {
-
-//    protected PINManagementGUIFacade gui;
-
-    private char[] oldPin;
-    private char[] newPin;
-
-    private ChangePinProvider() {
-    }
-
-    @Override
-    public char[] providePIN(PINSpec spec, int retries)
-            throws CancelledException, InterruptedException {
-      if (newPin == null) {
-        getPINs(spec, retries);
-      }
-      char[] pin = newPin;
-      newPin = null;
-      return pin;
-    }
-
-    @Override
-    public char[] provideOldPIN(PINSpec spec, int retries)
-            throws CancelledException, InterruptedException {
-      if (oldPin == null) {
-        getPINs(spec, retries);
-      }
-      char[] pin = oldPin;
-      oldPin = null;
-      return pin;
-    }
-
-    private void getPINs(PINSpec spec, int retries)
-            throws InterruptedException, CancelledException {
-
-      ((PINManagementGUIFacade) gui).showPINDialog(
-              PINManagementGUIFacade.DIALOG.CHANGE, spec,
-              (retry) ? retries : -1,
-              this, "exec",
-              this, "back");
-
-      waitForAction();
-
-      if ("exec".equals(action)) {
-        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
-                BKUGUIFacade.MESSAGE_WAIT);
-        retry = true;
-        oldPin = ((PINManagementGUIFacade) gui).getOldPin();
-        newPin = gui.getPin();
-      } else if ("back".equals(action)) {
-        throw new CancelledException();
-      } else {
-        log.error("unsupported command " + action);
-        throw new CancelledException();
-      }
-    }
-  }
-}
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
deleted file mode 100644
index e0b09d63..00000000
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/smccstal/ext/PINManagementRequestHandler.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.smccstal.ext;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.bku.gui.BKUGUIFacade;
-import at.gv.egiz.bku.gui.PINManagementGUIFacade;
-import at.gv.egiz.bku.gui.PINManagementGUIFacade.STATUS;
-import at.gv.egiz.bku.smccstal.AbstractRequestHandler;
-import at.gv.egiz.smcc.CancelledException;
-import at.gv.egiz.smcc.LockedException;
-import at.gv.egiz.smcc.NotActivatedException;
-import at.gv.egiz.smcc.PINConfirmationException;
-import at.gv.egiz.smcc.PINFormatException;
-import at.gv.egiz.smcc.PINMgmtSignatureCard;
-import at.gv.egiz.smcc.PINOperationAbortedException;
-import at.gv.egiz.smcc.PINSpec;
-import at.gv.egiz.smcc.SignatureCardException;
-import at.gv.egiz.smcc.TimeoutException;
-import at.gv.egiz.smcc.PINMgmtSignatureCard.PIN_STATE;
-import at.gv.egiz.stal.ErrorResponse;
-import at.gv.egiz.stal.STALRequest;
-import at.gv.egiz.stal.STALResponse;
-import at.gv.egiz.stal.ext.PINManagementRequest;
-import at.gv.egiz.stal.ext.PINManagementResponse;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class PINManagementRequestHandler extends AbstractRequestHandler {
-
-  protected static final Log log = LogFactory.getLog(PINManagementRequestHandler.class);
-
-  protected Map<PINSpec, STATUS> pinStates = new HashMap<PINSpec, STATUS>();
-
-  @Override
-  public STALResponse handleRequest(STALRequest request) throws InterruptedException {
-    if (request instanceof PINManagementRequest) {
-
-    PINManagementGUIFacade gui = (PINManagementGUIFacade) this.gui;
-      
-    PINSpec selectedPIN = null;
-
-    try {
-
-      if (card instanceof PINMgmtSignatureCard) {
-
-        // update all PIN states
-        for (PINSpec pinSpec : ((PINMgmtSignatureCard) card).getPINSpecs()) {
-          updatePINState(pinSpec, STATUS.UNKNOWN);
-        }
-        
-        gui.showPINManagementDialog(pinStates, this, "activate_enterpin",
-              "change_enterpin", "unblock_enterpuk", "verify_enterpin", this,
-              "cancel");
-        
-      } else {
-        
-        // card does not support PIN management
-        gui.showErrorDialog(PINManagementGUIFacade.ERR_UNSUPPORTED_CARD,
-              null, this, "cancel");
-        
-      }
-
-      while (true) {
-
-        waitForAction();
-
-        if ("cancel".equals(actionCommand)) {
-          return new PINManagementResponse();
-        } else {
-          selectedPIN = gui.getSelectedPINSpec();
-
-          if (selectedPIN == null) {
-            throw new NullPointerException("no PIN selected for activation/change");
-          }
-
-          ManagementPINProviderFactory ppfac =
-                  new ManagementPINProviderFactory(card.getReader(), gui);
-
-          try {
-            if ("activate_enterpin".equals(actionCommand)) {
-              log.info("activate " + selectedPIN.getLocalizedName());
-              ((PINMgmtSignatureCard) card).activatePIN(selectedPIN,
-                      ppfac.getActivatePINProvider());
-              updatePINState(selectedPIN, STATUS.ACTIV);
-              gui.showMessageDialog(PINManagementGUIFacade.TITLE_ACTIVATE_SUCCESS,
-                      PINManagementGUIFacade.MESSAGE_ACTIVATE_SUCCESS,
-                      new Object[] {selectedPIN.getLocalizedName()},
-                      BKUGUIFacade.BUTTON_OK, this, "ok");
-              waitForAction();
-            } else if ("change_enterpin".equals(actionCommand)) {
-              log.info("change " + selectedPIN.getLocalizedName());
-              ((PINMgmtSignatureCard) card).changePIN(selectedPIN, 
-                      ppfac.getChangePINProvider());
-              updatePINState(selectedPIN, STATUS.ACTIV);
-              gui.showMessageDialog(PINManagementGUIFacade.TITLE_CHANGE_SUCCESS,
-                      PINManagementGUIFacade.MESSAGE_CHANGE_SUCCESS,
-                      new Object[] {selectedPIN.getLocalizedName()},
-                      BKUGUIFacade.BUTTON_OK, this, "ok");
-              waitForAction();
-
-            } else if ("unblock_enterpuk".equals(actionCommand)) {
-              log.info("unblock " + selectedPIN.getLocalizedName());
-              ((PINMgmtSignatureCard) card).unblockPIN(selectedPIN,
-                      ppfac.getUnblockPINProvider());
-            } else if ("verify_enterpin".equals(actionCommand)) {
-              log.info("verify " + selectedPIN.getLocalizedName());
-              ((PINMgmtSignatureCard) card).verifyPIN(selectedPIN,
-                      ppfac.getVerifyPINProvider());
-              updatePINState(selectedPIN, STATUS.ACTIV);
-            }
-          } catch (CancelledException ex) {
-            log.trace("cancelled");
-          } catch (TimeoutException ex) {
-            log.error("Timeout during pin entry");
-            gui.showMessageDialog(BKUGUIFacade.TITLE_ENTRY_TIMEOUT,
-                    BKUGUIFacade.ERR_PIN_TIMEOUT, 
-                    new Object[] {selectedPIN.getLocalizedName()},
-                    BKUGUIFacade.BUTTON_OK, this, null);
-            waitForAction();
-          } catch (LockedException ex) {
-            log.error(selectedPIN.getLocalizedName() + " locked");
-            updatePINState(selectedPIN, STATUS.BLOCKED);
-            gui.showErrorDialog(PINManagementGUIFacade.ERR_LOCKED,
-                    new Object[] {selectedPIN.getLocalizedName()},
-                    this, null);
-            waitForAction();
-          } catch (NotActivatedException ex) {
-            log.error(selectedPIN.getLocalizedName() + " not active");
-            updatePINState(selectedPIN, STATUS.NOT_ACTIV);
-            gui.showErrorDialog(PINManagementGUIFacade.ERR_NOT_ACTIVE,
-                    new Object[] {selectedPIN.getLocalizedName()},
-                    this, null);
-            waitForAction();
-          } catch (PINConfirmationException ex) {
-            log.error("confirmation pin does not match new " + selectedPIN.getLocalizedName());
-            gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_CONFIRMATION,
-                    new Object[] {selectedPIN.getLocalizedName()},
-                    this, null);
-            waitForAction();
-          } catch (PINOperationAbortedException ex) {
-            log.error("pin operation aborted without further details");
-            gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_OPERATION_ABORTED,
-                    new Object[] {selectedPIN.getLocalizedName()},
-                    this, null);
-            waitForAction();
-          } catch (PINFormatException ex) {
-            log.error("wrong format of new " + selectedPIN.getLocalizedName());
-//            updatePINStatus(selectedPIN, STATUS.NOT_ACTIV);
-            String pinSize = String.valueOf(selectedPIN.getMinLength());
-            if (selectedPIN.getMinLength() != selectedPIN.getMaxLength()) {
-                pinSize += "-" + selectedPIN.getMaxLength();
-            }
-            gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_FORMAT,
-                    new Object[] {selectedPIN.getLocalizedName(), pinSize},
-                    this, null);
-            waitForAction();
-          }
-        } // end if
-
-        selectedPIN = null;
-        gui.showPINManagementDialog(pinStates,
-                this, "activate_enterpin", "change_enterpin", "unblock_enterpuk", "verify_enterpin",
-                this, "cancel");
-      } // end while
-
-      } catch (GetPINStatusException ex) {
-        String pin = (selectedPIN != null) ? selectedPIN.getLocalizedName() : "pin";
-        log.error("failed to get " +  pin + " status: " + ex.getMessage());
-        gui.showErrorDialog(PINManagementGUIFacade.ERR_STATUS, null,
-                this, "ok");
-        waitForAction();
-        return new ErrorResponse(1000);
-      } catch (SignatureCardException ex) {
-        log.error(ex.getMessage(), ex);
-        gui.showErrorDialog(PINManagementGUIFacade.ERR_UNKNOWN, null,
-                this, "ok");
-        waitForAction();
-        return new ErrorResponse(1000);
-      }
-    } else {
-      log.error("Got unexpected STAL request: " + request);
-      return new ErrorResponse(1000);
-    }
-  }
-
-  @Override
-  public boolean requireCard() {
-    return true;
-  }
-
-  /**
-   * query status for STARCOS card,
-   * assume provided status for ACOS card
-   * @param pinSpec
-   * @param status
-   * @throws at.gv.egiz.smcc.SignatureCardException if query status fails
-   */
-  private void updatePINState(PINSpec pinSpec, STATUS status)
-      throws GetPINStatusException {
-
-    PINMgmtSignatureCard pmCard = ((PINMgmtSignatureCard) card);
-    PIN_STATE pinState;
-    try {
-      pinState = pmCard.getPINState(pinSpec);
-    } catch (SignatureCardException e) {
-      String msg = "Failed to get PIN status for pin '"
-          + pinSpec.getLocalizedName() + "'.";
-      log.info(msg, e);
-      throw new GetPINStatusException(msg);
-    }
-    if (pinState == PIN_STATE.ACTIV) {
-      pinStates.put(pinSpec, STATUS.ACTIV);
-    } else if (pinState == PIN_STATE.NOT_ACTIV) {
-      pinStates.put(pinSpec, STATUS.NOT_ACTIV);
-    } else if (pinState == PIN_STATE.BLOCKED) {
-      pinStates.put(pinSpec, STATUS.BLOCKED);
-    } else {
-      pinStates.put(pinSpec, status);
-    }
-  }
-
-}
diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
deleted file mode 100644
index 977d6e3a..00000000
--- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.
-
-title.activation=<html>Aktivierung</html>
-title.pin.mgmt=<html>PIN Verwaltung</html>
-title.activate.pin=<html>PIN Aktivieren</html>
-title.change.pin=<html>PIN \u00C4ndern</html>
-title.unblock.pin=<html>PIN Entsperren</html>
-title.verify.pin=<html>PIN Eingeben</html>
-title.activate.success=<html>Erfolg</html>
-title.change.success=<html>Erfolg</html>
-
-# removed message.* prefix to reuse keys as help keys
-pin.mgmt=<html>Die Karte verf\u00FCgt \u00FCber {0} PINs</html>
-activate.pin=<html>{0} eingeben und best\u00E4tigen</html>
-change.pin=<html>{0} eingeben und best\u00E4tigen</html>
-unblock.pin=<html>PUK zu {0} eingeben</html>
-verify.pin=<html>{0} eingeben</html>
-verify.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben (und best\u00E4tigen).</html>
-activate.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben und wiederholen (jeweils best\u00E4tigen).</html>
-change.pinpad=<html>Alte {0} ({1} stellig) am Kartenleser eingeben, danach neue {0} eingeben und wiederholen (jeweils best\u00E4tigen). </html>
-unblock.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben (und best\u00E4tigen).</html>
-activate.success=<html>{0} wurde erfolgreich aktiviert.</html>
-change.success=<html>{0} wurde erfolgreich ge\u00E4ndert.</html>
-
-label.activation=<html>e-card Aktivierungsprozess</html>
-label.activation.step=<html>Schritt {0}</html>
-label.activation.idle=<html>Warte auf Server...</html>
-label.old.pin=<html>Alte {0}:</html>
-label.new.pin=<html>Neue {0}:</html>
-label.repeat.pin=<html>Best\u00E4tigung:</html>
-
-button.activate=Aktivieren
-button.change=\u00C4ndern
-button.unblock=Entsperren
-button.verify=Abfragen
-
-help.activation=help.activation
-help.pin.mgmt=help.pin.mgmt
-
-err.status=<html>Der Status der PINs konnte nicht \u00FCberpr\u00FCft werden.</html>
-err.activate=<html>Beim Aktivieren der {0} trat ein Fehler auf.</html>
-err.change=<html>Beim \u00C4ndern der {0} trat ein Fehler auf.</html>
-err.unblock=<html>Das Entsperren der {0} wird nicht unterst\u00FCtzt.</html>
-err.verify=<html>VERIFY ERROR (TODO)</html>
-err.retries=<html>Falsche {0}, noch {1} Versuche</html>
-err.locked=<html>{0} gesperrt.</html>
-err.not.active=<html>{0} nicht aktiviert.</html>
-err.pin.format=<html>Ung\u00FCltige {0} L\u00E4nge, verlangt sind {1} Stellen.</html>
-err.pin.confirmation=<html>{0} und Best\u00E4tigung stimmen nicht \u00FCberein.</html>
-err.pin.operation.aborted=<html>Der Vorgang f\u00FCr {0} wurde abgebrochen.</html>
-err.unsupported.card=<html>Die Karte wird nicht unterst\u00FCtzt</html>
-
-status.not.active=NICHT AKTIV
-status.active=AKTIV
-status.blocked=GESPERRT
-status.unknown=UNBEKANNT
diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
deleted file mode 100644
index 7f01971b..00000000
--- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.
-
-title.activation=<html>Activation</html>
-title.pin.mgmt=<html>PIN Management</html>
-title.activate.pin=<html>Activate PIN</html>
-title.verify.pin=<html>Enter PIN</html>
-title.change.pin=<html>Change PIN</html>
-title.unblock.pin=<html>Unblock PIN</html>
-title.activate.success=<html>Success</html>
-title.change.success=<html>Success</html>
-
-# removed message.* prefix to reuse keys as help keys
-pin.mgmt=<html>The smartcard has {0} PINs</html>
-activate.pin=<html>Enter and confirm {0}</html>
-change.pin=<html>Enter and confirm {0}</html>
-unblock.pin=<html>Enter PUK for {0}</html>
-verify.pin=<html>Enter {0}</html>
-verify.pinpad=<html>Enter {0} ({1} digits) on cardreader (and confirm).</html>
-activate.pinpad=<html>Enter {0} ({1} digits) on cardreader and repeat (confirm in each case).</html>
-change.pinpad=<html>Enter old {0} ({1} digits) on cardreader, then enter new {0} and repeat (confirm in each case).</html>
-unblock.pinpad=<html>Enter {0} ({1} digits) on cardreader (and confirm).</html>
-activate.success=<html>{0} successfully activated</html>
-change.success=<html>{0} successfully changed</html>
-
-label.activation=<html>e-card activation process</html>
-label.activation.step=<html>Step {0}</html>
-label.activation.idle=<html>Wait for server...</html>
-label.old.pin=<html>Old {0}:</html>
-label.new.pin=<html>New {0}:</html>
-label.repeat.pin=<html>Confirmation:</html>
-
-button.activate=Activate
-button.change=Change
-button.unblock=Unblock
-button.verify=Query
-
-help.activation=help.activation
-help.pin.mgmt=help.pin.mgmt
-
-err.status=<html>PIN statuses could not be read.</html>
-err.activate=<html>An error occured during the activation of {0}.</html>
-err.change=<html>An error occured during the changing of {0}.</html>
-err.unblock=<html>Unblocking of {0} is not supported.</html>
-err.retries=<html>Wrong {0}, {1} tries remaining</html>
-err.locked=<html>{0} locked</html>
-err.not.active=<html>{0} not activated.</html>
-err.pin.format=<html>Invalid {0} length, {1} digit(s) required.</html>
-err.pin.confirmation=<html>{0} and confirmation do not match.</html>
-err.pin.operation.aborted=<html>The operation on {0} was aborted.</html>
-err.unsupported.card=<html>This card is not supported</html>
-
-status.not.active=NOT ACTIVE
-status.active=ACTIVE
-status.blocked=BLOCKED
-status.unknown=UNKNOWN
diff --git a/BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java b/BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java
deleted file mode 100644
index 95c5c678..00000000
--- a/BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-* 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.
-*/
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package at.gv.egiz.bku.gui;
-
-import java.awt.Container;
-import java.awt.Dimension;
-import javax.swing.JFrame;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- *
- * @author clemens
- */
-@Ignore
-public class ActivationGuiTest {
-
-    @Test
-    public void testBKUGUI() {
-        JFrame testFrame = new JFrame("BKUGUITest");
-        Container contentPane = testFrame.getContentPane();
-        contentPane.setPreferredSize(new Dimension(152, 145));
-//        contentPane.setPreferredSize(new Dimension(300, 190));
-        ActivationGUIFacade gui = new ActivationGUI(contentPane, null, BKUGUIFacade.Style.tiny, null, null);
-        BKUGUIWorker worker = new BKUGUIWorker();
-        worker.init(gui);
-        testFrame.pack();
-        testFrame.setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
-        testFrame.setVisible(true);
-        new Thread(worker).start();
-        
-        while(true) ;
-    }
-    
-    @Test
-    public void dummyTest() {
-    }
-    
-//    public static void main(String[] args) {
-//        new BKUGUITest().testBKUGUI();
-//    }
-}
diff --git a/BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java b/BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
deleted file mode 100644
index b01abe72..00000000
--- a/BKUAppletExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * 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.
- */
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package at.gv.egiz.bku.gui;
-
-import at.gv.egiz.smcc.PINSpec;
-import at.gv.egiz.stal.HashDataInput;
-import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @author clemens
- */
-public class BKUGUIWorker implements Runnable {
-
-  ActivationGUIFacade gui;
-
-  public void init(ActivationGUIFacade gui) {
-    this.gui = gui;
-  }
-
-  @Override
-  public void run() {
-        try {
-
-    final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Signatur-PIN", (byte)0x00, null);
-
-
-    final ActionListener cancelListener = new ActionListener() {
-
-      public void actionPerformed(ActionEvent e) {
-        System.out.println("CANCEL EVENT OCCURED: " + e);
-      }
-    };
-    ActionListener okListener = new ActionListener() {
-
-      @Override
-      public void actionPerformed(ActionEvent e) {
-        System.out.println("OK EVENT OCCURED: " + e);
-      }
-    };
-    final ActionListener signListener = new ActionListener() {
-
-      public void actionPerformed(ActionEvent e) {
-        System.out.println("SIGN EVENT OCCURED: " + e);
-      }
-    };
-    ActionListener hashdataListener = new ActionListener() {
-
-      public void actionPerformed(ActionEvent e) {
-        System.out.println("HASHDATA EVENT OCCURED: " + e);
-        ActionListener returnListener = new ActionListener() {
-
-          @Override
-          public void actionPerformed(ActionEvent e) {
-            gui.showSignaturePINDialog(signPinSpec, -1, signListener, "sign", cancelListener, "cancel", null, "hashdata");
-          }
-        };
-        HashDataInput signedRef1 = new ByteArrayHashDataInput(
-                "Ich bin ein einfacher Text mit Umlauten: öäüßéç@€\n123\n456\n\tHello, world!\n\nlkjsd\nnksdjf".getBytes(), 
-                "ref-id-0000000000000000000000001", 
-                "text/plain", 
-                "UTF-8");
-        
-        HashDataInput signedRef2 = new ByteArrayHashDataInput(
-                "<xml>HashDataInput_002</xml>".getBytes(), 
-                "ref-id-000000002", 
-                "application/xhtml+xml", 
-                "UTF-8");
-        
-        HashDataInput signedRef3 = new ByteArrayHashDataInput(
-                "<xml>HashDataInput_003</xml>".getBytes(), 
-                "ref-id-000000003", 
-                "application/xhtml+xml", 
-                "UTF-8");
-
-        HashDataInput signedRef4 = new ByteArrayHashDataInput(
-                "<xml>HashDataInput_004</xml>".getBytes(), 
-                "ref-id-000000004", 
-                "text/xml", 
-                "UTF-8");
-
-        //
-        List<HashDataInput> signedRefs = new ArrayList();
-        signedRefs.add(signedRef1);
-                    signedRefs.add(signedRef2);
-                    signedRefs.add(signedRef3);
-                    signedRefs.add(signedRef4);
-//                    signedRefs.add(signedRef4);
-//                    signedRefs.add(signedRef4);
-//                    signedRefs.add(signedRef4);
-//                    signedRefs.add(signedRef4);
-//                    signedRefs = Collections.singletonList(signedRef1);
-        gui.showSecureViewer(signedRefs, returnListener, "return");
-      }
-    };
-
-
-
-//        gui.showWelcomeDialog();
-//
-//        Thread.sleep(2000);
-//        
-//        gui.showWaitDialog(null);
-//        
-//        Thread.sleep(1000);
-//        
-//        gui.showWaitDialog("test");
-//        
-//        Thread.sleep(1000);
-//          
-//
-//            gui.showInsertCardDialog(cancelListener, "cancel");
-//
-//            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");
-//
-//            Thread.sleep(4000);
-//
-
-//            gui.showErrorDialog(BKUGUIFacade.ERR_NO_PCSC, null, null, null);
-    
-//            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.showActivationProgressDialog(1, 3, null, null);
-
-    gui.incrementProgress();
-
-    Thread.sleep(1000);
-
-    gui.incrementProgress();
-
-    Thread.sleep(1000);
-
-    gui.incrementProgress();
-
-
-    Thread.sleep(1000);
-
-    gui.showIdleDialog(null, null);
-
-//            gui.showTextPlainHashDataInput("hallo,\n welt!", "12345", null, "cancel", null, "save");
-//            gui.showTextPlainHashDataInput("hallo,\n welt!", "12345", null, "cancel", null, "save");
-//            Thread.sleep(2000);
-
-        } catch (InterruptedException ex) {
-            ex.printStackTrace();
-        }
-  }
-}
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 393a5756..ef6e6692 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -7,7 +7,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
-    <name>BKU Common GUI</name>
+    <name>BKU GUI</name>
     <version>1.2.2-SNAPSHOT</version>
     <dependencies>
         <dependency>
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index de9a91b9..2663e8bf 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -132,7 +132,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
 
           log.debug("scheduling gui initialization");
       
-            SwingUtilities.invokeAndWait(new Runnable() {
+            SwingUtilities.invokeLater(new Runnable() {
 
                 @Override
                 public void run() {
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
new file mode 100644
index 00000000..87520232
--- /dev/null
+++ b/BKUGuiExt/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>bku</artifactId>
+    <groupId>at.gv.egiz</groupId>
+    <version>1.2.2-SNAPSHOT</version>
+  </parent>
+  <groupId>at.gv.egiz</groupId>
+  <artifactId>BKUGuiExt</artifactId>
+  <version>1.2.2-SNAPSHOT</version>
+  <name>BKU GUI Extension</name>
+  <dependencies>
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>STALXService</artifactId>
+      <version>1.2.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>smccSTAL</artifactId>
+      <version>1.2.2-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java
new file mode 100644
index 00000000..c8927e1e
--- /dev/null
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java
@@ -0,0 +1,250 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.bku.gui.*;
+import java.awt.Container;
+import java.awt.Cursor;
+import java.awt.event.ActionListener;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.ResourceBundle;
+import javax.swing.GroupLayout;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JProgressBar;
+import javax.swing.LayoutStyle;
+import javax.swing.SwingUtilities;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class ActivationGUI extends CardMgmtGUI implements ActivationGUIFacade {
+
+  public static final String TITLE_ACTIVATION = "title.activation";
+  public static final String LABEL_ACTIVATION = "label.activation";
+  public static final String LABEL_ACTIVATION_STEP = "label.activation.step";
+  public static final String LABEL_ACTIVATION_IDLE = "label.activation.idle";
+
+  public static final String HELP_ACTIVATION = "help.activation";
+  
+  protected JProgressBar progressBar;
+  
+  public ActivationGUI(Container contentPane,
+          Locale locale,
+          Style guiStyle,
+          URL backgroundImgURL,
+          AbstractHelpListener helpListener) {
+    super(contentPane, locale, guiStyle, backgroundImgURL, helpListener);
+
+    progressBar = new JProgressBar();
+  }
+
+  @Override
+  public void showActivationProgressDialog(final int currentStep, final int maxProgress, final ActionListener cancelListener, final String cancelCommand) {
+
+    log.debug("scheduling activation progress dialog (step " + currentStep + ")");
+
+    SwingUtilities.invokeLater(new Runnable() {
+      
+      @Override
+      public void run() {
+
+        log.debug("show activation progress dialog (step " + currentStep + ")");
+
+        mainPanel.removeAll();
+        buttonPanel.removeAll();
+
+        mainPanel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+
+
+        JLabel infoLabel = new JLabel();
+        infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+
+        if (renderHeaderPanel) {
+          titleLabel.setText(cardmgmtMessages.getString(TITLE_ACTIVATION));
+          infoLabel.setText(cardmgmtMessages.getString(LABEL_ACTIVATION));
+        } else {
+          infoLabel.setText(cardmgmtMessages.getString(TITLE_ACTIVATION));
+        }
+
+        helpListener.setHelpTopic(HELP_ACTIVATION);
+
+        progressBar.setIndeterminate(false);
+        progressBar.setStringPainted(true);
+        progressBar.setString(null); //reset to percentage
+        progressBar.setMinimum(0);
+        progressBar.setMaximum(maxProgress);
+
+        JLabel stepLabel = new JLabel();
+        stepLabel.setFont(stepLabel.getFont().deriveFont(stepLabel.getFont().getStyle() & ~java.awt.Font.BOLD, stepLabel.getFont().getSize()-2));
+        String stepPattern = cardmgmtMessages.getString(LABEL_ACTIVATION_STEP);
+        stepLabel.setText(MessageFormat.format(stepPattern, new Object[]{ currentStep }));
+
+        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+        mainPanel.setLayout(mainPanelLayout);
+
+        GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup().addComponent(infoLabel);
+        GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(infoLabel);
+
+        if (!renderHeaderPanel) {
+          infoHorizontal.addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE).addComponent(helpLabel);
+          infoVertical.addComponent(helpLabel);
+        }
+
+        mainPanelLayout.setHorizontalGroup(
+                mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addGroup(infoHorizontal)
+                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(stepLabel)
+                    .addComponent(progressBar)));
+
+        mainPanelLayout.setVerticalGroup(
+                mainPanelLayout.createSequentialGroup()
+                  .addGroup(infoVertical)
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                  .addGroup(mainPanelLayout.createSequentialGroup()
+                    .addComponent(stepLabel)
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addComponent(progressBar)));
+
+          JButton cancelButton = new JButton();
+          cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+          cancelButton.setText(messages.getString(BUTTON_CANCEL));
+          cancelButton.addActionListener(cancelListener);
+          cancelButton.setActionCommand(cancelCommand);
+
+          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+          buttonPanel.setLayout(buttonPanelLayout);
+
+          buttonPanelLayout.setHorizontalGroup(
+            buttonPanelLayout.createSequentialGroup()
+                  .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                  .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+          buttonPanelLayout.setVerticalGroup(
+            buttonPanelLayout.createSequentialGroup()
+              .addComponent(cancelButton));
+
+        contentPanel.validate();
+
+      }
+    });
+
+  }
+
+  @Override
+  public void incrementProgress() {
+    SwingUtilities.invokeLater(new Runnable() {
+
+      @Override
+      public void run() {
+        progressBar.setValue(progressBar.getValue() + 1);
+      }
+    });
+    
+  }
+
+  @Override
+  public void showIdleDialog(final ActionListener cancelListener, final String cancelCommand) {
+    log.debug("scheduling idle dialog");
+
+    SwingUtilities.invokeLater(new Runnable() {
+
+      @Override
+      public void run() {
+
+        log.debug("show idle dialog");
+
+        mainPanel.removeAll();
+        buttonPanel.removeAll();
+
+        mainPanel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+
+
+        JLabel infoLabel = new JLabel();
+        infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+
+        if (renderHeaderPanel) {
+          titleLabel.setText(cardmgmtMessages.getString(TITLE_ACTIVATION));
+          infoLabel.setText(cardmgmtMessages.getString(LABEL_ACTIVATION));
+        } else {
+          infoLabel.setText(cardmgmtMessages.getString(TITLE_ACTIVATION));
+        }
+
+        helpListener.setHelpTopic(HELP_ACTIVATION);
+
+        progressBar.setIndeterminate(true);
+        progressBar.setStringPainted(true);
+        progressBar.setString(""); //not string painted progressbar is smaller
+
+        JLabel stepLabel = new JLabel();
+        stepLabel.setFont(stepLabel.getFont().deriveFont(stepLabel.getFont().getStyle() & ~java.awt.Font.BOLD, stepLabel.getFont().getSize()-2));
+        stepLabel.setText(cardmgmtMessages.getString(LABEL_ACTIVATION_IDLE));
+
+        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+        mainPanel.setLayout(mainPanelLayout);
+
+        GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup().addComponent(infoLabel);
+        GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(infoLabel);
+
+        if (!renderHeaderPanel) {
+          infoHorizontal.addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE).addComponent(helpLabel);
+          infoVertical.addComponent(helpLabel);
+        }
+
+        mainPanelLayout.setHorizontalGroup(
+                mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addGroup(infoHorizontal)
+                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(stepLabel)
+                    .addComponent(progressBar)));
+
+        mainPanelLayout.setVerticalGroup(
+                mainPanelLayout.createSequentialGroup()
+                  .addGroup(infoVertical)
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                  .addGroup(mainPanelLayout.createSequentialGroup()
+                    .addComponent(stepLabel)
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addComponent(progressBar)));
+
+          JButton cancelButton = new JButton();
+          cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+          cancelButton.setText(messages.getString(BUTTON_CANCEL));
+          cancelButton.addActionListener(cancelListener);
+          cancelButton.setActionCommand(cancelCommand);
+
+          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+          buttonPanel.setLayout(buttonPanelLayout);
+
+          buttonPanelLayout.setHorizontalGroup(
+            buttonPanelLayout.createSequentialGroup()
+                  .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                  .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
+          buttonPanelLayout.setVerticalGroup(
+            buttonPanelLayout.createSequentialGroup()
+              .addComponent(cancelButton));
+
+        contentPanel.validate();
+
+      }
+    });
+
+  }
+}
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUIFacade.java
new file mode 100644
index 00000000..3fc14d04
--- /dev/null
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUIFacade.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.bku.gui.*;
+import java.awt.event.ActionListener;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public interface ActivationGUIFacade extends BKUGUIFacade {
+
+  public void showActivationProgressDialog(int currentStep, int maxProgress, ActionListener cancelListener, String cancelCommand);
+
+  public void incrementProgress();
+
+  public void showIdleDialog(ActionListener cancelListener, String cancelCommand);
+
+}
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java
new file mode 100644
index 00000000..c8e1826c
--- /dev/null
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.bku.gui.*;
+import java.awt.Container;
+import java.net.URL;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+/**
+ * Common superclass for Activation and PinManagement GUIs
+ * 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class CardMgmtGUI extends BKUGUIImpl {
+
+  public static final String CARDMGMT_MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/ActivationMessages";
+
+  protected ResourceBundle cardmgmtMessages;
+
+  public CardMgmtGUI(Container contentPane,
+          Locale locale,
+          Style guiStyle,
+          URL backgroundImgURL,
+          AbstractHelpListener helpListener) {
+    super(contentPane, locale, guiStyle, backgroundImgURL, helpListener);
+
+  }
+
+  @Override
+  protected void loadMessageBundle(Locale locale) {
+    super.loadMessageBundle(locale);
+
+    if (locale != null) {
+        Locale lang = new Locale(locale.getLanguage().substring(0,2));
+        log.debug("loading applet resources for language: " + lang.toString());
+        cardmgmtMessages = ResourceBundle.getBundle(CARDMGMT_MESSAGES_BUNDLE, lang);
+    } else {
+        cardmgmtMessages = ResourceBundle.getBundle(CARDMGMT_MESSAGES_BUNDLE);
+    }
+  }
+
+  @Override
+  protected String getMessage(String key) {
+    if (super.hasMessage(key)) {
+      return super.getMessage(key);
+    }
+    return cardmgmtMessages.getString(key);
+  }
+
+  @Override
+  protected boolean hasMessage(String key) {
+    return (cardmgmtMessages.containsKey(key) || super.hasMessage(key));
+  }
+}
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
new file mode 100644
index 00000000..3d503510
--- /dev/null
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
@@ -0,0 +1,670 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.bku.gui.*;
+import at.gv.egiz.smcc.PINSpec;
+import java.awt.Container;
+import java.awt.Cursor;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.Map;
+import javax.swing.GroupLayout;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPasswordField;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.LayoutStyle;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * TODO pull out ResourceBundle to common superclass for activationGUI and pinMgmtGUI
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFacade {
+
+  protected static final Log log = LogFactory.getLog(PINManagementGUI.class);
+  
+  /** remember the pinfield to return to worker */
+  protected JPasswordField oldPinField;
+  /** remember the pinSpec to return to worker */
+  protected PINSpec pinSpec;
+
+  public PINManagementGUI(Container contentPane,
+          Locale locale,
+          Style guiStyle,
+          URL backgroundImgURL,
+          AbstractHelpListener helpListener) {
+    super(contentPane, locale, guiStyle, backgroundImgURL, helpListener);
+  }
+
+  @Override
+  public char[] getOldPin() {
+    if (oldPinField != null) {
+      char[] pin = oldPinField.getPassword();
+      oldPinField = null;
+      return pin;
+    }
+    return null;
+  }
+
+  @Override
+  public PINSpec getSelectedPINSpec() {
+    return pinSpec;
+  }
+
+  @Override
+  public void showPINManagementDialog(final Map<PINSpec, STATUS> pins, 
+          final ActionListener activateListener,
+          final String activateCmd,
+          final String changeCmd,
+          final String unblockCmd,
+          final String verifyCmd,
+          final ActionListener cancelListener,
+          final String cancelCmd) {
+
+      log.debug("scheduling PIN managment dialog");
+    
+      SwingUtilities.invokeLater(new Runnable() {
+
+        @Override
+        public void run() {
+          log.debug("show PIN management dialog");
+
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+                helpListener.setHelpTopic(HELP_PINMGMT);
+
+                JLabel mgmtLabel = new JLabel();
+                mgmtLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+
+                if (renderHeaderPanel) {
+                  titleLabel.setText(getMessage(TITLE_PINMGMT));
+                  String infoPattern = getMessage(MESSAGE_PINMGMT);
+                  mgmtLabel.setText(MessageFormat.format(infoPattern, pins.size()));
+                } else {
+                  mgmtLabel.setText(getMessage(TITLE_PINMGMT));
+                }
+
+                final PINStatusTableModel tableModel = new PINStatusTableModel(pins);
+                final JTable pinStatusTable = new JTable(tableModel);
+                pinStatusTable.setDefaultRenderer(PINSpec.class, new PINSpecRenderer());
+                pinStatusTable.setDefaultRenderer(STATUS.class, new PINStatusRenderer(cardmgmtMessages));
+                pinStatusTable.setTableHeader(null);
+                pinStatusTable.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+//                pinStatusTable.addMouseMotionListener(new MouseMotionAdapter() {
+//
+//                  @Override
+//                  public void mouseMoved(MouseEvent e) {
+//                    if (pinStatusTable.columnAtPoint(e.getPoint()) == 0) {
+//                      pinStatusTable.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+//                    } else {
+//                      pinStatusTable.setCursor(Cursor.getDefaultCursor());
+//                    }
+//                  }
+//                });
+
+                final JButton activateButton = new JButton();
+                activateButton.setFont(activateButton.getFont().deriveFont(activateButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                activateButton.addActionListener(activateListener);
+
+                pinStatusTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+                pinStatusTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+
+                  @Override
+                  public void valueChanged(final ListSelectionEvent e) {
+                    //invoke later to allow thread to paint selection background
+                    SwingUtilities.invokeLater(new Runnable() {
+
+                      @Override
+                      public void run() {
+                        ListSelectionModel lsm = (ListSelectionModel) e.getSource();
+                        int selectionIdx = lsm.getMinSelectionIndex();
+                        if (selectionIdx >= 0) {
+                          pinSpec = (PINSpec) tableModel.getValueAt(selectionIdx, 0);
+                          STATUS status = (STATUS) tableModel.getValueAt(selectionIdx, 1);
+
+                          if (status == STATUS.NOT_ACTIV) {
+                            activateButton.setText(getMessage(BUTTON_ACTIVATE));
+                            activateButton.setEnabled(true);
+                            activateButton.setActionCommand(activateCmd);
+                          } else if (status == STATUS.BLOCKED) {
+                            activateButton.setText(getMessage(BUTTON_UNBLOCK));
+                            activateButton.setEnabled(true);
+                            activateButton.setActionCommand(unblockCmd);
+                          } else if (status == STATUS.ACTIV) {
+                            activateButton.setText(getMessage(BUTTON_CHANGE));
+                            activateButton.setEnabled(true);
+                            activateButton.setActionCommand(changeCmd);
+                          } else if (status == STATUS.UNKNOWN) {
+                            activateButton.setText(getMessage(BUTTON_VERIFY));
+                            activateButton.setEnabled(true);
+                            activateButton.setActionCommand(verifyCmd);
+                          }
+                        }
+                      }
+                    });
+                  }
+                });
+
+                //select first entry
+                pinStatusTable.getSelectionModel().setSelectionInterval(0, 0);
+
+                JScrollPane pinStatusScrollPane = new JScrollPane(pinStatusTable);
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
+                        .addComponent(mgmtLabel);
+                GroupLayout.Group messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                        .addComponent(mgmtLabel);
+                if (!renderHeaderPanel) {
+                  messageHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel);
+                  messageVertical
+                          .addComponent(helpLabel);
+                }
+
+                mainPanelLayout.setHorizontalGroup(
+                mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addGroup(messageHorizontal)
+                  .addComponent(pinStatusScrollPane, 0, 0, Short.MAX_VALUE));
+
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createSequentialGroup()
+                    .addGroup(messageVertical)
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addComponent(pinStatusScrollPane, 0, 0, pinStatusTable.getPreferredSize().height+3));
+
+                JButton cancelButton = new JButton();
+                cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                cancelButton.setText(getMessage(BUTTON_CLOSE));
+                cancelButton.setActionCommand(cancelCmd);
+                cancelButton.addActionListener(cancelListener);
+
+                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                buttonPanel.setLayout(buttonPanelLayout);
+
+                GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
+                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(activateButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+
+                GroupLayout.Group buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                          .addComponent(activateButton)
+                          .addComponent(cancelButton);
+
+                buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
+                buttonPanelLayout.setVerticalGroup(buttonVertical);
+
+                contentPanel.validate();
+        }
+      });
+  }
+
+  @Override
+  public void showPINDialog(DIALOG type, PINSpec pinSpec,
+          ActionListener okListener, String okCommand,
+          ActionListener cancelListener, String cancelCommand) {
+    showPINDialog(type, pinSpec, -1, false,
+            okListener, okCommand, cancelListener, cancelCommand);
+  }
+
+  @Override
+  public void showPINDialog(DIALOG type, PINSpec pinSpec, int retries,
+          ActionListener okListener, String okCommand,
+          ActionListener cancelListener, String cancelCommand) {
+    showPINDialog(type, pinSpec, retries, false,
+            okListener, okCommand, cancelListener, cancelCommand);
+  }
+
+  @Override
+  public void showPinpadPINDialog(DIALOG type, PINSpec pinSpec, int retries) {
+    String title, msg;
+    Object[] params;
+    if (retries < 0) {
+      params = new Object[2];
+      if (shortText) {
+        params[0] = "PIN";
+      } else {
+        params[0] = pinSpec.getLocalizedName();
+      }
+      params[1] = pinSpec.getLocalizedLength();
+      if (type == DIALOG.CHANGE) {
+        log.debug("show change pin dialog");
+        title = TITLE_CHANGE_PIN;
+        msg = MESSAGE_CHANGEPIN_PINPAD;
+      } else if (type == DIALOG.ACTIVATE) {
+        log.debug("show activate pin dialog");
+        title = TITLE_ACTIVATE_PIN;
+        msg = MESSAGE_ENTERPIN_PINPAD;
+      } else if (type == DIALOG.VERIFY) {
+        log.debug("show verify pin dialog");
+        title = TITLE_VERIFY_PIN;
+        msg = MESSAGE_ENTERPIN_PINPAD;
+      } else {
+        log.debug("show unblock pin dialog");
+        title = TITLE_UNBLOCK_PIN;
+        msg = MESSAGE_ENTERPIN_PINPAD;
+      }
+
+    } else {
+      log.debug("show retry pin dialog");
+      title = TITLE_RETRY;
+      msg = (retries < 2) ?
+        MESSAGE_LAST_RETRY : MESSAGE_RETRIES;
+      params = new Object[] {String.valueOf(retries)};
+    }
+    showMessageDialog(title, msg, params);
+  }
+
+  private void showPINDialog(final DIALOG type, final PINSpec pinSpec,
+          final int retries, final boolean pinpad,
+          final ActionListener okListener, final String okCommand,
+          final ActionListener cancelListener, final String cancelCommand) {
+
+    log.debug("scheduling pin dialog");
+
+      SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+
+              String HELP_TOPIC, TITLE, MESSAGE_MGMT, MESSAGE_MGMT_PARAM, PINSIZE;
+              HELP_TOPIC = HELP_PINMGMT;
+
+              PINSIZE = (pinSpec.getMaxLength() > pinSpec.getMinLength()) ?
+                pinSpec.getMinLength() + "-" + pinSpec.getMaxLength() :
+                String.valueOf(pinSpec.getMinLength());
+
+              if (retries < 0) {
+                if (type == DIALOG.CHANGE) {
+                  log.debug("show change pin dialog");
+                  TITLE = TITLE_CHANGE_PIN;
+                  MESSAGE_MGMT = MESSAGE_CHANGE_PIN;
+                } else if (type == DIALOG.ACTIVATE) {
+                  log.debug("show activate pin dialog");
+                  TITLE = TITLE_ACTIVATE_PIN;
+                  MESSAGE_MGMT = MESSAGE_ACTIVATE_PIN;
+                  oldPinField = null;
+                  PINSIZE = pinSpec.getLocalizedLength();
+                } else if (type == DIALOG.VERIFY) {
+                  log.debug("show verify pin dialog");
+                  TITLE = TITLE_VERIFY_PIN;
+                  MESSAGE_MGMT = MESSAGE_VERIFY_PIN;
+                } else {
+                  log.debug("show unblock pin dialog");
+                  TITLE = TITLE_UNBLOCK_PIN;
+                  MESSAGE_MGMT = MESSAGE_UNBLOCK_PIN;
+                }
+                if (shortText) {
+                  MESSAGE_MGMT_PARAM = "PIN";
+                } else {
+                  MESSAGE_MGMT_PARAM = pinSpec.getLocalizedName();
+                }
+              } else {
+                log.debug("show retry pin dialog");
+                TITLE = TITLE_RETRY;
+                MESSAGE_MGMT = (retries < 2) ?
+                  MESSAGE_LAST_RETRY : MESSAGE_RETRIES;
+                MESSAGE_MGMT_PARAM = String.valueOf(retries);
+              }
+
+                mainPanel.removeAll();
+                buttonPanel.removeAll();
+
+                helpListener.setHelpTopic(HELP_TOPIC);
+
+                JLabel mgmtLabel = new JLabel();
+                if (retries < 0) {
+                  mgmtLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~Font.BOLD));
+                } else {
+                  mgmtLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() | Font.BOLD));
+                  mgmtLabel.setForeground(ERROR_COLOR);
+                  helpListener.setHelpTopic(HELP_RETRY);
+                }
+
+                if (renderHeaderPanel) {
+                  titleLabel.setText(getMessage(TITLE));
+                  String mgmtPattern = getMessage(MESSAGE_MGMT);
+                  mgmtLabel.setText(MessageFormat.format(mgmtPattern, MESSAGE_MGMT_PARAM));
+                } else {
+                  mgmtLabel.setText(getMessage(TITLE));
+                }
+
+                ////////////////////////////////////////////////////////////////
+                // COMMON LAYOUT SECTION
+                ////////////////////////////////////////////////////////////////
+
+                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+                mainPanel.setLayout(mainPanelLayout);
+
+                GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
+                          .addComponent(mgmtLabel);
+                GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                          .addComponent(mgmtLabel);
+
+                if (!renderHeaderPanel) {
+                  infoHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                          .addComponent(helpLabel);
+                  infoVertical
+                          .addComponent(helpLabel);
+                }
+
+                GroupLayout.ParallelGroup pinHorizontal;
+                GroupLayout.SequentialGroup pinVertical;
+
+                if (pinpad) {
+                  JLabel pinpadLabel = new JLabel();
+                  pinpadLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~Font.BOLD));
+                  String pinpadPattern = getMessage(MESSAGE_VERIFYPIN_PINPAD);
+                  pinpadLabel.setText(MessageFormat.format(pinpadPattern,
+                          new Object[] { pinSpec.getLocalizedName(), PINSIZE }));
+                  
+                  pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                          .addComponent(pinpadLabel);
+                  pinVertical = mainPanelLayout.createSequentialGroup()
+                          .addComponent(pinpadLabel);
+                } else {
+
+                JButton okButton = new JButton();
+                okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~Font.BOLD));
+                okButton.setText(getMessage(BUTTON_OK));
+                okButton.setEnabled(pinSpec.getMinLength() <= 0);
+                okButton.setActionCommand(okCommand);
+                okButton.addActionListener(okListener);
+
+                JLabel oldPinLabel = null;
+                JLabel repeatPinLabel = null;
+                JLabel pinLabel = new JLabel();
+                pinLabel.setFont(pinLabel.getFont().deriveFont(pinLabel.getFont().getStyle() & ~Font.BOLD));
+                String pinLabelPattern = (type == DIALOG.CHANGE) ? getMessage(LABEL_NEW_PIN) : getMessage(LABEL_PIN);
+                pinLabel.setText(MessageFormat.format(pinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
+
+                final JPasswordField repeatPinField = new JPasswordField();
+                pinField = new JPasswordField();
+                pinField.setText("");
+                pinField.setActionCommand(okCommand);
+                pinField.addActionListener(new ActionListener() {
+
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        if (pinField.getPassword().length >= pinSpec.getMinLength()) {
+                          if (type == DIALOG.VERIFY) {
+                            okListener.actionPerformed(e);
+                          } else {
+                            repeatPinField.requestFocusInWindow();
+                          }
+                        }
+                    }
+                });
+
+                if (type != DIALOG.VERIFY) {
+                  pinField.setDocument(new PINDocument(pinSpec, null));
+                  repeatPinLabel = new JLabel();
+                  repeatPinLabel.setFont(pinLabel.getFont());
+                  String repeatPinLabelPattern = getMessage(LABEL_REPEAT_PIN);
+                  repeatPinLabel.setText(MessageFormat.format(repeatPinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
+
+                  repeatPinField.setText("");
+//                  repeatPinField.setDocument(new PINDocument(pinSpec, okButton, pinField.getDocument()));
+                  repeatPinField.setActionCommand(okCommand);
+                  repeatPinField.addActionListener(new ActionListener() {
+
+                      @Override
+                      public void actionPerformed(ActionEvent e) {
+                          if (pinField.getPassword().length >= pinSpec.getMinLength()) {
+                              okListener.actionPerformed(e);
+                          }
+                      }
+                  });
+
+                  if (type == DIALOG.CHANGE) {
+                    oldPinLabel = new JLabel();
+                    oldPinLabel.setFont(oldPinLabel.getFont().deriveFont(oldPinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+                    String oldPinLabelPattern = getMessage(LABEL_OLD_PIN);
+                    oldPinLabel.setText(MessageFormat.format(oldPinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
+
+                    oldPinField = new JPasswordField();
+                    oldPinField.setText("");
+                    oldPinField.setDocument(new PINDocument(pinSpec, null));
+                    oldPinField.setActionCommand(okCommand);
+                    oldPinField.addActionListener(new ActionListener() {
+
+                        @Override
+                        public void actionPerformed(ActionEvent e) {
+                            if (oldPinField.getPassword().length >= pinSpec.getMinLength()) {
+                              pinField.requestFocusInWindow();
+                            }
+                        }
+                    });
+
+                    repeatPinField.setDocument(new PINDocument(
+                            pinSpec, okButton,
+                            pinField.getDocument(), oldPinField.getDocument()));
+                  } else {
+                    // else -> ACTIVATE (not verify, not change)
+                    repeatPinField.setDocument(new PINDocument(
+                            pinSpec, okButton, pinField.getDocument()));
+                  }
+                } else {
+                  pinField.setDocument(new PINDocument(pinSpec, okButton));
+                }
+
+                JLabel pinsizeLabel = new JLabel();
+                pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~Font.BOLD, pinsizeLabel.getFont().getSize()-2));
+                String pinsizePattern = getMessage(LABEL_PINSIZE);
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{PINSIZE}));
+
+                ////////////////////////////////////////////////////////////////
+                // NON-PINPAD SPECIFIC LAYOUT SECTION
+                ////////////////////////////////////////////////////////////////
+
+                pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
+                pinVertical = mainPanelLayout.createSequentialGroup();
+
+//                if (pinLabelPos == PinLabelPosition.ABOVE) {
+//                  if (changePin) {
+//                      pinHorizontal
+//                              .addComponent(oldPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+//                              .addComponent(oldPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE);
+//                      pinVertical
+//                              .addComponent(oldPinLabel)
+//                              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+//                              .addComponent(oldPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+//                              .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
+//                  }
+//                  pinHorizontal
+//                          .addComponent(pinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+//                          .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+//                          .addComponent(repeatPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+//                          .addComponent(repeatPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+//                          .addGroup(mainPanelLayout.createSequentialGroup()
+//                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+//                            .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
+//                  pinVertical
+//                          .addComponent(pinLabel)
+//                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+//                          .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+//                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+//                          .addComponent(repeatPinLabel)
+//                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+//                          .addComponent(repeatPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+//                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+//                          .addComponent(pinsizeLabel);
+//                } else {
+
+
+                  if (type == DIALOG.CHANGE) {
+                    pinHorizontal
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                              .addComponent(oldPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                              .addComponent(pinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                              .addComponent(repeatPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                            .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                              .addComponent(oldPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                              .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                              .addComponent(repeatPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
+
+                    pinVertical
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(oldPinLabel)
+                            .addComponent(oldPinField))
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(pinLabel)
+                            .addComponent(pinField))
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(repeatPinLabel)
+                            .addComponent(repeatPinField))
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
+                  } else if (type == DIALOG.ACTIVATE) {
+                    pinHorizontal
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                              .addComponent(pinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                              .addComponent(repeatPinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                            .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                              .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                              .addComponent(repeatPinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
+
+                    pinVertical
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(pinLabel)
+                            .addComponent(pinField))
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(repeatPinLabel)
+                            .addComponent(repeatPinField))
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
+                  } else { // VERIFY
+                    pinHorizontal
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addComponent(pinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                            .addComponent(pinField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE));
+
+                    pinVertical
+                          .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                            .addComponent(pinLabel)
+                            .addComponent(pinField))
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED);
+                  }
+                  pinHorizontal
+                          .addGroup(mainPanelLayout.createSequentialGroup()
+                            .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                            .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE));
+                  pinVertical
+                          .addComponent(pinsizeLabel);
+
+                  GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+                  buttonPanel.setLayout(buttonPanelLayout);
+
+                  GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
+                          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                          .addComponent(okButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                  GroupLayout.Group buttonVertical;
+
+                  JButton cancelButton = new JButton();
+                  cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+                  cancelButton.setText(getMessage(BUTTON_CANCEL));
+                  cancelButton.setActionCommand(cancelCommand);
+                  cancelButton.addActionListener(cancelListener);
+
+                  buttonHorizontal
+                          .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                  buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                          .addComponent(okButton)
+                          .addComponent(cancelButton);
+
+                  buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
+                  buttonPanelLayout.setVerticalGroup(buttonVertical);
+
+                  if (oldPinField != null) {
+                    oldPinField.requestFocusInWindow();
+                  } else {
+                    pinField.requestFocusInWindow();
+                  }
+
+                } // END NON-PINPAD SECTION
+
+                mainPanelLayout.setHorizontalGroup(
+                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addGroup(infoHorizontal)
+                    .addGroup(pinHorizontal));
+
+                mainPanelLayout.setVerticalGroup(
+                  mainPanelLayout.createSequentialGroup()
+                    .addGroup(infoVertical)
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addGroup(pinVertical));
+
+                contentPanel.validate();
+
+            }
+        });
+  }
+
+  @Override
+  protected int initButtonSize() {
+    int bs = super.initButtonSize();
+
+    JButton b = new JButton();
+    b.setText(getMessage(BUTTON_ACTIVATE));
+    if (b.getPreferredSize().width > bs) {
+      bs = b.getPreferredSize().width;
+    }
+    b.setText(getMessage(BUTTON_CHANGE));
+    if (b.getPreferredSize().width > bs) {
+      bs = b.getPreferredSize().width;
+    }
+    b.setText(getMessage(BUTTON_UNBLOCK));
+    if (b.getPreferredSize().width > bs) {
+      bs = b.getPreferredSize().width;
+    }
+    b.setText(getMessage(BUTTON_CANCEL));
+    if (b.getPreferredSize().width > bs) {
+      bs = b.getPreferredSize().width;
+    }
+
+    return bs;
+  }
+
+}
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
new file mode 100644
index 00000000..297173d9
--- /dev/null
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
@@ -0,0 +1,118 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.bku.gui.*;
+import at.gv.egiz.smcc.PINSpec;
+import java.awt.event.ActionListener;
+import java.util.Map;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public interface PINManagementGUIFacade extends BKUGUIFacade {
+
+  public static final String HELP_PINMGMT = "help.pin.mgmt";
+//  public static final String HELP_VERIFY_PIN = "help.pin.verify";
+  public static final String TITLE_PINMGMT = "title.pin.mgmt";
+  public static final String TITLE_ACTIVATE_PIN = "title.activate.pin";
+  public static final String TITLE_CHANGE_PIN = "title.change.pin";
+  public static final String TITLE_VERIFY_PIN = "title.verify.pin";
+  public static final String TITLE_UNBLOCK_PIN = "title.unblock.pin";
+  public static final String TITLE_ACTIVATE_SUCCESS = "title.activate.success";
+  public static final String TITLE_CHANGE_SUCCESS = "title.change.success";
+
+  // removed message.* prefix to reuse keys as help keys
+  public static final String MESSAGE_ACTIVATE_SUCCESS = "activate.success";
+  public static final String MESSAGE_CHANGE_SUCCESS = "change.success";
+  public static final String MESSAGE_PINMGMT = "pin.mgmt";
+//  public static final String MESSAGE_PINPAD = "pinpad";
+  public static final String MESSAGE_ACTIVATE_PIN = "activate.pin";
+  public static final String MESSAGE_CHANGE_PIN = "change.pin";
+  public static final String MESSAGE_VERIFY_PIN = "verify.pin";
+  public static final String MESSAGE_UNBLOCK_PIN = "unblock.pin";
+  public static final String MESSAGE_ACTIVATEPIN_PINPAD = "activate.pinpad";
+  public static final String MESSAGE_CHANGEPIN_PINPAD = "change.pinpad";
+  public static final String MESSAGE_VERIFYPIN_PINPAD = "verify.pinpad";
+  public static final String MESSAGE_UNBLOCKPIN_PINPAD = "unblock.pinpad";
+
+  public static final String LABEL_OLD_PIN = "label.old.pin";
+  public static final String LABEL_NEW_PIN = "label.new.pin";
+  public static final String LABEL_REPEAT_PIN = "label.repeat.pin";
+
+  public static final String ERR_STATUS = "err.status";
+  public static final String ERR_ACTIVATE = "err.activate";
+  public static final String ERR_CHANGE = "err.change";
+  public static final String ERR_UNBLOCK = "err.unblock";
+  public static final String ERR_VERIFY = "err.verify";
+  public static final String ERR_RETRIES = "err.retries";
+  public static final String ERR_LOCKED = "err.locked";
+  public static final String ERR_NOT_ACTIVE = "err.not.active";
+  public static final String ERR_PIN_FORMAT = "err.pin.format";
+  public static final String ERR_PIN_CONFIRMATION = "err.pin.confirmation";
+  public static final String ERR_PIN_OPERATION_ABORTED = "err.pin.operation.aborted";
+  public static final String ERR_UNSUPPORTED_CARD = "err.unsupported.card";
+
+  public static final String BUTTON_ACTIVATE = "button.activate";
+  public static final String BUTTON_UNBLOCK = "button.unblock";
+  public static final String BUTTON_CHANGE = "button.change";
+  public static final String BUTTON_VERIFY = "button.verify";
+
+  public static final String STATUS_ACTIVE = "status.active";
+  public static final String STATUS_BLOCKED = "status.blocked";
+  public static final String STATUS_NOT_ACTIVE = "status.not.active";
+  public static final String STATUS_UNKNOWN = "status.unknown";
+
+  public enum STATUS { ACTIV, NOT_ACTIV, BLOCKED, UNKNOWN };
+  public enum DIALOG { VERIFY, ACTIVATE, CHANGE, UNBLOCK };
+
+  public void showPINManagementDialog(Map<PINSpec, STATUS> pins,
+          ActionListener activateListener, String activateCmd, String changeCmd, String unblockCmd, String verifyCmd,
+          ActionListener cancelListener, String cancelCmd);
+
+  public void showPINDialog(DIALOG type, PINSpec pin,
+          ActionListener okListener, String okCmd,
+          ActionListener cancelListener, String cancelCmd);
+
+  public void showPINDialog(DIALOG type, PINSpec pin, int retries,
+          ActionListener okListener, String okCmd,
+          ActionListener cancelListener, String cancelCmd);
+
+  public void showPinpadPINDialog(DIALOG type, PINSpec pin, int retries);
+
+//  public void showActivatePINDialog(PINSpec pin,
+//          ActionListener okListener, String okCmd,
+//          ActionListener cancelListener, String cancelCmd);
+//
+//  public void showChangePINDialog(PINSpec pin,
+//          ActionListener okListener, String okCmd,
+//          ActionListener cancelListener, String cancelCmd);
+//
+//  public void showUnblockPINDialog(PINSpec pin,
+//          ActionListener okListener, String okCmd,
+//          ActionListener cancelListener, String cancelCmd);
+//
+//  public void showVerifyPINDialog(PINSpec pin,
+//          ActionListener okListener, String okCmd,
+//          ActionListener cancelListener, String cancelCmd);
+
+  public char[] getOldPin();
+
+  public PINSpec getSelectedPINSpec();
+}
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINSpecRenderer.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINSpecRenderer.java
new file mode 100644
index 00000000..e3d73e1f
--- /dev/null
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINSpecRenderer.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.smcc.PINSpec;
+import javax.swing.table.DefaultTableCellRenderer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PINSpecRenderer extends DefaultTableCellRenderer {
+
+  private static final Log log = LogFactory.getLog(PINSpecRenderer.class);
+
+  @Override
+  protected void setValue(Object value) {
+    PINSpec pinSpec = (PINSpec) value;
+    super.setText(pinSpec.getLocalizedName());
+  }
+
+}
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
new file mode 100644
index 00000000..83ff74f2
--- /dev/null
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.bku.gui.PINManagementGUIFacade.STATUS;
+import java.awt.Color;
+import java.awt.Font;
+import java.util.ResourceBundle;
+import javax.swing.table.DefaultTableCellRenderer;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PINStatusRenderer extends DefaultTableCellRenderer {
+  
+//  private static final Log log = LogFactory.getLog(PINStatusRenderer.class);
+
+  public static final Color RED = new Color(0.9f, 0.0f, 0.0f);
+  public static final Color GREEN = new Color(0.0f, 0.8f, 0.0f);
+  protected ResourceBundle messages;
+
+  public PINStatusRenderer(ResourceBundle messages) {
+    this.messages = messages;
+  }
+
+  @Override
+  protected void setValue(Object value) {
+    STATUS pinStatus = (STATUS) value;
+    super.setFont(super.getFont().deriveFont(super.getFont().getStyle() | Font.BOLD));
+      
+    if (pinStatus == STATUS.NOT_ACTIV) {
+      super.setForeground(RED);
+      super.setText("<html>" + messages.getString(PINManagementGUIFacade.STATUS_NOT_ACTIVE) + "</html>");
+    } else if (pinStatus == STATUS.ACTIV) {
+      super.setForeground(GREEN);
+      super.setText("<html>" + messages.getString(PINManagementGUIFacade.STATUS_ACTIVE) + "</html>");
+    } else if (pinStatus == STATUS.BLOCKED) {
+      super.setForeground(RED);
+      super.setText("<html>" + messages.getString(PINManagementGUIFacade.STATUS_BLOCKED) + "</html>");
+    } else {
+      super.setForeground(Color.BLACK);
+      super.setText("<html>" + messages.getString(PINManagementGUIFacade.STATUS_UNKNOWN) + "</html>");
+    }
+  }
+}
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java
new file mode 100644
index 00000000..052c13b2
--- /dev/null
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.bku.gui.PINManagementGUIFacade.STATUS;
+import at.gv.egiz.smcc.PINSpec;
+import java.util.Map;
+import javax.swing.table.DefaultTableModel;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PINStatusTableModel extends DefaultTableModel {
+
+//  protected static final Log log = LogFactory.getLog(PINStatusTableModel.class);
+  protected Class[] types;
+
+  public PINStatusTableModel(Map<PINSpec, STATUS> pinStatuses) {
+    super(0, 2);
+    if (pinStatuses == null) {
+      throw new RuntimeException("pinStatuses must not be null");
+    }
+//    log.trace(pinStatuses.size() + " PINs");
+    types = new Class[] { PINSpec.class, STATUS.class };
+    for (PINSpec pinSpec : pinStatuses.keySet()) {
+      addRow(new Object[] { pinSpec, pinStatuses.get(pinSpec) });
+    }
+//    PINSpec activePIN = new PINSpec(0, 1, null, "active-PIN", (byte) 0x01);
+//    PINSpec blockedPIN = new PINSpec(0, 1, null, "blocked-PIN", (byte) 0x01);
+//    addRow(new Object[] { activePIN, PINStatusProvider.STATUS.ACTIV });
+//    addRow(new Object[] { blockedPIN, PINStatusProvider.STATUS.BLOCKED });
+  }
+
+  @Override
+  public Class getColumnClass(int columnIndex) {
+    return types[columnIndex];
+  }
+
+  @Override
+  public boolean isCellEditable(int rowIndex, int columnIndex) {
+    return false;
+  }
+}
diff --git a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
new file mode 100644
index 00000000..977d6e3a
--- /dev/null
+++ b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
@@ -0,0 +1,69 @@
+# 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.
+
+title.activation=<html>Aktivierung</html>
+title.pin.mgmt=<html>PIN Verwaltung</html>
+title.activate.pin=<html>PIN Aktivieren</html>
+title.change.pin=<html>PIN \u00C4ndern</html>
+title.unblock.pin=<html>PIN Entsperren</html>
+title.verify.pin=<html>PIN Eingeben</html>
+title.activate.success=<html>Erfolg</html>
+title.change.success=<html>Erfolg</html>
+
+# removed message.* prefix to reuse keys as help keys
+pin.mgmt=<html>Die Karte verf\u00FCgt \u00FCber {0} PINs</html>
+activate.pin=<html>{0} eingeben und best\u00E4tigen</html>
+change.pin=<html>{0} eingeben und best\u00E4tigen</html>
+unblock.pin=<html>PUK zu {0} eingeben</html>
+verify.pin=<html>{0} eingeben</html>
+verify.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben (und best\u00E4tigen).</html>
+activate.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben und wiederholen (jeweils best\u00E4tigen).</html>
+change.pinpad=<html>Alte {0} ({1} stellig) am Kartenleser eingeben, danach neue {0} eingeben und wiederholen (jeweils best\u00E4tigen). </html>
+unblock.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben (und best\u00E4tigen).</html>
+activate.success=<html>{0} wurde erfolgreich aktiviert.</html>
+change.success=<html>{0} wurde erfolgreich ge\u00E4ndert.</html>
+
+label.activation=<html>e-card Aktivierungsprozess</html>
+label.activation.step=<html>Schritt {0}</html>
+label.activation.idle=<html>Warte auf Server...</html>
+label.old.pin=<html>Alte {0}:</html>
+label.new.pin=<html>Neue {0}:</html>
+label.repeat.pin=<html>Best\u00E4tigung:</html>
+
+button.activate=Aktivieren
+button.change=\u00C4ndern
+button.unblock=Entsperren
+button.verify=Abfragen
+
+help.activation=help.activation
+help.pin.mgmt=help.pin.mgmt
+
+err.status=<html>Der Status der PINs konnte nicht \u00FCberpr\u00FCft werden.</html>
+err.activate=<html>Beim Aktivieren der {0} trat ein Fehler auf.</html>
+err.change=<html>Beim \u00C4ndern der {0} trat ein Fehler auf.</html>
+err.unblock=<html>Das Entsperren der {0} wird nicht unterst\u00FCtzt.</html>
+err.verify=<html>VERIFY ERROR (TODO)</html>
+err.retries=<html>Falsche {0}, noch {1} Versuche</html>
+err.locked=<html>{0} gesperrt.</html>
+err.not.active=<html>{0} nicht aktiviert.</html>
+err.pin.format=<html>Ung\u00FCltige {0} L\u00E4nge, verlangt sind {1} Stellen.</html>
+err.pin.confirmation=<html>{0} und Best\u00E4tigung stimmen nicht \u00FCberein.</html>
+err.pin.operation.aborted=<html>Der Vorgang f\u00FCr {0} wurde abgebrochen.</html>
+err.unsupported.card=<html>Die Karte wird nicht unterst\u00FCtzt</html>
+
+status.not.active=NICHT AKTIV
+status.active=AKTIV
+status.blocked=GESPERRT
+status.unknown=UNBEKANNT
diff --git a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
new file mode 100644
index 00000000..7f01971b
--- /dev/null
+++ b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
@@ -0,0 +1,68 @@
+# 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.
+
+title.activation=<html>Activation</html>
+title.pin.mgmt=<html>PIN Management</html>
+title.activate.pin=<html>Activate PIN</html>
+title.verify.pin=<html>Enter PIN</html>
+title.change.pin=<html>Change PIN</html>
+title.unblock.pin=<html>Unblock PIN</html>
+title.activate.success=<html>Success</html>
+title.change.success=<html>Success</html>
+
+# removed message.* prefix to reuse keys as help keys
+pin.mgmt=<html>The smartcard has {0} PINs</html>
+activate.pin=<html>Enter and confirm {0}</html>
+change.pin=<html>Enter and confirm {0}</html>
+unblock.pin=<html>Enter PUK for {0}</html>
+verify.pin=<html>Enter {0}</html>
+verify.pinpad=<html>Enter {0} ({1} digits) on cardreader (and confirm).</html>
+activate.pinpad=<html>Enter {0} ({1} digits) on cardreader and repeat (confirm in each case).</html>
+change.pinpad=<html>Enter old {0} ({1} digits) on cardreader, then enter new {0} and repeat (confirm in each case).</html>
+unblock.pinpad=<html>Enter {0} ({1} digits) on cardreader (and confirm).</html>
+activate.success=<html>{0} successfully activated</html>
+change.success=<html>{0} successfully changed</html>
+
+label.activation=<html>e-card activation process</html>
+label.activation.step=<html>Step {0}</html>
+label.activation.idle=<html>Wait for server...</html>
+label.old.pin=<html>Old {0}:</html>
+label.new.pin=<html>New {0}:</html>
+label.repeat.pin=<html>Confirmation:</html>
+
+button.activate=Activate
+button.change=Change
+button.unblock=Unblock
+button.verify=Query
+
+help.activation=help.activation
+help.pin.mgmt=help.pin.mgmt
+
+err.status=<html>PIN statuses could not be read.</html>
+err.activate=<html>An error occured during the activation of {0}.</html>
+err.change=<html>An error occured during the changing of {0}.</html>
+err.unblock=<html>Unblocking of {0} is not supported.</html>
+err.retries=<html>Wrong {0}, {1} tries remaining</html>
+err.locked=<html>{0} locked</html>
+err.not.active=<html>{0} not activated.</html>
+err.pin.format=<html>Invalid {0} length, {1} digit(s) required.</html>
+err.pin.confirmation=<html>{0} and confirmation do not match.</html>
+err.pin.operation.aborted=<html>The operation on {0} was aborted.</html>
+err.unsupported.card=<html>This card is not supported</html>
+
+status.not.active=NOT ACTIVE
+status.active=ACTIVE
+status.blocked=BLOCKED
+status.unknown=UNKNOWN
diff --git a/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java
new file mode 100644
index 00000000..49ae577b
--- /dev/null
+++ b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java
@@ -0,0 +1,63 @@
+/*
+* 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.
+*/
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.bku.gui.*;
+import java.awt.Container;
+import java.awt.Dimension;
+import javax.swing.JFrame;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ *
+ * @author clemens
+ */
+@Ignore
+public class ActivationGuiTest {
+
+    @Test
+    public void testBKUGUI() {
+        JFrame testFrame = new JFrame("BKUGUITest");
+        Container contentPane = testFrame.getContentPane();
+        contentPane.setPreferredSize(new Dimension(152, 145));
+//        contentPane.setPreferredSize(new Dimension(300, 190));
+        ActivationGUIFacade gui = new ActivationGUI(contentPane, null, BKUGUIFacade.Style.tiny, null, null);
+        BKUGUIWorker worker = new BKUGUIWorker();
+        worker.init(gui);
+        testFrame.pack();
+        testFrame.setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
+        testFrame.setVisible(true);
+        new Thread(worker).start();
+        
+        while(true) ;
+    }
+    
+    @Test
+    public void dummyTest() {
+    }
+    
+//    public static void main(String[] args) {
+//        new BKUGUITest().testBKUGUI();
+//    }
+}
diff --git a/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
new file mode 100644
index 00000000..74ea8952
--- /dev/null
+++ b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
@@ -0,0 +1,203 @@
+/*
+ * 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.
+ */
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.bku.gui.*;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.stal.HashDataInput;
+import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author clemens
+ */
+public class BKUGUIWorker implements Runnable {
+
+  ActivationGUIFacade gui;
+
+  public void init(ActivationGUIFacade gui) {
+    this.gui = gui;
+  }
+
+  @Override
+  public void run() {
+        try {
+
+    final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Signatur-PIN", (byte)0x00, null);
+
+
+    final ActionListener cancelListener = new ActionListener() {
+
+      public void actionPerformed(ActionEvent e) {
+        System.out.println("CANCEL EVENT OCCURED: " + e);
+      }
+    };
+    ActionListener okListener = new ActionListener() {
+
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        System.out.println("OK EVENT OCCURED: " + e);
+      }
+    };
+    final ActionListener signListener = new ActionListener() {
+
+      public void actionPerformed(ActionEvent e) {
+        System.out.println("SIGN EVENT OCCURED: " + e);
+      }
+    };
+    ActionListener hashdataListener = new ActionListener() {
+
+      public void actionPerformed(ActionEvent e) {
+        System.out.println("HASHDATA EVENT OCCURED: " + e);
+        ActionListener returnListener = new ActionListener() {
+
+          @Override
+          public void actionPerformed(ActionEvent e) {
+            gui.showSignaturePINDialog(signPinSpec, -1, signListener, "sign", cancelListener, "cancel", null, "hashdata");
+          }
+        };
+        HashDataInput signedRef1 = new ByteArrayHashDataInput(
+                "Ich bin ein einfacher Text mit Umlauten: öäüßéç@€\n123\n456\n\tHello, world!\n\nlkjsd\nnksdjf".getBytes(), 
+                "ref-id-0000000000000000000000001", 
+                "text/plain", 
+                "UTF-8");
+        
+        HashDataInput signedRef2 = new ByteArrayHashDataInput(
+                "<xml>HashDataInput_002</xml>".getBytes(), 
+                "ref-id-000000002", 
+                "application/xhtml+xml", 
+                "UTF-8");
+        
+        HashDataInput signedRef3 = new ByteArrayHashDataInput(
+                "<xml>HashDataInput_003</xml>".getBytes(), 
+                "ref-id-000000003", 
+                "application/xhtml+xml", 
+                "UTF-8");
+
+        HashDataInput signedRef4 = new ByteArrayHashDataInput(
+                "<xml>HashDataInput_004</xml>".getBytes(), 
+                "ref-id-000000004", 
+                "text/xml", 
+                "UTF-8");
+
+        //
+        List<HashDataInput> signedRefs = new ArrayList();
+        signedRefs.add(signedRef1);
+                    signedRefs.add(signedRef2);
+                    signedRefs.add(signedRef3);
+                    signedRefs.add(signedRef4);
+//                    signedRefs.add(signedRef4);
+//                    signedRefs.add(signedRef4);
+//                    signedRefs.add(signedRef4);
+//                    signedRefs.add(signedRef4);
+//                    signedRefs = Collections.singletonList(signedRef1);
+        gui.showSecureViewer(signedRefs, returnListener, "return");
+      }
+    };
+
+
+
+//        gui.showWelcomeDialog();
+//
+//        Thread.sleep(2000);
+//        
+//        gui.showWaitDialog(null);
+//        
+//        Thread.sleep(1000);
+//        
+//        gui.showWaitDialog("test");
+//        
+//        Thread.sleep(1000);
+//          
+//
+//            gui.showInsertCardDialog(cancelListener, "cancel");
+//
+//            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");
+//
+//            Thread.sleep(4000);
+//
+
+//            gui.showErrorDialog(BKUGUIFacade.ERR_NO_PCSC, null, null, null);
+    
+//            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.showActivationProgressDialog(1, 3, null, null);
+
+    gui.incrementProgress();
+
+    Thread.sleep(1000);
+
+    gui.incrementProgress();
+
+    Thread.sleep(1000);
+
+    gui.incrementProgress();
+
+
+    Thread.sleep(1000);
+
+    gui.showIdleDialog(null, null);
+
+//            gui.showTextPlainHashDataInput("hallo,\n welt!", "12345", null, "cancel", null, "save");
+//            gui.showTextPlainHashDataInput("hallo,\n welt!", "12345", null, "cancel", null, "save");
+//            Thread.sleep(2000);
+
+        } catch (InterruptedException ex) {
+            ex.printStackTrace();
+        }
+  }
+}
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 9704b7db..81cb3df8 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -93,6 +93,21 @@
 			<artifactId>smccSTAL</artifactId>
 			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>BKUGuiExt</artifactId>
+      <version>1.2.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>smccSTALExt</artifactId>
+      <version>1.2.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>BKUViewer</artifactId>
+      <version>1.2.2-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
@@ -117,16 +132,6 @@
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>at.gv.egiz</groupId>
-			<artifactId>BKUApplet</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>at.gv.egiz</groupId>
-			<artifactId>BKUViewer</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
-		</dependency>
 	</dependencies>
 
 	<properties>
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/GUIProxy.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/GUIProxy.java
new file mode 100644
index 00000000..38dd04d9
--- /dev/null
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/GUIProxy.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.local.gui;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import javax.swing.JFrame;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class GUIProxy implements InvocationHandler {
+
+  JFrame frame;
+  BKUGUIFacade delegate;
+
+  static public Object newInstance(BKUGUIFacade gui, JFrame frame, Class[] interfaces) {
+    return java.lang.reflect.Proxy.newProxyInstance(gui.getClass().getClassLoader(),
+            interfaces,
+            new GUIProxy(gui, frame));
+  }
+
+  private GUIProxy(BKUGUIFacade delegate, JFrame frame) {
+    this.frame = frame;
+    this.delegate = delegate;
+  }
+
+  @Override
+  public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+
+    if (method.getName().startsWith("show")) {
+      frame.setVisible(true);
+      frame.toFront();
+      return method.invoke(delegate, args);
+    } else { //if (method.getName().startsWith("get")) {
+      return method.invoke(delegate, args);
+    }
+  }
+}
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
deleted file mode 100644
index c724c071..00000000
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package at.gv.egiz.bku.local.stal;
-
-import java.awt.event.ActionListener;
-import java.util.List;
-
-import java.util.Locale;
-import javax.swing.JDialog;
-
-import at.gv.egiz.bku.gui.BKUGUIFacade;
-import at.gv.egiz.smcc.PINSpec;
-import at.gv.egiz.stal.HashDataInput;
-import javax.swing.JFrame;
-
-public class BKUGuiProxy implements BKUGUIFacade {
-
-  private BKUGUIFacade delegate;
-  private JFrame dialog;
-
-  public BKUGuiProxy(JFrame dialog, BKUGUIFacade delegate) {
-    this.delegate = delegate;
-    this.dialog = dialog;
-  }
-
-  private void showDialog() {
-    dialog.setVisible(true);
-    dialog.setAlwaysOnTop(true);
-  }
-
-  @Override
-  public char[] getPin() {
-    return delegate.getPin();
-  }
-
-//  @Override
-//  public void init(Container contentPane, Locale locale, URL bgImage, ActionListener helpListener) {
-//    delegate.init(contentPane, locale, bgImage, helpListener);
-//  }
-
-  @Override
-  public Locale getLocale() {
-    return delegate.getLocale();
-  }
-
-//  @Override
-//  public void showCardNotSupportedDialog(ActionListener cancelListener,
-//      String actionCommand) {
-//    showDialog();
-//    delegate.showCardNotSupportedDialog(cancelListener, actionCommand);
-//  }
-//
-//  @Override
-//  public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener,
-//      String okCommand, ActionListener cancelListener, String cancelCommand) {
-//    showDialog();
-//    delegate.showCardPINDialog(pinSpec, okListener, okCommand, cancelListener,
-//        cancelCommand);
-//  }
-//
-  @Override
-  public void showCardPINDialog(PINSpec pinSpec, int numRetries,
-      ActionListener okListener, String okCommand,
-      ActionListener cancelListener, String cancelCommand) {
-    showDialog();
-    delegate.showCardPINDialog(pinSpec, numRetries, okListener, okCommand,
-        cancelListener, cancelCommand);
-  }
-
-  @Override
-  public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams, ActionListener okListener,
-      String actionCommand) {
-    showDialog();
-    delegate.showErrorDialog(errorMsgKey, errorMsgParams, okListener, actionCommand);
-  }
-
-  @Override
-  public void showErrorDialog(String errorMsgKey, Object[] errorMsgParams) {
-    showDialog();
-    delegate.showErrorDialog(errorMsgKey, errorMsgParams);
-  }
-
-//  @Override
-//  public void showInsertCardDialog(ActionListener cancelListener,
-//      String actionCommand) {
-//    showDialog();
-//    delegate.showInsertCardDialog(cancelListener, actionCommand);
-//  }
-//
-//  @Override
-//  public void showSignaturePINDialog(PINSpec pinSpec,
-//      ActionListener signListener, String signCommand,
-//      ActionListener cancelListener, String cancelCommand,
-//      ActionListener hashdataListener, String hashdataCommand) {
-//    showDialog();
-//    delegate.showSignaturePINDialog(pinSpec, signListener, signCommand,
-//        cancelListener, cancelCommand, hashdataListener, hashdataCommand);
-//  }
-//
-  @Override
-  public void showSignaturePINDialog(PINSpec pinSpec, int numRetries,
-      ActionListener okListener, String okCommand,
-      ActionListener cancelListener, String cancelCommand,
-      ActionListener hashdataListener, String hashdataCommand) {
-    showDialog();
-    delegate.showSignaturePINDialog(pinSpec, numRetries, okListener,
-        okCommand, cancelListener, cancelCommand, hashdataListener,
-        hashdataCommand);
-  }
-//
-//  @Override
-//  public void showWaitDialog(String waitMessage) {
-//    showDialog();
-//    delegate.showWaitDialog(waitMessage);
-//  }
-//
-//  @Override
-//  public void showWelcomeDialog() {
-//    showDialog();
-//    delegate.showWelcomeDialog();
-//  }
-
-  @Override
-  public void showSecureViewer(List<HashDataInput> signedReferences,
-          ActionListener okListener, 
-          String okCommand) {
-    showDialog();
-    delegate.showSecureViewer(signedReferences, okListener, okCommand);
-  }
-
-  @Override
-  public void showMessageDialog(String titleKey, 
-          String msgKey, Object[] msgParams,
-          String buttonKey, ActionListener okListener, String okCommand) {
-    showDialog();
-    delegate.showMessageDialog(titleKey, msgKey, msgParams, buttonKey, okListener, okCommand);
-  }
-
-  @Override
-  public void showMessageDialog(String titleKey, String msgKey, Object[] msgParams) {
-    showDialog();
-    delegate.showMessageDialog(titleKey, msgKey, msgParams);
-  }
-
-  @Override
-  public void showMessageDialog(String titleKey, String msgKey) {
-    showDialog();
-    delegate.showMessageDialog(titleKey, msgKey);
-  }
-
-  @Override
-  public void showPinpadSignaturePINDialog(PINSpec pinSpec, int numRetries,
-          ActionListener viewerListener, String viewerCommand) {
-    showDialog();
-    delegate.showPinpadSignaturePINDialog(pinSpec, numRetries,
-            viewerListener, viewerCommand);
-  }
-}
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
index ca4d35d1..75f71be6 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
@@ -18,11 +18,13 @@ package at.gv.egiz.bku.local.stal;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.smccstal.AbstractBKUWorker;
+import at.gv.egiz.bku.smccstal.PINManagementRequestHandler;
 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 java.util.List;
 import javax.swing.JFrame;
 
@@ -39,16 +41,18 @@ public class LocalBKUWorker extends AbstractBKUWorker {
     this.container = container;
     addRequestHandler(SignRequest.class, 
             new LocalSignRequestHandler(new LocalSecureViewer(gui)));
+    addRequestHandler(PINManagementRequest.class, new PINManagementRequestHandler());
   }
 
+  /** does not change container's visibility (use quit request to close) */
   @Override
   public List<STALResponse> handleRequest(List<? extends STALRequest> requestList) {
     signatureCard = null;
     List<STALResponse> responses = super.handleRequest(requestList);
-    // container.setVisible(false);
     return responses;
   }
 
+  /** overrides handle quit from abstract bku worker, make container invisible */
   @Override
   public STALResponse handleRequest(STALRequest request) {
     if (request instanceof QuitRequest) {
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java
index 4c9554e2..712fb969 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java
@@ -24,6 +24,9 @@ import java.util.Locale;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.BKUGUIImpl;
+import at.gv.egiz.bku.gui.PINManagementGUI;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade;
+import at.gv.egiz.bku.local.gui.GUIProxy;
 import at.gv.egiz.bku.local.gui.LocalHelpListener;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.STALFactory;
@@ -33,10 +36,16 @@ import javax.swing.JRootPane;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+/**
+ * Creates a PINManagementGUI and a LocalBKUWorker, which in turn registers
+ * PINManagementRequestHandler from smccSTALExt.
+ * The RequestHandler expects PINManagementGUIFacade, therefore BKUGUIProxy has to implement the extended GUI.
+ * @author clemens
+ */
 public class LocalSTALFactory implements STALFactory {
 
   protected static final Log log = LogFactory.getLog(LocalSTALFactory.class);
-  protected static final Dimension PREFERRED_SIZE = new Dimension(300, 189);
+  protected static final Dimension PREFERRED_SIZE = new Dimension(318, 200);
   protected String helpURL;
   protected Locale locale;
 
@@ -47,7 +56,7 @@ public class LocalSTALFactory implements STALFactory {
     //http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html
     // use undecorated JFrame instead of JWindow,
     // which creates an invisible owning frame and therefore cannot getFocusInWindow()
-    JFrame dialog = new JFrame();
+    JFrame dialog = new JFrame("Bürgerkarte");
     dialog.setUndecorated(true);
     dialog.getRootPane().setWindowDecorationStyle(JRootPane.NONE);
 
@@ -64,12 +73,13 @@ public class LocalSTALFactory implements STALFactory {
     } catch (MalformedURLException ex) {
       log.error("failed to configure help listener: " + ex.getMessage(), ex);
     }
-    BKUGUIFacade gui = new BKUGUIImpl(dialog.getContentPane(),
+    PINManagementGUIFacade gui = new PINManagementGUI(dialog.getContentPane(),
             dialog.getLocale(),
             BKUGUIFacade.Style.advanced,
             null,
             helpListener);
-    stal = new LocalBKUWorker(new BKUGuiProxy(dialog, gui), dialog);
+    BKUGUIFacade proxy = (BKUGUIFacade) GUIProxy.newInstance(gui, dialog, new Class[] { PINManagementGUIFacade.class} );
+    stal = new LocalBKUWorker(proxy, dialog);
     dialog.setPreferredSize(PREFERRED_SIZE);
     dialog.pack();
     Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/PINManagementServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/PINManagementServlet.java
new file mode 100644
index 00000000..89e526ac
--- /dev/null
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/PINManagementServlet.java
@@ -0,0 +1,167 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.local.webapp;
+
+import at.gv.egiz.bku.local.stal.LocalSTALFactory;
+import at.gv.egiz.marshal.MarshallerFactory;
+import at.gv.egiz.stal.QuitRequest;
+import at.gv.egiz.stal.STALRequest;
+import at.gv.egiz.stal.STALResponse;
+import at.gv.egiz.stal.ext.PINManagementRequest;
+import at.gv.egiz.stal.ext.PINManagementResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import org.apache.regexp.REUtil;
+
+/**
+ * PINManagementBKUWorker for non-applet version
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PINManagementServlet extends HttpServlet {
+
+//  static JAXBContext stalCtx;
+  
+  /**
+   * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+          throws ServletException, IOException {
+
+    LocalSTALFactory sf = new LocalSTALFactory();
+
+    ArrayList<STALRequest> stalReqs = new ArrayList<STALRequest>();
+    stalReqs.add(new PINManagementRequest());
+    stalReqs.add(new QuitRequest());
+
+    List<STALResponse> stalResps = sf.createSTAL().handleRequest(stalReqs); 
+
+    String redirect = request.getParameter("redirect");
+    if (redirect != null) {
+      String referer = request.getHeader("Referer");
+      if (referer != null) {
+        redirect = new URL(new URL(referer), redirect).toExternalForm();
+      }
+      response.sendRedirect(redirect);
+    } else {
+      response.setStatus(HttpServletResponse.SC_OK);
+//      if (stalResps.get(0) != null) {
+//        PrintWriter out = response.getWriter();
+//        try {
+//          response.setContentType("text/xml;charset=UTF-8");
+//          // cannot directly marshal STALResponse, no ObjectFactory in at.gv.egiz.stal
+//          if (stalCtx == null) {
+//            stalCtx = JAXBContext.newInstance("at.gv.egiz.stal:at.gv.egiz.stal.ext");
+//          }
+//          Marshaller m = MarshallerFactory.createMarshaller(stalCtx);
+//          m.marshal(stalResps.get(0), out);
+//          out.close();
+//        } catch (JAXBException ex) {
+//          throw new ServletException("Failed to marshal STAL response", ex);
+//        } finally {
+//          out.close();
+//        }
+//      } else {
+//        throw new ServletException("internal error");
+//      }
+    }
+
+    
+//    try {
+//      out.println("<html>");
+//      out.println("<head>");
+//      out.println("<title>Servlet PINManagementServlet</title>");
+//      out.println("</head>");
+//      out.println("<body>");
+//      out.println("<h1>Servlet PINManagementServlet at " + request.getContextPath() + "</h1>");
+//      out.println("<p>" + stalResps.size() + " responses:<ul>");
+//      for (STALResponse resp : stalResps) {
+//        out.println(" <li>" + resp.getClass());
+//      }
+//      Enumeration<String> headers = request.getHeaderNames();
+//      out.println("</ul></p><p> headers: <ul>");
+//      while (headers.hasMoreElements()) {
+//        String header = headers.nextElement();
+//        out.println("<li> " + header + ": " + request.getHeader(header));
+//      }
+//      Enumeration<String> params = request.getParameterNames();
+//      out.println("</ul></p><p> params: <ul>");
+//      while (params.hasMoreElements()) {
+//        String param = params.nextElement();
+//        out.println("<li> " + param + ": " + request.getParameter(param));
+//      }
+//      out.println("</ul></p></body>");
+//      out.println("</html>");
+//    } finally {
+//      out.close();
+//    }
+  }
+
+  // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+          throws ServletException, IOException {
+    processRequest(request, response);
+  }
+
+  /**
+   * Handles the HTTP <code>POST</code> method.
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doPost(HttpServletRequest request, HttpServletResponse response)
+          throws ServletException, IOException {
+    processRequest(request, response);
+  }
+
+  /**
+   * Returns a short description of the servlet.
+   * @return a String containing servlet description
+   */
+  @Override
+  public String getServletInfo() {
+    return "Short description";
+  }// </editor-fold>
+}
diff --git a/BKULocal/src/main/webapp/WEB-INF/web.xml b/BKULocal/src/main/webapp/WEB-INF/web.xml
index 8e696570..83f33d9e 100644
--- a/BKULocal/src/main/webapp/WEB-INF/web.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/web.xml
@@ -40,6 +40,10 @@
       <servlet-name>help</servlet-name>
       <jsp-file>/help.jsp</jsp-file>
   </servlet>
+    <servlet>
+        <servlet-name>PINManagementServlet</servlet-name>
+        <servlet-class>at.gv.egiz.bku.local.webapp.PINManagementServlet</servlet-class>
+    </servlet>
     <servlet-mapping>
     <servlet-name>BKUServlet</servlet-name>
     <url-pattern>/http-security-layer-request</url-pattern>
@@ -53,7 +57,11 @@
       <url-pattern>/help/*</url-pattern>
   </servlet-mapping>
   <!--  Begin BKU Config -->
-  
+
+    <servlet-mapping>
+        <servlet-name>PINManagementServlet</servlet-name>
+        <url-pattern>/PINManagement</url-pattern>
+    </servlet-mapping>
     <welcome-file-list>
     <welcome-file>index.html</welcome-file>
     <welcome-file>index.htm</welcome-file>
diff --git a/BKULocal/src/main/webapp/index.html b/BKULocal/src/main/webapp/index.html
index 215eec80..537c154a 100644
--- a/BKULocal/src/main/webapp/index.html
+++ b/BKULocal/src/main/webapp/index.html
@@ -23,7 +23,12 @@
     </head>
     <body>
         <h1>BKU Web Start - Willkommen</h1>
-        <p>Diese Seite installiert das MOCCA Zertifikat in ihrem Browser.
+        <div>
+          <p>Diese Seite installiert das MOCCA Zertifikat in ihrem Browser.
         In jedem weiteren Browser können sie dieses durch Aufruf <a href="https://localhost:3496/index.html">dieser Seite</a> ebenso installieren.</p>
+        </div>
+        <div>
+          <a href="PINManagement?redirect=./index.html">PIN Verwaltung</a>
+        </div>
     </body>
 </html>
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
index 23d832a2..ca40ddc0 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
@@ -1,10 +1,10 @@
 package at.gv.egiz.bku.webstart;
 
+import at.gv.egiz.bku.webstart.gui.AboutDialog;
 import at.gv.egiz.bku.webstart.gui.BKUControllerInterface;
-import at.gv.egiz.bku.webstart.gui.TrayMenuListener;
+import at.gv.egiz.bku.webstart.gui.PINManagementInvoker;
 import iaik.asn1.CodingException;
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
@@ -21,8 +21,12 @@ import java.awt.PopupMenu;
 import java.awt.SplashScreen;
 import java.awt.SystemTray;
 import java.awt.TrayIcon;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
 import java.net.BindException;
-import java.net.URI;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.util.jar.Attributes;
@@ -30,9 +34,10 @@ import java.util.jar.Manifest;
 import javax.imageio.ImageIO;
 import javax.jnlp.BasicService;
 import javax.jnlp.ServiceManager;
+import javax.swing.JFrame;
 import org.mortbay.util.MultiException;
 
-public class Launcher implements BKUControllerInterface {
+public class Launcher implements BKUControllerInterface, ActionListener {
 
   public static final String WEBAPP_RESOURCE = "BKULocal.war";
   public static final String CERTIFICATES_RESOURCE = "BKUCertificates.jar";
@@ -51,23 +56,37 @@ public class Launcher implements BKUControllerInterface {
   public static final String ERROR_START = "tray.error.start";
   public static final String ERROR_CONFIG = "tray.error.config";
   public static final String ERROR_BIND = "tray.error.bind";
+  public static final String ERROR_PIN = "tray.error.pin.connect";
   public static final String LABEL_SHUTDOWN = "tray.label.shutdown";
   public static final String LABEL_PIN = "tray.label.pin";
   public static final String LABEL_ABOUT = "tray.label.about";
   public static final String TOOLTIP_DEFAULT = "tray.tooltip.default";
-  
-  /** local bku uri */
-  public static final URI HTTPS_SECURITY_LAYER_URI;
+
+  /** action commands for tray menu */
+  public static final String SHUTDOWN_COMMAND = "shutdown";
+  public static final String PIN_COMMAND = "pin";
+  public static final String ABOUT_COMMAND = "about";
+
   private static Log log = LogFactory.getLog(Launcher.class);
 
+  /** local bku uri */
+  public static final URL HTTP_SECURITY_LAYER_URL;
+  public static final URL HTTPS_SECURITY_LAYER_URL;
+  public static final URL PIN_MANAGEMENT_URL;
   static {
-    URI tmp = null;
+    URL http = null;
+    URL https = null;
+    URL pin = null;
     try {
-      tmp = new URI("https://localhost:" + Integer.getInteger(Container.HTTPS_PORT_PROPERTY, 3496).intValue());
-    } catch (URISyntaxException ex) {
+      http = new URL("http://localhost:" + Integer.getInteger(Container.HTTPS_PORT_PROPERTY, 3495).intValue());
+      https = new URL("https://localhost:" + Integer.getInteger(Container.HTTPS_PORT_PROPERTY, 3496).intValue());
+      pin = new URL(http, "/PINManagement");
+    } catch (MalformedURLException ex) {
       log.error(ex);
     } finally {
-      HTTPS_SECURITY_LAYER_URI = tmp;
+      HTTP_SECURITY_LAYER_URL = http;
+      HTTPS_SECURITY_LAYER_URL = https;
+      PIN_MANAGEMENT_URL = pin;
     }
   }
   public static final String version;
@@ -96,6 +115,8 @@ public class Launcher implements BKUControllerInterface {
   private BasicService basicService;
   private TrayIcon trayIcon;
   private ResourceBundle messages;
+  private AboutDialog aboutDialog;
+
   
   public Launcher() {
     if (log.isTraceEnabled()) {
@@ -144,7 +165,7 @@ public class Launcher implements BKUControllerInterface {
     }
   }
   
-  private TrayIcon initTrayIcon() { //ResourceBundle messages, BKUControllerInterface bkuHook) {
+  private TrayIcon initTrayIcon() {
     if (SystemTray.isSupported()) {
       try {
         // get the SystemTray instance
@@ -155,21 +176,27 @@ public class Launcher implements BKUControllerInterface {
                 : TRAYICON_RESOURCE + "32.png";
         Image image = ImageIO.read(Launcher.class.getClassLoader().getResourceAsStream(iconResource));
 
-        TrayMenuListener listener = new TrayMenuListener(this, messages, version);
         PopupMenu popup = new PopupMenu();
         
+        MenuItem pinItem = new MenuItem(messages.getString(LABEL_PIN));
+        pinItem.addActionListener(this);
+        pinItem.setActionCommand(PIN_COMMAND);
+        popup.add(pinItem);
+
         MenuItem shutdownItem = new MenuItem(messages.getString(LABEL_SHUTDOWN));
-        shutdownItem.addActionListener(listener);
-        shutdownItem.setActionCommand(TrayMenuListener.SHUTDOWN_COMMAND);
+        shutdownItem.addActionListener(this);
+        shutdownItem.setActionCommand(SHUTDOWN_COMMAND);
         popup.add(shutdownItem);
 
+        popup.addSeparator();
+
         MenuItem aboutItem = new MenuItem(messages.getString(LABEL_ABOUT));
-        aboutItem.setActionCommand(TrayMenuListener.ABOUT_COMMAND);
-        aboutItem.addActionListener(listener);
+        aboutItem.setActionCommand(ABOUT_COMMAND);
+        aboutItem.addActionListener(this);
         popup.add(aboutItem);
 
         TrayIcon ti = new TrayIcon(image, messages.getString(TOOLTIP_DEFAULT), popup);
-        ti.addActionListener(listener);
+        ti.addActionListener(this);
         tray.add(ti);
         return ti;
       } catch (AWTException ex) {
@@ -237,15 +264,15 @@ public class Launcher implements BKUControllerInterface {
           Desktop desktop = Desktop.getDesktop();
           if (desktop.isSupported(Desktop.Action.BROWSE)) {
             try {
-              desktop.browse(HTTPS_SECURITY_LAYER_URI);
+              desktop.browse(HTTPS_SECURITY_LAYER_URL.toURI());
             } catch (Exception ex) {
-              log.error("failed to open system browser, install TLS certificate manually: " + HTTPS_SECURITY_LAYER_URI, ex);
+              log.error("failed to open system browser, install TLS certificate manually: " + HTTPS_SECURITY_LAYER_URL, ex);
             }
           } else {
-            log.error("failed to open system browser, install TLS certificate manually: " + HTTPS_SECURITY_LAYER_URI);
+            log.error("failed to open system browser, install TLS certificate manually: " + HTTPS_SECURITY_LAYER_URL);
           }
         } else {
-          log.error("failed to open system browser, install TLS certificate manually: " + HTTPS_SECURITY_LAYER_URI);
+          log.error("failed to open system browser, install TLS certificate manually: " + HTTPS_SECURITY_LAYER_URL);
         }
       }
       log.info("BKU successfully started");
@@ -276,6 +303,39 @@ public class Launcher implements BKUControllerInterface {
     System.exit(0);
   }
 
+  /**
+   * Listen for TrayMenu actions (display error messages on trayIcon)
+   * @param e
+   */
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    if (SHUTDOWN_COMMAND.equals(e.getActionCommand())) {
+      log.debug("shutdown requested via tray menu");
+      this.shutDown();
+    } else if (ABOUT_COMMAND.equals(e.getActionCommand())) {
+      log.debug("about dialog requested via tray menu");
+      if (aboutDialog == null) {
+        aboutDialog = new AboutDialog(new JFrame(), true, version);
+        aboutDialog.addWindowListener(new WindowAdapter() {
+
+          @Override
+          public void windowClosing(java.awt.event.WindowEvent e) {
+            aboutDialog.setVisible(false);
+          }
+        });
+      }
+      aboutDialog.setLocationByPlatform(true);
+      aboutDialog.setVisible(true);
+    } else if (PIN_COMMAND.equals(e.getActionCommand())) {
+      log.debug("pin management dialog requested via tray menu");
+
+      new Thread(new PINManagementInvoker(trayIcon, messages)).start();
+      
+    } else {
+      log.error("unknown tray menu command: " + e.getActionCommand());
+    }
+  }
+
   public static void main(String[] args) throws InterruptedException, IOException {
     try {
       Launcher launcher = new Launcher();
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/PINManagementInvoker.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/PINManagementInvoker.java
new file mode 100644
index 00000000..55e26313
--- /dev/null
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/PINManagementInvoker.java
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.webstart.gui;
+
+import at.gv.egiz.bku.webstart.Launcher;
+import java.awt.TrayIcon;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.util.ResourceBundle;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * GUI is painted using SwingUtilities.invokeLater, but TrayIcon ActionListener Thread (== webstart thread) joined Jetty Thread
+ * 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PINManagementInvoker implements Runnable {
+
+  private static final Log log = LogFactory.getLog(PINManagementInvoker.class);
+  
+  TrayIcon trayIcon;
+  ResourceBundle messages;
+
+  public PINManagementInvoker(TrayIcon trayIcon, ResourceBundle messages) {
+    this.trayIcon = trayIcon;
+    this.messages = messages;
+  }
+
+  @Override
+  public void run() {
+    HttpURLConnection connection = null;
+    try {
+      log.debug("Connecting to: " + Launcher.PIN_MANAGEMENT_URL);
+
+      connection = (HttpURLConnection) Launcher.PIN_MANAGEMENT_URL.openConnection();
+
+      connection.setRequestMethod("GET");
+      connection.setReadTimeout(0);
+      connection.connect();
+
+      if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
+        log.debug("pin management dialog returned");
+      } else {
+        log.error("unexpected response from pin management: " + connection.getResponseMessage());
+      }
+    } catch (IOException ex) {
+      log.error("Failed to connect to PIN Management", ex);
+      trayIcon.displayMessage(messages.getString(Launcher.CAPTION_ERROR),
+              messages.getString(Launcher.ERROR_PIN), TrayIcon.MessageType.ERROR);
+    } finally {
+      if (connection != null) {
+        connection.disconnect();
+      }
+    }
+  }
+}
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/TrayMenuListener.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/TrayMenuListener.java
deleted file mode 100644
index 1e5efe8e..00000000
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/gui/TrayMenuListener.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.
- */
-package at.gv.egiz.bku.webstart.gui;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.util.ResourceBundle;
-import javax.swing.JFrame;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class TrayMenuListener implements ActionListener {
-
-  /** action commands for tray menu */
-  public static final String SHUTDOWN_COMMAND = "shutdown";
-  public static final String PIN_COMMAND = "pin";
-  public static final String ABOUT_COMMAND = "about";
-
-  private static final Log log = LogFactory.getLog(TrayMenuListener.class);
-
-  protected BKUControllerInterface bku;
-  protected ResourceBundle messages;
-  protected String version;
-  protected AboutDialog aboutDialog;
-
-  public TrayMenuListener(BKUControllerInterface bkuHook, ResourceBundle messages, String version) {
-    this.messages = messages;
-    this.version = version;
-    this.bku = bkuHook;
-  }
-
-  @Override
-  public void actionPerformed(ActionEvent e) {
-    if (SHUTDOWN_COMMAND.equals(e.getActionCommand())) {
-      log.debug("shutdown requested via tray menu");
-      bku.shutDown();
-    } else if (ABOUT_COMMAND.equals(e.getActionCommand())) {
-      log.debug("about dialog requested via tray menu");
-      if (aboutDialog == null) {
-        aboutDialog = new AboutDialog(new JFrame(), true, version);
-        aboutDialog.addWindowListener(new WindowAdapter() {
-          @Override
-          public void windowClosing(java.awt.event.WindowEvent e) {
-            aboutDialog.setVisible(false);
-          }
-        });
-      }
-      aboutDialog.setLocationByPlatform(true);
-      aboutDialog.setVisible(true);
-    } else if (PIN_COMMAND.equals(e.getActionCommand())) {
-      log.error("not implemented yet.");
-    } else {
-      log.error("unknown tray menu command: " + e.getActionCommand());
-    }
-  }
-}
diff --git a/BKUWebStart/src/main/jnlp/resources/version.xml b/BKUWebStart/src/main/jnlp/resources/version.xml
index 013194a4..64a3963e 100644
--- a/BKUWebStart/src/main/jnlp/resources/version.xml
+++ b/BKUWebStart/src/main/jnlp/resources/version.xml
@@ -2,17 +2,17 @@
 <jnlp-versions>
   <resource>
     <pattern>
-      <name>BKUWebStart-1.0.10.jar</name>
-      <version-id>1.0.10</version-id>
+      <name>BKUWebStart-1.0.11-SNAPSHOT.jar</name>
+      <version-id>1.0.11-SNAPSHOT</version-id>
     </pattern>
-    <file>BKUWebStart-1.0.10.jar</file>
+    <file>BKUWebStart-1.0.11-SNAPSHOT.jar</file>
   </resource>
   <resource>
     <pattern>
-      <name>utils-1.2.1.jar</name>
-      <version-id>1.2.1</version-id>
+      <name>utils-1.2.2-SNAPSHOT.jar</name>
+      <version-id>1.2.2-SNAPSHOT</version-id>
     </pattern>
-    <file>utils-1.2.1.jar</file>
+    <file>utils-1.2.2-SNAPSHOT.jar</file>
   </resource>
   <resource>
     <pattern>
diff --git a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/messages.properties b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/messages.properties
index d965f970..b6d9238e 100644
--- a/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/messages.properties
+++ b/BKUWebStart/src/main/resources/at/gv/egiz/bku/webstart/messages.properties
@@ -24,6 +24,7 @@ tray.message.shutdown=B\u00FCrgerkartenumgebung wird beendet
 tray.error.start=B\u00FCrgerkartenumgebung konnte nicht gestartet werden
 tray.error.config=Konfiguration konnte nicht initialisiert werden, B\u00FCrberkartenumgebung wird nicht gestartet
 tray.error.bind=Die f\u00FCr die B\u00FCrgerkartenumgebung reservierte Adresse wird bereits von einem anderen Dienst verwendet
+tray.error.pin.connect=Verbindung zur PIN Verwaltung konnte nicht hergestellt werden
 tray.label.shutdown=Beenden
 tray.label.pin=PIN Verwaltung
 tray.label.about=\u00DCber...
diff --git a/pom.xml b/pom.xml
index 912d29d0..7f98c2ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,8 @@
     <module>BKUWebStart</module>
     <module>BKUCertificates</module>
     <module>BKUHelp</module>
+    <module>BKUGuiExt</module>
+    <module>smccSTALExt</module>
   </modules>
   <developers>
     <developer>
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
index 71f35181..d0762da9 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractSMCCSTAL.java
@@ -160,6 +160,11 @@ public abstract class AbstractSMCCSTAL implements STAL {
     handlerMap.put(id.getSimpleName(), handler);
   }
 
+  public void removeRequestHandler(Class<? extends STALRequest> id) {
+    log.debug("De-registering STAL request handler: " + id.getSimpleName());
+    handlerMap.remove(id.getSimpleName());
+  }
+
   public SMCCSTALRequestHandler getRequestHandler(
       Class<? extends STALRequest> request) {
     return handlerMap.get(request.getSimpleName());
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
new file mode 100644
index 00000000..481993e1
--- /dev/null
+++ b/smccSTALExt/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>bku</artifactId>
+    <groupId>at.gv.egiz</groupId>
+    <version>1.2.2-SNAPSHOT</version>
+  </parent>
+  <groupId>at.gv.egiz</groupId>
+  <artifactId>smccSTALExt</artifactId>
+  <version>${project.parent.version}</version>
+  <name>smcc STAL Extension</name>
+  <dependencies>
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>smccSTAL</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>BKUGuiExt</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/CardMgmtRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/CardMgmtRequestHandler.java
new file mode 100644
index 00000000..533206b3
--- /dev/null
+++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/CardMgmtRequestHandler.java
@@ -0,0 +1,177 @@
+/*
+* 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.
+*/
+/**
+ * 
+ */
+package at.gv.egiz.bku.smccstal;
+
+import at.gv.egiz.bku.gui.ActivationGUIFacade;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.smartcardio.Card;
+import javax.smartcardio.CardChannel;
+import javax.smartcardio.CardException;
+import javax.smartcardio.CommandAPDU;
+import javax.smartcardio.ResponseAPDU;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.bku.smccstal.AbstractRequestHandler;
+import at.gv.egiz.smcc.SignatureCardException;
+import at.gv.egiz.stal.ErrorResponse;
+import at.gv.egiz.stal.STALRequest;
+import at.gv.egiz.stal.STALResponse;
+import at.gv.egiz.stal.ext.APDUScriptRequest;
+import at.gv.egiz.stal.ext.APDUScriptResponse;
+import at.gv.egiz.stal.ext.APDUScriptRequest.Command;
+import at.gv.egiz.stal.ext.APDUScriptRequest.RequestScriptElement;
+import at.gv.egiz.stal.ext.APDUScriptRequest.Reset;
+import at.gv.egiz.stal.ext.APDUScriptResponse.Response;
+import at.gv.egiz.stal.ext.APDUScriptResponse.ATR;
+import at.gv.egiz.stal.ext.APDUScriptResponse.ResponseScriptElement;
+import java.awt.event.ActionListener;
+
+/**
+ * @author mcentner
+ *
+ */
+public class CardMgmtRequestHandler extends AbstractRequestHandler implements ActionListener {
+
+  /**
+   * Logging facility.
+   */
+  private static Log log = LogFactory.getLog(CardMgmtRequestHandler.class);
+  
+  /**
+   * The sequence counter.
+   */
+  private int sequenceNum = 0;
+
+  /**
+   * display script num
+   */
+  private int currentActivationScript = 0;
+
+  @Override
+  public STALResponse handleRequest(STALRequest request)
+      throws InterruptedException {
+
+    // APDU Script Request
+    if (request instanceof APDUScriptRequest) {
+
+      currentActivationScript++;
+      log.debug("handling APDU script " + currentActivationScript);
+      
+      Card icc = card.getCard();
+
+      if (icc == null) {
+        log.error("SignatureCard instance '" + card.getClass().getName() + "' does not support card management requests.");
+        return new ErrorResponse(1000);
+      }
+
+      List<RequestScriptElement> script = ((APDUScriptRequest) request).getScript();
+      ArrayList<ResponseScriptElement> responses = new ArrayList<ResponseScriptElement>(script.size());
+
+      ((ActivationGUIFacade) gui).showActivationProgressDialog(currentActivationScript, script.size(), this, "cancel");
+
+      try {
+        log.trace("begin exclusive");
+        icc.beginExclusive();
+
+        for (RequestScriptElement scriptElement : script) {
+          ((ActivationGUIFacade) gui).incrementProgress();
+          
+          if (scriptElement instanceof Command) {
+            log.trace("handling APDU script element COMMAND");
+            Command command = (Command) scriptElement;
+            CommandAPDU commandAPDU = new CommandAPDU(command.getCommandAPDU());
+
+            log.trace("get basicchannel");
+            CardChannel channel = icc.getBasicChannel();
+            
+            sequenceNum = command.getSequence();
+            log.debug("Transmit APDU (sequence=" + sequenceNum + ")");
+            log.trace(commandAPDU.toString());
+            ResponseAPDU responseAPDU = channel.transmit(commandAPDU);
+            log.trace(responseAPDU.toString());
+            
+            byte[] sw = new byte[] { 
+                (byte) (0xFF & responseAPDU.getSW1()),
+                (byte) (0xFF & responseAPDU.getSW2()) }; 
+            
+            responses.add(new Response(sequenceNum, responseAPDU.getData(), sw, 0));
+            
+            if (command.getExpectedSW() != null && 
+              !Arrays.equals(sw, command.getExpectedSW())) {
+              // unexpected SW
+              log.warn("Got unexpected SW. APDU-script execution stopped.");
+              break;
+            }
+            
+          } else if (scriptElement instanceof Reset) {
+
+            log.trace("handling APDU script element RESET");
+            sequenceNum = 0;
+            card.reset();
+            javax.smartcardio.ATR atr = icc.getATR();
+            log.trace("got ATR: " + atr.toString());
+            responses.add(new ATR(atr.getBytes()));
+
+            log.trace("regain exclusive access to card");
+            icc = card.getCard();
+            icc.beginExclusive();
+          }
+          
+        }
+
+      } catch (CardException e) {
+        log.info("Failed to execute APDU script.", e);
+        responses.add(new Response(sequenceNum, null, null, Response.RC_UNSPECIFIED));
+      } catch (SignatureCardException e) {
+        log.info("Failed to reset smart card.", e);
+        responses.add(new Response(sequenceNum, null, null, Response.RC_UNSPECIFIED));
+      } catch (RuntimeException e) {
+        log.error(e);
+        throw e;
+      } finally {
+        try {
+          icc.endExclusive();
+        } catch (CardException e) {
+          log.info(e);
+        }
+      }
+
+      log.trace("done handling APDU script " + currentActivationScript + ", return response containing " + responses.size() + " elements");
+      ((ActivationGUIFacade) gui).showIdleDialog(this, "cancel");
+      return new APDUScriptResponse(responses);
+      
+    } else {
+      log.error("Got unexpected STAL request: " + request);
+      return new ErrorResponse(1000);
+    }
+    
+  }
+
+  @Override
+  public boolean requireCard() {
+    return true;
+  }
+
+}
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetPINStatusException.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetPINStatusException.java
new file mode 100644
index 00000000..66b15887
--- /dev/null
+++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetPINStatusException.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.smccstal;
+
+import at.gv.egiz.smcc.SignatureCardException;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class GetPINStatusException extends SignatureCardException {
+
+    /**
+     * Creates a new instance of <code>GetStatusException</code> without detail message.
+     */
+    public GetPINStatusException() {
+    }
+
+
+    /**
+     * Constructs an instance of <code>GetStatusException</code> with the specified detail message.
+     * @param msg the detail message.
+     */
+    public GetPINStatusException(String msg) {
+        super(msg);
+    }
+}
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/ManagementPINProviderFactory.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/ManagementPINProviderFactory.java
new file mode 100644
index 00000000..34bcbf5c
--- /dev/null
+++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/ManagementPINProviderFactory.java
@@ -0,0 +1,262 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.smccstal;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.smcc.ChangePINProvider;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade;
+import at.gv.egiz.bku.smccstal.AbstractPINProvider;
+import at.gv.egiz.bku.smccstal.PINProviderFactory;
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.ccid.CCID;
+import at.gv.egiz.smcc.PINProvider;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.SignatureCard;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class ManagementPINProviderFactory extends PINProviderFactory {
+
+  public ManagementPINProviderFactory(CCID reader, PINManagementGUIFacade gui) {
+    super(reader, gui);
+  }
+  
+//  public static ManagementPINProviderFactory getInstance(SignatureCard forCard,
+//          PINManagementGUIFacade gui) {
+//    if (forCard.getReader().hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
+//      return new PinpadPINProviderFactory(gui);
+//
+//    } else {
+//      return new SoftwarePINProviderFactory(gui);
+//    }
+//  }
+
+  public PINProvider getVerifyPINProvider() {
+    if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_START)) {
+      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.VERIFY);
+    } else if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
+      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.VERIFY);
+    } else {
+      return new SoftwareGenericPinProvider(PINManagementGUIFacade.DIALOG.VERIFY);
+    }
+  }
+
+  public PINProvider getActivatePINProvider() {
+    if (reader.hasFeature(CCID.FEATURE_MODIFY_PIN_START)) {
+      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.ACTIVATE);
+    } else if (reader.hasFeature(CCID.FEATURE_MODIFY_PIN_DIRECT)) {
+      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.ACTIVATE);
+    } else {
+      return new SoftwareGenericPinProvider(PINManagementGUIFacade.DIALOG.ACTIVATE);
+    }
+  }
+
+  public ChangePINProvider getChangePINProvider() {
+    if (reader.hasFeature(CCID.FEATURE_MODIFY_PIN_START)) {
+      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.CHANGE);
+    } else if (reader.hasFeature(CCID.FEATURE_MODIFY_PIN_DIRECT)) {
+      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.CHANGE);
+    } else {
+      return new ChangePinProvider();
+    }
+  }
+
+  public PINProvider getUnblockPINProvider() {
+    if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_START)) {
+      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.UNBLOCK);
+    } else if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
+      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.UNBLOCK);
+    } else {
+      return new SoftwareGenericPinProvider(PINManagementGUIFacade.DIALOG.UNBLOCK);
+    }
+  }
+
+  class PinpadGenericPinProvider extends AbstractPINProvider
+          implements ChangePINProvider {
+
+    protected PINManagementGUIFacade.DIALOG type;
+
+    private PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG type) {
+      this.type = type;
+    }
+
+    @Override
+    public char[] providePIN(PINSpec spec, int retries)
+            throws CancelledException, InterruptedException {
+
+      showPinpadPINDialog(retries, spec);
+      retry = true;
+      return null;
+    }
+
+    /**
+     * do not call this method without calling providePIN()
+     * (no message is displayed)
+     * @param spec
+     * @param retries
+     * @return
+     */
+    @Override
+    public char[] provideOldPIN(PINSpec spec, int retries) {
+      return null;
+    }
+
+    private void showPinpadPINDialog(int retries, PINSpec pinSpec) {
+      String title, message;
+      Object[] params;
+      if (retry) {
+        if (retries == 1) {
+          message = BKUGUIFacade.MESSAGE_LAST_RETRY_PINPAD;
+        } else {
+          message = BKUGUIFacade.MESSAGE_RETRIES_PINPAD;
+        }
+        title = BKUGUIFacade.TITLE_RETRY;
+        params = new Object[]{String.valueOf(retries)};
+      } else if (type == PINManagementGUIFacade.DIALOG.VERIFY) {
+        title = PINManagementGUIFacade.TITLE_VERIFY_PIN;
+        message = BKUGUIFacade.MESSAGE_ENTERPIN_PINPAD;
+        String pinSize = String.valueOf(pinSpec.getMinLength());
+        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+          pinSize += "-" + pinSpec.getMaxLength();
+        }
+        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
+      } else if (type == PINManagementGUIFacade.DIALOG.ACTIVATE) {
+        title = PINManagementGUIFacade.TITLE_ACTIVATE_PIN;
+        message = PINManagementGUIFacade.MESSAGE_ACTIVATEPIN_PINPAD;
+        String pinSize = String.valueOf(pinSpec.getMinLength());
+        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+          pinSize += "-" + pinSpec.getMaxLength();
+        }
+        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
+      } else if (type == PINManagementGUIFacade.DIALOG.CHANGE) {
+        title = PINManagementGUIFacade.TITLE_CHANGE_PIN;
+        message = PINManagementGUIFacade.MESSAGE_CHANGEPIN_PINPAD;
+        String pinSize = String.valueOf(pinSpec.getMinLength());
+        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+          pinSize += "-" + pinSpec.getMaxLength();
+        }
+        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
+      } else { //if (type == DIALOG.UNBLOCK) {
+        title = PINManagementGUIFacade.TITLE_UNBLOCK_PIN;
+        message = PINManagementGUIFacade.MESSAGE_UNBLOCKPIN_PINPAD;
+        String pinSize = String.valueOf(pinSpec.getMinLength());
+        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
+          pinSize += "-" + pinSpec.getMaxLength();
+        }
+        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
+      }
+      gui.showMessageDialog(title, message, params);
+    }
+  }
+
+
+  class SoftwareGenericPinProvider extends AbstractPINProvider {
+
+//    protected PINManagementGUIFacade gui;
+    protected PINManagementGUIFacade.DIALOG type;
+
+    private SoftwareGenericPinProvider(PINManagementGUIFacade.DIALOG type) {
+      this.type = type;
+    }
+
+    @Override
+    public char[] providePIN(PINSpec spec, int retries)
+            throws CancelledException, InterruptedException {
+
+      ((PINManagementGUIFacade) gui).showPINDialog(type, spec,
+              (retry) ? retries : -1,
+              this, "exec",
+              this, "back");
+
+      waitForAction();
+
+      if ("exec".equals(action)) {
+        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                BKUGUIFacade.MESSAGE_WAIT);
+        retry = true;
+        return gui.getPin();
+      } else if ("back".equals(action)) {
+        throw new CancelledException();
+      } else {
+        log.error("unsupported command " + action);
+        throw new CancelledException();
+      }
+    }
+  }
+
+  class ChangePinProvider extends AbstractPINProvider
+          implements ChangePINProvider {
+
+//    protected PINManagementGUIFacade gui;
+
+    private char[] oldPin;
+    private char[] newPin;
+
+    private ChangePinProvider() {
+    }
+
+    @Override
+    public char[] providePIN(PINSpec spec, int retries)
+            throws CancelledException, InterruptedException {
+      if (newPin == null) {
+        getPINs(spec, retries);
+      }
+      char[] pin = newPin;
+      newPin = null;
+      return pin;
+    }
+
+    @Override
+    public char[] provideOldPIN(PINSpec spec, int retries)
+            throws CancelledException, InterruptedException {
+      if (oldPin == null) {
+        getPINs(spec, retries);
+      }
+      char[] pin = oldPin;
+      oldPin = null;
+      return pin;
+    }
+
+    private void getPINs(PINSpec spec, int retries)
+            throws InterruptedException, CancelledException {
+
+      ((PINManagementGUIFacade) gui).showPINDialog(
+              PINManagementGUIFacade.DIALOG.CHANGE, spec,
+              (retry) ? retries : -1,
+              this, "exec",
+              this, "back");
+
+      waitForAction();
+
+      if ("exec".equals(action)) {
+        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                BKUGUIFacade.MESSAGE_WAIT);
+        retry = true;
+        oldPin = ((PINManagementGUIFacade) gui).getOldPin();
+        newPin = gui.getPin();
+      } else if ("back".equals(action)) {
+        throw new CancelledException();
+      } else {
+        log.error("unsupported command " + action);
+        throw new CancelledException();
+      }
+    }
+  }
+}
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PINManagementRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PINManagementRequestHandler.java
new file mode 100644
index 00000000..bfeb90b0
--- /dev/null
+++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PINManagementRequestHandler.java
@@ -0,0 +1,245 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.smccstal;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade.STATUS;
+import at.gv.egiz.bku.smccstal.AbstractRequestHandler;
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.LockedException;
+import at.gv.egiz.smcc.NotActivatedException;
+import at.gv.egiz.smcc.PINConfirmationException;
+import at.gv.egiz.smcc.PINFormatException;
+import at.gv.egiz.smcc.PINMgmtSignatureCard;
+import at.gv.egiz.smcc.PINOperationAbortedException;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.SignatureCardException;
+import at.gv.egiz.smcc.TimeoutException;
+import at.gv.egiz.smcc.PINMgmtSignatureCard.PIN_STATE;
+import at.gv.egiz.stal.ErrorResponse;
+import at.gv.egiz.stal.STALRequest;
+import at.gv.egiz.stal.STALResponse;
+import at.gv.egiz.stal.ext.PINManagementRequest;
+import at.gv.egiz.stal.ext.PINManagementResponse;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PINManagementRequestHandler extends AbstractRequestHandler {
+
+  protected static final Log log = LogFactory.getLog(PINManagementRequestHandler.class);
+
+  protected Map<PINSpec, STATUS> pinStates = new HashMap<PINSpec, STATUS>();
+
+  @Override
+  public STALResponse handleRequest(STALRequest request) throws InterruptedException {
+    if (request instanceof PINManagementRequest) {
+
+    PINManagementGUIFacade gui = (PINManagementGUIFacade) this.gui;
+      
+    PINSpec selectedPIN = null;
+
+    try {
+
+      if (card instanceof PINMgmtSignatureCard) {
+
+        // update all PIN states
+        for (PINSpec pinSpec : ((PINMgmtSignatureCard) card).getPINSpecs()) {
+          updatePINState(pinSpec, STATUS.UNKNOWN);
+        }
+        
+        gui.showPINManagementDialog(pinStates, this, "activate_enterpin",
+              "change_enterpin", "unblock_enterpuk", "verify_enterpin", this,
+              "cancel");
+        
+      } else {
+        
+        // card does not support PIN management
+        gui.showErrorDialog(PINManagementGUIFacade.ERR_UNSUPPORTED_CARD,
+              null, this, "cancel");
+        
+      }
+
+      while (true) {
+
+        waitForAction();
+
+        if ("cancel".equals(actionCommand)) {
+          log.debug("pin management cancel");
+          return new PINManagementResponse();
+        } else {
+          selectedPIN = gui.getSelectedPINSpec();
+
+          if (selectedPIN == null) {
+            throw new NullPointerException("no PIN selected for activation/change");
+          }
+
+          ManagementPINProviderFactory ppfac =
+                  new ManagementPINProviderFactory(card.getReader(), gui);
+
+          try {
+            if ("activate_enterpin".equals(actionCommand)) {
+              log.info("activate " + selectedPIN.getLocalizedName());
+              ((PINMgmtSignatureCard) card).activatePIN(selectedPIN,
+                      ppfac.getActivatePINProvider());
+              updatePINState(selectedPIN, STATUS.ACTIV);
+              gui.showMessageDialog(PINManagementGUIFacade.TITLE_ACTIVATE_SUCCESS,
+                      PINManagementGUIFacade.MESSAGE_ACTIVATE_SUCCESS,
+                      new Object[] {selectedPIN.getLocalizedName()},
+                      BKUGUIFacade.BUTTON_OK, this, "ok");
+              waitForAction();
+            } else if ("change_enterpin".equals(actionCommand)) {
+              log.info("change " + selectedPIN.getLocalizedName());
+              ((PINMgmtSignatureCard) card).changePIN(selectedPIN, 
+                      ppfac.getChangePINProvider());
+              updatePINState(selectedPIN, STATUS.ACTIV);
+              gui.showMessageDialog(PINManagementGUIFacade.TITLE_CHANGE_SUCCESS,
+                      PINManagementGUIFacade.MESSAGE_CHANGE_SUCCESS,
+                      new Object[] {selectedPIN.getLocalizedName()},
+                      BKUGUIFacade.BUTTON_OK, this, "ok");
+              waitForAction();
+
+            } else if ("unblock_enterpuk".equals(actionCommand)) {
+              log.info("unblock " + selectedPIN.getLocalizedName());
+              ((PINMgmtSignatureCard) card).unblockPIN(selectedPIN,
+                      ppfac.getUnblockPINProvider());
+            } else if ("verify_enterpin".equals(actionCommand)) {
+              log.info("verify " + selectedPIN.getLocalizedName());
+              ((PINMgmtSignatureCard) card).verifyPIN(selectedPIN,
+                      ppfac.getVerifyPINProvider());
+              updatePINState(selectedPIN, STATUS.ACTIV);
+            }
+          } catch (CancelledException ex) {
+            log.trace("cancelled");
+          } catch (TimeoutException ex) {
+            log.error("Timeout during pin entry");
+            gui.showMessageDialog(BKUGUIFacade.TITLE_ENTRY_TIMEOUT,
+                    BKUGUIFacade.ERR_PIN_TIMEOUT, 
+                    new Object[] {selectedPIN.getLocalizedName()},
+                    BKUGUIFacade.BUTTON_OK, this, null);
+            waitForAction();
+          } catch (LockedException ex) {
+            log.error(selectedPIN.getLocalizedName() + " locked");
+            updatePINState(selectedPIN, STATUS.BLOCKED);
+            gui.showErrorDialog(PINManagementGUIFacade.ERR_LOCKED,
+                    new Object[] {selectedPIN.getLocalizedName()},
+                    this, null);
+            waitForAction();
+          } catch (NotActivatedException ex) {
+            log.error(selectedPIN.getLocalizedName() + " not active");
+            updatePINState(selectedPIN, STATUS.NOT_ACTIV);
+            gui.showErrorDialog(PINManagementGUIFacade.ERR_NOT_ACTIVE,
+                    new Object[] {selectedPIN.getLocalizedName()},
+                    this, null);
+            waitForAction();
+          } catch (PINConfirmationException ex) {
+            log.error("confirmation pin does not match new " + selectedPIN.getLocalizedName());
+            gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_CONFIRMATION,
+                    new Object[] {selectedPIN.getLocalizedName()},
+                    this, null);
+            waitForAction();
+          } catch (PINOperationAbortedException ex) {
+            log.error("pin operation aborted without further details");
+            gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_OPERATION_ABORTED,
+                    new Object[] {selectedPIN.getLocalizedName()},
+                    this, null);
+            waitForAction();
+          } catch (PINFormatException ex) {
+            log.error("wrong format of new " + selectedPIN.getLocalizedName());
+//            updatePINStatus(selectedPIN, STATUS.NOT_ACTIV);
+            String pinSize = String.valueOf(selectedPIN.getMinLength());
+            if (selectedPIN.getMinLength() != selectedPIN.getMaxLength()) {
+                pinSize += "-" + selectedPIN.getMaxLength();
+            }
+            gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_FORMAT,
+                    new Object[] {selectedPIN.getLocalizedName(), pinSize},
+                    this, null);
+            waitForAction();
+          }
+        } // end if
+
+        selectedPIN = null;
+        gui.showPINManagementDialog(pinStates,
+                this, "activate_enterpin", "change_enterpin", "unblock_enterpuk", "verify_enterpin",
+                this, "cancel");
+      } // end while
+
+      } catch (GetPINStatusException ex) {
+        String pin = (selectedPIN != null) ? selectedPIN.getLocalizedName() : "pin";
+        log.error("failed to get " +  pin + " status: " + ex.getMessage());
+        gui.showErrorDialog(PINManagementGUIFacade.ERR_STATUS, null,
+                this, "ok");
+        waitForAction();
+        return new ErrorResponse(1000);
+      } catch (SignatureCardException ex) {
+        log.error(ex.getMessage(), ex);
+        gui.showErrorDialog(PINManagementGUIFacade.ERR_UNKNOWN, null,
+                this, "ok");
+        waitForAction();
+        return new ErrorResponse(1000);
+      }
+    } else {
+      log.error("Got unexpected STAL request: " + request);
+      return new ErrorResponse(1000);
+    }
+  }
+
+  @Override
+  public boolean requireCard() {
+    return true;
+  }
+
+  /**
+   * query status for STARCOS card,
+   * assume provided status for ACOS card
+   * @param pinSpec
+   * @param status
+   * @throws at.gv.egiz.smcc.SignatureCardException if query status fails
+   */
+  private void updatePINState(PINSpec pinSpec, STATUS status)
+      throws GetPINStatusException {
+
+    PINMgmtSignatureCard pmCard = ((PINMgmtSignatureCard) card);
+    PIN_STATE pinState;
+    try {
+      pinState = pmCard.getPINState(pinSpec);
+    } catch (SignatureCardException e) {
+      String msg = "Failed to get PIN status for pin '"
+          + pinSpec.getLocalizedName() + "'.";
+      log.info(msg, e);
+      throw new GetPINStatusException(msg);
+    }
+    if (pinState == PIN_STATE.ACTIV) {
+      pinStates.put(pinSpec, STATUS.ACTIV);
+    } else if (pinState == PIN_STATE.NOT_ACTIV) {
+      pinStates.put(pinSpec, STATUS.NOT_ACTIV);
+    } else if (pinState == PIN_STATE.BLOCKED) {
+      pinStates.put(pinSpec, STATUS.BLOCKED);
+    } else {
+      pinStates.put(pinSpec, status);
+    }
+  }
+
+}
-- 
cgit v1.2.3


From ac6d2a37ee43ddc48cc0a1e40371366607624db7 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 20 Aug 2009 17:08:58 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@453 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       |  4 ++--
 BKUAppletExt/pom.xml    |  4 ++--
 BKUCertificates/pom.xml |  2 +-
 BKUCommonGUI/pom.xml    |  4 ++--
 BKUGuiExt/pom.xml       | 11 ++++-------
 BKUHelp/pom.xml         |  2 +-
 BKULocal/pom.xml        |  4 ++--
 BKUOnline/pom.xml       |  4 ++--
 BKUViewer/pom.xml       |  4 ++--
 BKUWebStart/pom.xml     |  4 ++--
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  4 ++--
 STALService/pom.xml     |  4 ++--
 STALXService/pom.xml    |  4 ++--
 bkucommon/pom.xml       |  4 ++--
 pom.xml                 |  2 +-
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        |  4 ++--
 smccSTALExt/pom.xml     | 11 ++++-------
 utils/pom.xml           |  4 ++--
 20 files changed, 41 insertions(+), 47 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 4f78e211..828a98a7 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.3-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index cbd12022..2cb095cc 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index f651a8fa..66b6c057 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index ef6e6692..cbf28f53 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 87520232..42a9f57d 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.3-SNAPSHOT</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
@@ -23,5 +21,4 @@
       <version>1.2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index a28285e7..957b6fa9 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 81cb3df8..6b79e745 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.2-SNAPSHOT</version>
+		<version>1.2.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.11-SNAPSHOT</version>
+	<version>1.2.3-SNAPSHOT</version>
 
 	<scm>
 		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 051c6011..5bcdef1b 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.3-SNAPSHOT</version>
 
   <pluginRepositories>
     <pluginRepository>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index f2f78ecf..0dd3ad6f 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.2-SNAPSHOT</version>
+		<version>1.2.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.2-SNAPSHOT</version>
+	<version>1.2.3-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index c8278d59..0fd975e8 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
@@ -13,7 +13,7 @@
    | IMPORTANT: update jnlp/resources/version.xml (BKUWebStart and utils) and
    | include-webstart profile in BKUOnline if version changes
    |-->
-  <version>1.0.11-SNAPSHOT</version>
+  <version>1.2.3-SNAPSHOT</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 5b56a464..4085c238 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 483f0f8c..13304d8d 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.3-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index b6b2b8ce..b7f1b189 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index c466d3b8..d303b3be 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.3-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 21e47b4f..52408952 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.2-SNAPSHOT</version>
+		<version>1.2.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.2-SNAPSHOT</version>
+	<version>1.2.3-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/pom.xml b/pom.xml
index acd17bca..342e0612 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.3-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index d4526a1f..8a1a54ca 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.3-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index b816025b..98096ca7 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index 481993e1..deb92bb4 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>${project.parent.version}</version>
+  <version>1.2.3-SNAPSHOT</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
@@ -23,5 +21,4 @@
       <version>${project.parent.version}</version>
     </dependency>
   </dependencies>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/utils/pom.xml b/utils/pom.xml
index 6f4ff172..84c7a762 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.2-SNAPSHOT</version>
+		<version>1.2.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.2-SNAPSHOT</version>
+	<version>1.2.3-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From ada7c53ce1c19ba26b988e43da51a1a99d584b14 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 20 Aug 2009 17:10:52 +0000
Subject: [maven-release-plugin] rollback the release of mocca-1.2.2

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@454 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       |  4 ++--
 BKUAppletExt/pom.xml    |  4 ++--
 BKUCertificates/pom.xml |  2 +-
 BKUCommonGUI/pom.xml    |  4 ++--
 BKUGuiExt/pom.xml       | 11 +++++++----
 BKUHelp/pom.xml         |  2 +-
 BKULocal/pom.xml        |  4 ++--
 BKUOnline/pom.xml       |  5 ++---
 BKUViewer/pom.xml       |  4 ++--
 BKUWebStart/pom.xml     |  4 ++--
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  4 ++--
 STALService/pom.xml     |  4 ++--
 STALXService/pom.xml    |  4 ++--
 bkucommon/pom.xml       |  4 ++--
 pom.xml                 | 10 +++++++++-
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        |  4 ++--
 smccSTALExt/pom.xml     | 11 +++++++----
 utils/pom.xml           |  4 ++--
 20 files changed, 55 insertions(+), 42 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 828a98a7..4f78e211 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.2-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 2cb095cc..cbd12022 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 66b6c057..f651a8fa 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index cbf28f53..ef6e6692 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 42a9f57d..87520232 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -1,13 +1,15 @@
-<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/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.2-SNAPSHOT</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
@@ -21,4 +23,5 @@
       <version>1.2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
+
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 957b6fa9..a28285e7 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 6b79e745..81cb3df8 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.3-SNAPSHOT</version>
+		<version>1.2.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.3-SNAPSHOT</version>
+	<version>1.0.11-SNAPSHOT</version>
 
 	<scm>
 		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 5bcdef1b..3901a4ff 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.2-SNAPSHOT</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -315,7 +315,6 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>BKUWebStart</artifactId>
-          <version>${project.version}</version>
           <scope>provided</scope>
           <type>zip</type>
         </dependency>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 0dd3ad6f..f2f78ecf 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.3-SNAPSHOT</version>
+		<version>1.2.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.3-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 0fd975e8..c8278d59 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
@@ -13,7 +13,7 @@
    | IMPORTANT: update jnlp/resources/version.xml (BKUWebStart and utils) and
    | include-webstart profile in BKUOnline if version changes
    |-->
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.0.11-SNAPSHOT</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 4085c238..5b56a464 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 13304d8d..483f0f8c 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.2-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index b7f1b189..b6b2b8ce 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index d303b3be..c466d3b8 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.2-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 52408952..21e47b4f 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.3-SNAPSHOT</version>
+		<version>1.2.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.3-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/pom.xml b/pom.xml
index 342e0612..7f98c2ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.2-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -261,6 +261,14 @@
         <artifactId>jaxb-impl</artifactId>
         <version>2.1.9</version>
       </dependency>
+      <!-- version not defined in BKUOnline pom "include-webstart" profile,
+       |   it wouldn't be adjusted by release:prepare -->
+      <dependency>
+        <groupId>at.gv.egiz</groupId>
+        <artifactId>BKUWebStart</artifactId>
+        <version>1.0.11-SNAPSHOT</version>
+        <type>zip</type>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>
\ No newline at end of file
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 8a1a54ca..d4526a1f 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.2-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 98096ca7..b816025b 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index deb92bb4..481993e1 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -1,13 +1,15 @@
-<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/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>${project.parent.version}</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
@@ -21,4 +23,5 @@
       <version>${project.parent.version}</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
+
diff --git a/utils/pom.xml b/utils/pom.xml
index 84c7a762..6f4ff172 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.3-SNAPSHOT</version>
+		<version>1.2.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.3-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From e676ab1e361aff7ff7417f8f6e93ad176ef6cb60 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 20 Aug 2009 17:27:08 +0000
Subject: [maven-release-plugin] prepare release mocca-1.2.2

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@455 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 14 +++++++-------
 BKUAppletExt/pom.xml    | 16 ++++++++--------
 BKUCertificates/pom.xml |  2 +-
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUGuiExt/pom.xml       | 15 ++++++---------
 BKUHelp/pom.xml         |  2 +-
 BKULocal/pom.xml        | 24 ++++++++++++------------
 BKUOnline/pom.xml       | 24 ++++++++++++------------
 BKUViewer/pom.xml       |  6 +++---
 BKUWebStart/pom.xml     |  8 ++++----
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  8 ++++----
 pom.xml                 | 10 +++++-----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 smccSTALExt/pom.xml     | 11 ++++-------
 utils/pom.xml           |  4 ++--
 20 files changed, 92 insertions(+), 98 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 4f78e211..fb90f314 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.2</version>
   <build>
     <plugins>
       <plugin>
@@ -98,27 +98,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index cbd12022..0ba54934 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>1.2.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>1.2.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>1.2.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>1.2.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>1.2.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>1.2.2</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index f651a8fa..ec728b8b 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index ef6e6692..09b75a88 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>1.2.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>1.2.2</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 87520232..064ceefa 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -1,27 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.2</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
   </dependencies>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index a28285e7..29078da6 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 81cb3df8..f08a7f9f 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.2-SNAPSHOT</version>
+		<version>1.2.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.0.11-SNAPSHOT</version>
+	<version>1.2.2</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -76,37 +76,37 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<version>1.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<version>1.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<version>1.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<version>1.2.2</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 3901a4ff..8362b1a5 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.2</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -24,12 +24,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -63,13 +63,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -115,13 +115,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -132,9 +132,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index f2f78ecf..b02889ac 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.2-SNAPSHOT</version>
+		<version>1.2.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.2-SNAPSHOT</version>
+	<version>1.2.2</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<version>1.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index c8278d59..8c024bbc 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
@@ -13,7 +13,7 @@
    | IMPORTANT: update jnlp/resources/version.xml (BKUWebStart and utils) and
    | include-webstart profile in BKUOnline if version changes
    |-->
-  <version>1.0.11-SNAPSHOT</version>
+  <version>1.2.2</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -224,7 +224,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKULocal</artifactId>
-      <version>1.0.11-SNAPSHOT</version>
+      <version>1.2.2</version>
       <type>war</type>
     </dependency>
     <dependency>
@@ -235,7 +235,7 @@
     <dependency>
       <artifactId>utils</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
       <exclusions>
         <exclusion>
           <artifactId>iaik_ecc_signed</artifactId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 5b56a464..60efbf70 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 483f0f8c..c548b3d7 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.2</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index b6b2b8ce..c38fec75 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>1.2.2</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index c466d3b8..e60e7cc6 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.2</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.2</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 21e47b4f..4fa6ea1c 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.2-SNAPSHOT</version>
+		<version>1.2.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.2-SNAPSHOT</version>
+	<version>1.2.2</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<version>1.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<version>1.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 7f98c2ec..46a1a989 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.2</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -46,9 +46,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -266,7 +266,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.0.11-SNAPSHOT</version>
+        <version>1.2.2</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index d4526a1f..d4e197d4 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.2</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index b816025b..acaffbd1 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>1.2.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>1.2.2</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>1.2.2</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index 481993e1..603e3522 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>${project.parent.version}</version>
+  <version>1.2.2</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
@@ -23,5 +21,4 @@
       <version>${project.parent.version}</version>
     </dependency>
   </dependencies>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/utils/pom.xml b/utils/pom.xml
index 6f4ff172..5c56c5dc 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.2-SNAPSHOT</version>
+		<version>1.2.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.2-SNAPSHOT</version>
+	<version>1.2.2</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 1102477bc94590a21eaf3bcbd50baa0b6ed13529 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 20 Aug 2009 17:32:58 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@458 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 14 +++++++-------
 BKUAppletExt/pom.xml    | 16 ++++++++--------
 BKUCertificates/pom.xml |  2 +-
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUGuiExt/pom.xml       |  8 ++++----
 BKUHelp/pom.xml         |  2 +-
 BKULocal/pom.xml        | 24 ++++++++++++------------
 BKUOnline/pom.xml       | 24 ++++++++++++------------
 BKUViewer/pom.xml       |  6 +++---
 BKUWebStart/pom.xml     |  8 ++++----
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  8 ++++----
 pom.xml                 | 10 +++++-----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 smccSTALExt/pom.xml     |  4 ++--
 utils/pom.xml           |  4 ++--
 20 files changed, 88 insertions(+), 88 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index fb90f314..01bd4bc1 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.2</version>
+  <version>1.2.3-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -98,27 +98,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 0ba54934..d7a132d7 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2</version>
+        <version>1.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index ec728b8b..66b6c057 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 09b75a88..f9f52fb6 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2</version>
+        <version>1.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 064ceefa..4de8ac39 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.2</version>
+  <version>1.2.3-SNAPSHOT</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 29078da6..957b6fa9 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index f08a7f9f..409c5ad1 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.2</version>
+		<version>1.2.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.2</version>
+	<version>1.2.3-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -76,37 +76,37 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.2</version>
+			<version>1.2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.2</version>
+			<version>1.2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.2</version>
+			<version>1.2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.2</version>
+			<version>1.2.3-SNAPSHOT</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 8362b1a5..705a1300 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.2</version>
+  <version>1.2.3-SNAPSHOT</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -24,12 +24,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -63,13 +63,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -115,13 +115,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -132,9 +132,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index b02889ac..8414a905 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.2</version>
+		<version>1.2.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.2</version>
+	<version>1.2.3-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.2</version>
+			<version>1.2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 8c024bbc..62a06f42 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
@@ -13,7 +13,7 @@
    | IMPORTANT: update jnlp/resources/version.xml (BKUWebStart and utils) and
    | include-webstart profile in BKUOnline if version changes
    |-->
-  <version>1.2.2</version>
+  <version>1.2.3-SNAPSHOT</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -224,7 +224,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKULocal</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
@@ -235,7 +235,7 @@
     <dependency>
       <artifactId>utils</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>iaik_ecc_signed</artifactId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 60efbf70..4085c238 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2</version>
+        <version>1.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index c548b3d7..66962ac5 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.2</version>
+  <version>1.2.3-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index c38fec75..3d10c457 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2</version>
+        <version>1.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index e60e7cc6..044c2f59 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.2</version>
+  <version>1.2.3-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.2</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 4fa6ea1c..c621214c 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.2</version>
+		<version>1.2.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.2</version>
+	<version>1.2.3-SNAPSHOT</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.2</version>
+			<version>1.2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.2</version>
+			<version>1.2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 46a1a989..3fbefc32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.2</version>
+  <version>1.2.3-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -46,9 +46,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.2</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -266,7 +266,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.2</version>
+        <version>1.2.3-SNAPSHOT</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index d4e197d4..8a1a54ca 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.2</version>
+  <version>1.2.3-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index acaffbd1..ad4ccb82 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.2</version>
+        <version>1.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index 603e3522..deb92bb4 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.2</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.2</version>
+  <version>1.2.3-SNAPSHOT</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 5c56c5dc..84c7a762 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.2</version>
+		<version>1.2.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.2</version>
+	<version>1.2.3-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 06cd22f6acac2bd9edb373c7bb32c9a85cb34b21 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 21 Aug 2009 16:00:33 +0000
Subject: icons 2.0

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@462 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java   |   9 +++++----
 .../src/main/resources/at/gv/egiz/bku/gui/chip32.png     | Bin 0 -> 1753 bytes
 .../main/resources/at/gv/egiz/bku/gui/chiperling105.png  | Bin 0 -> 4035 bytes
 .../src/main/resources/at/gv/egiz/bku/gui/help.png       | Bin 0 -> 441 bytes
 .../src/main/resources/images/ChipperlingCutoff.png      | Bin 1522 -> 0 bytes
 .../src/main/resources/images/ChipperlingLogo.png        | Bin 4035 -> 0 bytes
 BKUCommonGUI/src/main/resources/images/help.png          | Bin 441 -> 0 bytes
 .../main/java/at/gv/egiz/bku/gui/PINManagementGUI.java   |   3 ---
 8 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip32.png
 create mode 100644 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chiperling105.png
 create mode 100644 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/help.png
 delete mode 100644 BKUCommonGUI/src/main/resources/images/ChipperlingCutoff.png
 delete mode 100644 BKUCommonGUI/src/main/resources/images/ChipperlingLogo.png
 delete mode 100644 BKUCommonGUI/src/main/resources/images/help.png

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 06aad45f..6c27910a 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -40,11 +40,12 @@ public interface BKUGUIFacade {
   public static final String ERR_VIEWER = "error.viewer";
   public static final String ERR_EXTERNAL_LINK = "error.external.link";
   public static final String ERR_CONFIG = "error.config";
-  
+
+  /** no leading slash for Messages resource, leading slash for images */
   public static final String MESSAGES_BUNDLE = "at/gv/egiz/bku/gui/Messages";
-  public static final String DEFAULT_BACKGROUND = "/images/ChipperlingCutoff.png";
-  public static final String DEFAULT_ICON = "/images/ChipperlingLogo.png";
-  public static final String HELP_IMG = "/images/help.png";
+  public static final String DEFAULT_BACKGROUND = "/at/gv/egiz/bku/gui/chip32.png";
+  public static final String DEFAULT_ICON = "/at/gv/egiz/bku/gui/chiperling105.png";
+  public static final String HELP_IMG = "/at/gv/egiz/bku/gui/help.png";
   public static final String HASHDATA_FONT = "Monospaced";
   public static final Color ERROR_COLOR = Color.RED;
   public static final Color HYPERLINK_COLOR = Color.BLUE;
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip32.png b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip32.png
new file mode 100644
index 00000000..e7efb020
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip32.png differ
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chiperling105.png b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chiperling105.png
new file mode 100644
index 00000000..eee4be4f
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chiperling105.png differ
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/help.png b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/help.png
new file mode 100644
index 00000000..d1c36c33
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/help.png differ
diff --git a/BKUCommonGUI/src/main/resources/images/ChipperlingCutoff.png b/BKUCommonGUI/src/main/resources/images/ChipperlingCutoff.png
deleted file mode 100644
index 337b144b..00000000
Binary files a/BKUCommonGUI/src/main/resources/images/ChipperlingCutoff.png and /dev/null differ
diff --git a/BKUCommonGUI/src/main/resources/images/ChipperlingLogo.png b/BKUCommonGUI/src/main/resources/images/ChipperlingLogo.png
deleted file mode 100644
index eee4be4f..00000000
Binary files a/BKUCommonGUI/src/main/resources/images/ChipperlingLogo.png and /dev/null differ
diff --git a/BKUCommonGUI/src/main/resources/images/help.png b/BKUCommonGUI/src/main/resources/images/help.png
deleted file mode 100644
index d1c36c33..00000000
Binary files a/BKUCommonGUI/src/main/resources/images/help.png and /dev/null differ
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
index 3d503510..e9065d51 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
@@ -17,15 +17,12 @@
 
 package at.gv.egiz.bku.gui;
 
-import at.gv.egiz.bku.gui.*;
 import at.gv.egiz.smcc.PINSpec;
 import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionAdapter;
 import java.net.URL;
 import java.text.MessageFormat;
 import java.util.Locale;
-- 
cgit v1.2.3


From 45bae5a2d8b414ccb3ed4421eeee867b2a6e88b7 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 21 Aug 2009 16:31:49 +0000
Subject: [maven-release-plugin] prepare release mocca-1.2.3

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@467 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 14 +++++++-------
 BKUAppletExt/pom.xml    | 16 ++++++++--------
 BKUCertificates/pom.xml |  2 +-
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUGuiExt/pom.xml       |  8 ++++----
 BKUHelp/pom.xml         |  4 ++--
 BKULocal/pom.xml        | 26 +++++++++++++-------------
 BKUOnline/pom.xml       | 26 +++++++++++++-------------
 BKUViewer/pom.xml       |  6 +++---
 BKUWebStart/pom.xml     |  8 ++++----
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  8 ++++----
 pom.xml                 | 10 +++++-----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 smccSTALExt/pom.xml     |  4 ++--
 utils/pom.xml           |  4 ++--
 20 files changed, 91 insertions(+), 91 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 01bd4bc1..c08c45ab 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.3</version>
   <build>
     <plugins>
       <plugin>
@@ -98,27 +98,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index d7a132d7..82049917 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3-SNAPSHOT</version>
+        <version>1.2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.2.3</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 66b6c057..0725ac18 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index f9f52fb6..382feb15 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3-SNAPSHOT</version>
+        <version>1.2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.2.3</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 4de8ac39..158feaac 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.3</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 8fec9a95..e8ab5ac5 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,10 +3,10 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.1</version>
   <name>BKU Help</name>
 </project>
\ No newline at end of file
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index eb17a42c..f89c29b5 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.3-SNAPSHOT</version>
+		<version>1.2.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.3-SNAPSHOT</version>
+	<version>1.2.3</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -76,42 +76,42 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.3-SNAPSHOT</version>
+			<version>1.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.3-SNAPSHOT</version>
+			<version>1.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.3-SNAPSHOT</version>
+			<version>1.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.3-SNAPSHOT</version>
+			<version>1.2.3</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index b0a9d80e..a7466c5a 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.3</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -24,12 +24,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -39,7 +39,7 @@
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -63,13 +63,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -115,13 +115,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -132,9 +132,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 8414a905..e4a48f19 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.3-SNAPSHOT</version>
+		<version>1.2.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.3-SNAPSHOT</version>
+	<version>1.2.3</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.3-SNAPSHOT</version>
+			<version>1.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 62a06f42..d2559543 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
@@ -13,7 +13,7 @@
    | IMPORTANT: update jnlp/resources/version.xml (BKUWebStart and utils) and
    | include-webstart profile in BKUOnline if version changes
    |-->
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.3</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -224,7 +224,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKULocal</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
       <type>war</type>
     </dependency>
     <dependency>
@@ -235,7 +235,7 @@
     <dependency>
       <artifactId>utils</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
       <exclusions>
         <exclusion>
           <artifactId>iaik_ecc_signed</artifactId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 4085c238..9efc58dd 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3-SNAPSHOT</version>
+        <version>1.2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 66962ac5..9a44fb8f 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.3</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 3d10c457..060e67f7 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3-SNAPSHOT</version>
+        <version>1.2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.2.3</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 044c2f59..3d78886a 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.3</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.2.3</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index c621214c..6e5e7744 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.3-SNAPSHOT</version>
+		<version>1.2.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.3-SNAPSHOT</version>
+	<version>1.2.3</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.3-SNAPSHOT</version>
+			<version>1.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.3-SNAPSHOT</version>
+			<version>1.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 3fbefc32..4ed6cfa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.3</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -46,9 +46,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -266,7 +266,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.3-SNAPSHOT</version>
+        <version>1.2.3</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 8a1a54ca..de543524 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.3</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index ad4ccb82..89b29494 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3-SNAPSHOT</version>
+        <version>1.2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index deb92bb4..7c665838 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.3</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 84c7a762..19509f2d 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.3-SNAPSHOT</version>
+		<version>1.2.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.3-SNAPSHOT</version>
+	<version>1.2.3</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 1f0a54980e6b3f60c3b3d935f22537ceba179100 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 21 Aug 2009 16:32:05 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@469 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 14 +++++++-------
 BKUAppletExt/pom.xml    | 16 ++++++++--------
 BKUCertificates/pom.xml |  2 +-
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUGuiExt/pom.xml       |  8 ++++----
 BKUHelp/pom.xml         |  2 +-
 BKULocal/pom.xml        | 24 ++++++++++++------------
 BKUOnline/pom.xml       | 24 ++++++++++++------------
 BKUViewer/pom.xml       |  6 +++---
 BKUWebStart/pom.xml     |  8 ++++----
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  8 ++++----
 pom.xml                 | 10 +++++-----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 smccSTALExt/pom.xml     |  4 ++--
 utils/pom.xml           |  4 ++--
 20 files changed, 88 insertions(+), 88 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index c08c45ab..0844dc95 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.3</version>
+  <version>1.2.4-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -98,27 +98,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 82049917..c85fc3d6 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3</version>
+        <version>1.2.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 0725ac18..450d9629 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 382feb15..25c6e133 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3</version>
+        <version>1.2.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 158feaac..517e17ee 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.3</version>
+  <version>1.2.4-SNAPSHOT</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index e8ab5ac5..ec2ad47d 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index f89c29b5..523357f2 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.3</version>
+		<version>1.2.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.3</version>
+	<version>1.2.4-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -76,37 +76,37 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.3</version>
+			<version>1.2.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.3</version>
+			<version>1.2.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.3</version>
+			<version>1.2.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.3</version>
+			<version>1.2.4-SNAPSHOT</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index a7466c5a..f03bc792 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.3</version>
+  <version>1.2.4-SNAPSHOT</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -24,12 +24,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -63,13 +63,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -115,13 +115,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -132,9 +132,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index e4a48f19..27671999 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.3</version>
+		<version>1.2.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.3</version>
+	<version>1.2.4-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.3</version>
+			<version>1.2.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index d2559543..462146d6 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
@@ -13,7 +13,7 @@
    | IMPORTANT: update jnlp/resources/version.xml (BKUWebStart and utils) and
    | include-webstart profile in BKUOnline if version changes
    |-->
-  <version>1.2.3</version>
+  <version>1.2.4-SNAPSHOT</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -224,7 +224,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKULocal</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
@@ -235,7 +235,7 @@
     <dependency>
       <artifactId>utils</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>iaik_ecc_signed</artifactId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 9efc58dd..cf6f37e0 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3</version>
+        <version>1.2.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 9a44fb8f..36c6bb22 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.3</version>
+  <version>1.2.4-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 060e67f7..c2b965a2 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3</version>
+        <version>1.2.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.4-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 3d78886a..a9016672 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.3</version>
+  <version>1.2.4-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.3</version>
+      <version>1.2.4-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 6e5e7744..d62e7688 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.3</version>
+		<version>1.2.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.3</version>
+	<version>1.2.4-SNAPSHOT</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.3</version>
+			<version>1.2.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.3</version>
+			<version>1.2.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 4ed6cfa1..42938cf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.3</version>
+  <version>1.2.4-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -46,9 +46,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -266,7 +266,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4-SNAPSHOT</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index de543524..fc180459 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.3</version>
+  <version>1.2.4-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 89b29494..44679cc2 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.3</version>
+        <version>1.2.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index 7c665838..c414c437 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.3</version>
+    <version>1.2.4-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.3</version>
+  <version>1.2.4-SNAPSHOT</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 19509f2d..74597049 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.3</version>
+		<version>1.2.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.3</version>
+	<version>1.2.4-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 598f62c5b30d6e40f6983fc3eec17613d19cdc0e Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 25 Aug 2009 12:49:43 +0000
Subject: [#436] resolve "#pin digits" message via resource bundle (now, all
 dialogs - not only pinactivation - get pinLength from resource bundle)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@472 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 17 +++------------
 .../java/at/gv/egiz/bku/gui/PINManagementGUI.java  | 11 +++-------
 .../resources/at/gv/egiz/smcc/ACOSCard.properties  |  6 +++---
 .../at/gv/egiz/smcc/STARCOSCard.properties         |  4 ++--
 .../bku/smccstal/ManagementPINProviderFactory.java | 24 ++++------------------
 5 files changed, 15 insertions(+), 47 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 2663e8bf..5ea2499a 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -580,11 +580,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 
                 JLabel pinsizeLabel = new JLabel();
                 pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
-                String pinsizePattern = getMessage(LABEL_PINSIZE);
-                String pinSize = (pinSpec.getMaxLength() > pinSpec.getMinLength()) ?
-                  pinSpec.getMinLength() + "-" + pinSpec.getMaxLength() :
-                  String.valueOf(pinSpec.getMinLength());
-                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                pinsizeLabel.setText(MessageFormat.format(getMessage(LABEL_PINSIZE), pinSpec.getLocalizedLength()));
                 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
@@ -750,11 +746,8 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 }
 
                 String msgPattern = getMessage(MESSAGE_ENTERPIN_PINPAD);
-                String pinSize = (pinSpec.getMaxLength() > pinSpec.getMinLength()) ?
-                  pinSpec.getMinLength() + "-" + pinSpec.getMaxLength() :
-                  String.valueOf(pinSpec.getMinLength());
                 String msg = MessageFormat.format(msgPattern, new Object[] {
-                  pinSpec.getLocalizedName(), pinSize });
+                  pinSpec.getLocalizedName(), pinSpec.getLocalizedLength() });
 
                 JLabel msgLabel = new JLabel();
                 msgLabel.setFont(msgLabel.getFont().deriveFont(msgLabel.getFont().getStyle() & ~Font.BOLD));
@@ -902,11 +895,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
 
                 JLabel pinsizeLabel = new JLabel();
                 pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
-                String pinsizePattern = getMessage(LABEL_PINSIZE);
-                String pinSize = (pinSpec.getMaxLength() > pinSpec.getMinLength()) ?
-                  pinSpec.getMinLength() + "-" + pinSpec.getMaxLength() :
-                  String.valueOf(pinSpec.getMinLength());
-                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{pinSize}));
+                pinsizeLabel.setText(MessageFormat.format(getMessage(LABEL_PINSIZE), pinSpec.getLocalizedLength()));
 
                 GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
                 mainPanel.setLayout(mainPanelLayout);
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
index e9065d51..9c698d79 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
@@ -298,13 +298,9 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
             @Override
             public void run() {
 
-              String HELP_TOPIC, TITLE, MESSAGE_MGMT, MESSAGE_MGMT_PARAM, PINSIZE;
+              String HELP_TOPIC, TITLE, MESSAGE_MGMT, MESSAGE_MGMT_PARAM;
               HELP_TOPIC = HELP_PINMGMT;
 
-              PINSIZE = (pinSpec.getMaxLength() > pinSpec.getMinLength()) ?
-                pinSpec.getMinLength() + "-" + pinSpec.getMaxLength() :
-                String.valueOf(pinSpec.getMinLength());
-
               if (retries < 0) {
                 if (type == DIALOG.CHANGE) {
                   log.debug("show change pin dialog");
@@ -315,7 +311,6 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                   TITLE = TITLE_ACTIVATE_PIN;
                   MESSAGE_MGMT = MESSAGE_ACTIVATE_PIN;
                   oldPinField = null;
-                  PINSIZE = pinSpec.getLocalizedLength();
                 } else if (type == DIALOG.VERIFY) {
                   log.debug("show verify pin dialog");
                   TITLE = TITLE_VERIFY_PIN;
@@ -388,7 +383,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                   pinpadLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~Font.BOLD));
                   String pinpadPattern = getMessage(MESSAGE_VERIFYPIN_PINPAD);
                   pinpadLabel.setText(MessageFormat.format(pinpadPattern,
-                          new Object[] { pinSpec.getLocalizedName(), PINSIZE }));
+                          new Object[] { pinSpec.getLocalizedName(), pinSpec.getLocalizedLength() }));
                   
                   pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                           .addComponent(pinpadLabel);
@@ -483,7 +478,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                 JLabel pinsizeLabel = new JLabel();
                 pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~Font.BOLD, pinsizeLabel.getFont().getSize()-2));
                 String pinsizePattern = getMessage(LABEL_PINSIZE);
-                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, new Object[]{PINSIZE}));
+                pinsizeLabel.setText(MessageFormat.format(pinsizePattern, pinSpec.getLocalizedLength()));
 
                 ////////////////////////////////////////////////////////////////
                 // NON-PINPAD SPECIFIC LAYOUT SECTION
diff --git a/smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard.properties b/smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard.properties
index 2e032d1b..15f5c990 100644
--- a/smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard.properties
+++ b/smcc/src/main/resources/at/gv/egiz/smcc/ACOSCard.properties
@@ -17,8 +17,8 @@
 # and open the template in the editor.
 
 dec.pin.name=Geheimhaltungs-PIN
-dec.pin.length=4
+dec.pin.length=0-8
 sig.pin.name=Signatur-PIN
-sig.pin.length=6
+sig.pin.length=0-8
 inf.pin.name=Infobox-PIN
-inf.pin.length=4
+inf.pin.length=0-8
diff --git a/smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard.properties b/smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard.properties
index ae91f265..122d2aa7 100644
--- a/smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard.properties
+++ b/smcc/src/main/resources/at/gv/egiz/smcc/STARCOSCard.properties
@@ -17,6 +17,6 @@
 # and open the template in the editor.
 
 sig.pin.name=Signatur-PIN
-sig.pin.length=6
+sig.pin.length=6-12
 card.pin.name=Karten-PIN
-card.pin.length=4
+card.pin.length=4-12
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/ManagementPINProviderFactory.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/ManagementPINProviderFactory.java
index 34bcbf5c..493733b8 100644
--- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/ManagementPINProviderFactory.java
+++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/ManagementPINProviderFactory.java
@@ -132,35 +132,19 @@ public class ManagementPINProviderFactory extends PINProviderFactory {
       } else if (type == PINManagementGUIFacade.DIALOG.VERIFY) {
         title = PINManagementGUIFacade.TITLE_VERIFY_PIN;
         message = BKUGUIFacade.MESSAGE_ENTERPIN_PINPAD;
-        String pinSize = String.valueOf(pinSpec.getMinLength());
-        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-          pinSize += "-" + pinSpec.getMaxLength();
-        }
-        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
+        params = new Object[]{pinSpec.getLocalizedName(), pinSpec.getLocalizedLength()};
       } else if (type == PINManagementGUIFacade.DIALOG.ACTIVATE) {
         title = PINManagementGUIFacade.TITLE_ACTIVATE_PIN;
         message = PINManagementGUIFacade.MESSAGE_ACTIVATEPIN_PINPAD;
-        String pinSize = String.valueOf(pinSpec.getMinLength());
-        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-          pinSize += "-" + pinSpec.getMaxLength();
-        }
-        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
+        params = new Object[]{pinSpec.getLocalizedName(), pinSpec.getLocalizedLength()};
       } else if (type == PINManagementGUIFacade.DIALOG.CHANGE) {
         title = PINManagementGUIFacade.TITLE_CHANGE_PIN;
         message = PINManagementGUIFacade.MESSAGE_CHANGEPIN_PINPAD;
-        String pinSize = String.valueOf(pinSpec.getMinLength());
-        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-          pinSize += "-" + pinSpec.getMaxLength();
-        }
-        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
+        params = new Object[]{pinSpec.getLocalizedName(), pinSpec.getLocalizedLength()};
       } else { //if (type == DIALOG.UNBLOCK) {
         title = PINManagementGUIFacade.TITLE_UNBLOCK_PIN;
         message = PINManagementGUIFacade.MESSAGE_UNBLOCKPIN_PINPAD;
-        String pinSize = String.valueOf(pinSpec.getMinLength());
-        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-          pinSize += "-" + pinSpec.getMaxLength();
-        }
-        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
+        params = new Object[]{pinSpec.getLocalizedName(), pinSpec.getLocalizedLength()};
       }
       gui.showMessageDialog(title, message, params);
     }
-- 
cgit v1.2.3


From 145003155c05e915b900989a27cef1271398164b Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 26 Aug 2009 17:31:32 +0000
Subject: MOCCA TLS Server CA cert installation servlet removed help.jsp (and
 jsp dependencies in jetty) moved html pages to src/main/webapp (encoding
 problem?) switch to BASIC download protocol in BKUWebStart (no
 jnlpDownloadServlet required, see template.xml)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@474 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/gui/AbstractHelpListener.java   |  17 +-
 BKUHelp/pom.xml                                    |   9 +-
 BKULocal/pom.xml                                   |   2 +-
 .../local/webapp/InstallCertificateServlet.java    | 149 +++++++++++++++
 BKULocal/src/main/webapp/WEB-INF/web.xml           |  19 +-
 BKULocal/src/main/webapp/img/chip16.ico            | Bin 0 -> 1150 bytes
 BKULocal/src/main/webapp/img/chip48.png            | Bin 0 -> 2771 bytes
 BKULocal/src/main/webapp/index.html                |  56 ++++--
 BKUOnline/pom.xml                                  |   7 +-
 BKUWebStart/pom.xml                                |  28 +--
 .../java/at/gv/egiz/bku/webstart/Configurator.java |   2 +-
 .../java/at/gv/egiz/bku/webstart/Container.java    | 210 +++++++++++++--------
 .../java/at/gv/egiz/bku/webstart/Launcher.java     |   7 +-
 .../java/at/gv/egiz/bku/webstart/TLSServerCA.java  |   3 +-
 BKUWebStart/src/main/jnlp/resources/version.xml    |  35 ----
 BKUWebStart/src/main/jnlp/template.xml             |  22 +--
 16 files changed, 387 insertions(+), 179 deletions(-)
 create mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/InstallCertificateServlet.java
 create mode 100644 BKULocal/src/main/webapp/img/chip16.ico
 create mode 100644 BKULocal/src/main/webapp/img/chip48.png

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
index b871263e..6fd1ffea 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/AbstractHelpListener.java
@@ -38,6 +38,11 @@ import org.apache.commons.logging.LogFactory;
  */
 public abstract class AbstractHelpListener implements ActionListener {
 
+  /**
+   * any locale not in the list will be mapped to 'de'
+   */
+  public static final String[] SUPPORTED_LANGUAGES = new String[] { "de" };
+  
   protected final static Log log = LogFactory.getLog(AbstractHelpListener.class);
   protected URL baseURL;
   protected Locale locale;
@@ -71,12 +76,14 @@ public abstract class AbstractHelpListener implements ActionListener {
     URL helpURL = baseURL;
     log.trace("constructing help URL: " + helpURL);
     try {
-      if (locale != null) {
-        helpURL = new URL(helpURL, locale.toString() + "/");
-        log.trace("constructing help URL: " + helpURL);
-      }
+      // not localized for now
+      //check if locale.getLanguage() supported and add default if not
+//      if (locale != null) {
+//        helpURL = new URL(helpURL, locale.toString() + "/");
+//        log.trace("constructing help URL: " + helpURL);
+//      }
       if (helpTopic != null && !"".equals(helpTopic)) {
-        helpURL = new URL(helpURL, helpTopic + ".html");
+        helpURL = new URL(helpURL, "de/" + helpTopic + ".html");
         log.trace("constructing help URL: " + helpURL);
       }
     } catch (MalformedURLException ex) {
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index ec2ad47d..6dbfd55f 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -7,6 +7,13 @@
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.1</version>
+  <version>1.2-SNAPSHOT</version>
   <name>BKU Help</name>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/webapp</directory>
+      </resource>
+    </resources>
+  </build>
 </project>
\ No newline at end of file
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 523357f2..b3487f68 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -111,7 +111,7 @@
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/InstallCertificateServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/InstallCertificateServlet.java
new file mode 100644
index 00000000..0a9d001b
--- /dev/null
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/InstallCertificateServlet.java
@@ -0,0 +1,149 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.local.webapp;
+
+import iaik.pkcs.PKCS7CertList;
+import iaik.utils.Util;
+import java.io.IOException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class InstallCertificateServlet extends HttpServlet {
+  public static final String HTTPS_REDIRECT = "https://localhost:3496/";
+
+  public static final String SERVER_CA_CERTIFICATE_ATTRIBUTE = "mocca.tls.server.ca.certificate";
+  protected PKCS7CertList p7c;
+  private static final Log log = LogFactory.getLog(InstallCertificateServlet.class);
+
+  @Override
+  public void init() throws ServletException {
+    super.init();
+    Certificate caCert = (Certificate) getServletContext().getAttribute(SERVER_CA_CERTIFICATE_ATTRIBUTE);
+    if (caCert != null) {
+      try {
+        p7c = new PKCS7CertList();
+        p7c.setCertificateList(new iaik.x509.X509Certificate[] { Util.convertCertificate(caCert) });
+      } catch (CertificateException ex) {
+        log.error("failed to import local ca certificate " + SERVER_CA_CERTIFICATE_ATTRIBUTE, ex);
+      }
+    } else {
+      log.error("failed to import local ca certificate " + SERVER_CA_CERTIFICATE_ATTRIBUTE);
+    }
+  }
+
+  /**
+   * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+          throws ServletException, IOException {
+
+//    try {
+//      SSLContext sslCtx1 = SSLContext.getDefault();
+//      log.debug("Default SSLContext (" + sslCtx1.getProtocol() + "): " + sslCtx1.getClass().getName());
+//    } catch (NoSuchAlgorithmException ex) {
+//      log.debug("no sslContext: " + ex.getMessage(), ex);
+//    }
+//
+//    try {
+//      SSLContext sslCtx2 = SSLContext.getInstance("TLS");
+//      log.debug("TLS SSLContext: " + sslCtx2.getClass().getName());
+//
+//      SSLServerSocketFactory serverSocketFactory = sslCtx2.getServerSocketFactory();
+//      SSLSessionContext serverSessionContext = sslCtx2.getServerSessionContext();
+//
+//      if (serverSocketFactory != null) {
+//        log.debug("SSL ServerSocketFactory: " + serverSocketFactory.getClass().getName());
+//      }
+//      if (serverSessionContext != null) {
+//        log.debug("SSL ServerSessionContext: " + serverSessionContext.getClass().getName());
+//      }
+//    } catch (NoSuchAlgorithmException ex) {
+//      log.debug("no sslContext: " + ex.getMessage(), ex);
+//    }
+//
+//    try {
+//      SSLContext sslCtx3 = SSLContext.getInstance("SSLv3");
+//      log.debug("TLS SSLContext: " + sslCtx3.getClass().getName());
+//    } catch (NoSuchAlgorithmException ex) {
+//      log.debug("no sslContext: " + ex.getMessage(), ex);
+//    }
+
+
+ 
+
+
+    if (p7c != null) {
+      log.debug("returning local ca certificate");
+      response.setContentType("application/x-x509-ca-cert"); 
+      p7c.writeTo(response.getOutputStream());
+      response.getOutputStream().flush();
+    } else {
+      log.debug("no local ca certificate, redirecting to " + HTTPS_REDIRECT);
+      response.sendRedirect(HTTPS_REDIRECT);
+    }
+
+  }
+
+  // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+          throws ServletException, IOException {
+    processRequest(request, response);
+  }
+
+  /**
+   * Handles the HTTP <code>POST</code> method.
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doPost(HttpServletRequest request, HttpServletResponse response)
+          throws ServletException, IOException {
+    processRequest(request, response);
+  }
+
+  /**
+   * Returns a short description of the servlet.
+   * @return a String containing servlet description
+   */
+  @Override
+  public String getServletInfo() {
+    return "Short description";
+  }// </editor-fold>
+}
diff --git a/BKULocal/src/main/webapp/WEB-INF/web.xml b/BKULocal/src/main/webapp/WEB-INF/web.xml
index 83f33d9e..8768dbd8 100644
--- a/BKULocal/src/main/webapp/WEB-INF/web.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 <!--
   Copyright 2008 Federal Chancellery Austria and
   Graz University of Technology
@@ -16,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<web-app id="WebApp_ID">
+<web-app id="bkulocal" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
   <display-name>http-security-layer-request</display-name>
   
   <!--  Begin Spring Config -->
@@ -35,15 +34,15 @@
   <servlet>
     <servlet-name>BKUServlet</servlet-name>
     <servlet-class>at.gv.egiz.bku.local.webapp.BKURequestHandler</servlet-class>
-  </servlet>
-  <servlet>
-      <servlet-name>help</servlet-name>
-      <jsp-file>/help.jsp</jsp-file>
   </servlet>
     <servlet>
         <servlet-name>PINManagementServlet</servlet-name>
         <servlet-class>at.gv.egiz.bku.local.webapp.PINManagementServlet</servlet-class>
     </servlet>
+    <servlet>
+        <servlet-name>InstallCertificateServlet</servlet-name>
+        <servlet-class>at.gv.egiz.bku.local.webapp.InstallCertificateServlet</servlet-class>
+    </servlet>
     <servlet-mapping>
     <servlet-name>BKUServlet</servlet-name>
     <url-pattern>/http-security-layer-request</url-pattern>
@@ -52,16 +51,16 @@
     <servlet-name>BKUServlet</servlet-name>
     <url-pattern>/https-security-layer-request</url-pattern>
   </servlet-mapping>
-  <servlet-mapping>
-      <servlet-name>help</servlet-name>
-      <url-pattern>/help/*</url-pattern>
-  </servlet-mapping>
   <!--  Begin BKU Config -->
 
     <servlet-mapping>
         <servlet-name>PINManagementServlet</servlet-name>
         <url-pattern>/PINManagement</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>InstallCertificateServlet</servlet-name>
+        <url-pattern>/installCertificate</url-pattern>
+    </servlet-mapping>
     <welcome-file-list>
     <welcome-file>index.html</welcome-file>
     <welcome-file>index.htm</welcome-file>
diff --git a/BKULocal/src/main/webapp/img/chip16.ico b/BKULocal/src/main/webapp/img/chip16.ico
new file mode 100644
index 00000000..42175127
Binary files /dev/null and b/BKULocal/src/main/webapp/img/chip16.ico differ
diff --git a/BKULocal/src/main/webapp/img/chip48.png b/BKULocal/src/main/webapp/img/chip48.png
new file mode 100644
index 00000000..491fbcac
Binary files /dev/null and b/BKULocal/src/main/webapp/img/chip48.png differ
diff --git a/BKULocal/src/main/webapp/index.html b/BKULocal/src/main/webapp/index.html
index 537c154a..6aefe43c 100644
--- a/BKULocal/src/main/webapp/index.html
+++ b/BKULocal/src/main/webapp/index.html
@@ -14,21 +14,45 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>BKU Web Start - Willkommen</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <style type="text/css" media="all">@import "css/main.css";</style>
-    </head>
-    <body>
-        <h1>BKU Web Start - Willkommen</h1>
-        <div>
-          <p>Diese Seite installiert das MOCCA Zertifikat in ihrem Browser.
-        In jedem weiteren Browser können sie dieses durch Aufruf <a href="https://localhost:3496/index.html">dieser Seite</a> ebenso installieren.</p>
-        </div>
-        <div>
-          <a href="PINManagement?redirect=./index.html">PIN Verwaltung</a>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Bürgerkarte - Willkommen</title>
+    <link href="help/help.css" rel="stylesheet" type="text/css" />
+    <link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon"/>
+  </head>
+
+  <body class="twoColElsLtHdr">
+
+    <div id="container">
+      <div id="header">
+        <h1>Bürgerkarte</h1>
+        <!-- end #header --></div>
+      <div id="mainContent" style="margin: 1.5em 1.5em 0 1.5em">
+        <div style="float:left; margin-right:1em">
+          <img src="img/chip48.png" alt="Logo" width="48" height="48"/>
         </div>
-    </body>
+        <p>Um die Bürgerkartenumgebung zu verwenden installieren Sie bitte
+          zunächst das <a href="installCertificate">CA Zertifikat</a>.
+        </p>
+
+        <p style="float:none">Weiters können Sie</p>
+        <ul>
+          <li>die <a href="help">Hilfe durchsehen</a>,</li>
+          <li>die <a href="PINManagement?redirect=./index.html">PIN Verwaltung starten</a> oder </li>
+          <li>in jedem weiteren Web-Browser das <a href="installCertificate">CA Zertifikat installieren</a>.</li>
+        </ul>
+
+        <p><br class="clearfloat" /></p>
+
+      </div>
+      <div id="footer">
+        <p>
+          <a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+        </p>
+      </div>
+      <!-- end #container --></div>
+  </body>
 </html>
+
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index f03bc792..9fc36d63 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -39,7 +39,7 @@
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -302,12 +302,13 @@
       </build>
 
       <dependencies>
-            <!-- not yet available in IBIBLIO, install locally -->
+        <!-- not yet available in IBIBLIO, install locally
+         |   NOT REQUIRED FOR BASIC DOWNLOAD PROTOCOL
         <dependency>
           <groupId>org.codehaus.mojo.webstart</groupId>
           <artifactId>webstart-jnlp-servlet</artifactId>
           <version>1.0-6.0.02_ea_b02.1-SNAPSHOT</version>
-        </dependency>
+        </dependency-->
         <!-- dependency to ensure BKUWebStart is build prior to BKUOnline;
          |   transitive dependencies shall not be included in WEB-INF/lib
          |   and are provided in the BKUWebStart zip
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 462146d6..cef65ac2 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -51,9 +51,11 @@
       </plugin>
 
       <!-- Build the web start app
-       |   Default is to build BKUWebStart.zip incl. jnlp for local execution
-       |   If include-webstart is active, the jnlp will contain DownloadServlet specific placeholders (for codebase, etc) and versioning will be enabled.
-       |   If pkcs11-sign is active (ie. the release build), pack200 will be activated, the the PKCS11 keystore will be used (and the adopted version of the plugin will be used).
+       |   Default is to build BKUWebStart.zip incl. mocca.jnlp with versioning enabled and
+       |   containing DownloadServlet specific placeholders (for codebase, etc).
+       |   If pkcs11-sign is active (ie. the release build), pack200/gzip will be activated,
+       |   the the PKCS11 keystore will be used (and the adopted version of the plugin will be used).
+       |   If local-webstart is active, the jnlp will be prepared for local execution (development build)
        |-->
       <plugin>
         <artifactId>webstart-maven-plugin</artifactId>
@@ -98,8 +100,8 @@
             </keystoreConfig>
           </sign>
           <pack200>false</pack200>
-          <!--gzip>true</gzip-->
-          <outputJarVersions>true</outputJarVersions>
+          <gzip>false</gzip>
+          <outputJarVersions>false</outputJarVersions>
           <!-- unsign IAIK signed libs -->
           <unsignAlreadySignedJars>true</unsignAlreadySignedJars>
           <verbose>true</verbose>
@@ -190,9 +192,6 @@
                   <gen>false</gen>
                 </keystoreConfig>
               </sign>
-              <pack200>true</pack200>
-              <!--gzip>false</gzip-->
-              <outputJarVersions>true</outputJarVersions>
             </configuration>
           </plugin>
         </plugins>
@@ -212,7 +211,6 @@
                 <inputTemplate>template-local.xml</inputTemplate>
                 <outputFile>mocca-local.jnlp</outputFile>
               </jnlp>
-              <outputJarVersions>false</outputJarVersions>
             </configuration>
           </plugin>
         </plugins>
@@ -221,6 +219,14 @@
   </profiles>
 
   <dependencies>
+    <!-- ATTENTION update of application descriptor (jnlp file) is special...
+     |   The JNLP Client must use the Last-Modified header field returned by
+     |   the Web Server to determine if a newer JNLP file is present on the Web
+     |   server.
+     |   Don't assume changes to the descriptor (changes in dependencies) to
+     |   appear directly on the client descriptor (even if 'update available'
+     |   was shown to user).
+     |   Note: Download via browser ensures the updated jnlp file is used. -->
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKULocal</artifactId>
@@ -259,12 +265,12 @@
     <!-- JSP support
      |   http://jira.codehaus.org/browse/JETTY-827
      |   jsp-2.1-jetty-6.1.19 depends on the required jsp-2.1-glassfish jars (?)
-     |-->
+     |
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-jetty</artifactId>
       <version>6.1.19</version>
-    </dependency>
+    </dependency-->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java
index bef2246b..923a70d9 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java
@@ -56,7 +56,7 @@ public class Configurator {
    * configurations with less than this (major) version will be backuped and updated
    * allowed: MAJOR[.MINOR[.X[-SNAPSHOT]]]
    */
-  public static final String MIN_CONFIG_VERSION = "1.0.9";
+  public static final String MIN_CONFIG_VERSION = "1.2.4-SNAPSHOT";
   public static final String CONFIG_DIR = ".mocca/conf/";
   public static final String CERTS_DIR = ".mocca/certs/";
   public static final String VERSION_FILE = ".version";
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Container.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Container.java
index 08a0808a..3bf74d3c 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Container.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Container.java
@@ -2,9 +2,11 @@ package at.gv.egiz.bku.webstart;
 
 import at.gv.egiz.bku.utils.StreamUtil;
 import java.awt.AWTPermission;
+import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FilePermission;
@@ -15,8 +17,12 @@ import java.io.OutputStream;
 import java.lang.reflect.ReflectPermission;
 import java.net.NetPermission;
 import java.net.SocketPermission;
+import java.security.AllPermission;
+import java.security.KeyStore;
 import java.security.Permissions;
 import java.security.SecurityPermission;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
 import java.util.PropertyPermission;
 import javax.smartcardio.CardPermission;
 import org.apache.commons.logging.Log;
@@ -32,8 +38,9 @@ public class Container {
 
   public static final String HTTP_PORT_PROPERTY = "mocca.http.port";
   public static final String HTTPS_PORT_PROPERTY = "mocca.http.port";
-
+  public static final String SERVER_CA_CERTIFICATE_ATTRIBUTE = "mocca.tls.server.ca.certificate";
   private static Log log = LogFactory.getLog(Container.class);
+
   static {
     if (log.isDebugEnabled()) {
       //Jetty log INFO and WARN, include ignored exceptions
@@ -43,7 +50,6 @@ public class Container {
       //System.setProperty("DEBUG", "true");
     }
   }
-
   private Server server;
 
   public void init() throws IOException {
@@ -75,63 +81,98 @@ public class Container {
     }
     log.debug("loading MOCCA keystore from " + keystoreFile.getAbsolutePath());
     sslConnector.setKeystore(keystoreFile.getAbsolutePath());
-    File passwdFile = new File(configDir, Configurator.PASSWD_FILE);
-    BufferedReader reader = new BufferedReader(new FileReader(passwdFile));
-    String pwd;
-    while ((pwd = reader.readLine()) != null) {
-      sslConnector.setPassword(pwd);
-      sslConnector.setKeyPassword(pwd);
-    }
-    reader.close();
-    
+    String passwd = readPassword(new File(configDir, Configurator.PASSWD_FILE));
+    sslConnector.setPassword(passwd);
+    sslConnector.setKeyPassword(passwd);
+
     //avoid jetty's ClassCastException: iaik.security.ecc.ecdsa.ECPublicKey cannot be cast to java.security.interfaces.ECPublicKey
-    String[] RFC4492CipherSuites = new String[] {
+    String[] RFC4492CipherSuites = new String[]{
       "TLS_ECDH_ECDSA_WITH_NULL_SHA",
-     "TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
-     "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA",
-     "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA",
-     "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA",
-
-     "TLS_ECDHE_ECDSA_WITH_NULL_SHA",
-     "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
-     "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
-     "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
-     "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
-
-     "TLS_ECDH_RSA_WITH_NULL_SHA",
-     "TLS_ECDH_RSA_WITH_RC4_128_SHA",
-     "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA",
-     "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
-     "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA",
-
-     "TLS_ECDHE_RSA_WITH_NULL_SHA",
-     "TLS_ECDHE_RSA_WITH_RC4_128_SHA",
-     "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
-     "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
-     "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
-
-     "TLS_ECDH_anon_WITH_NULL_SHA",
-     "TLS_ECDH_anon_WITH_RC4_128_SHA",
-     "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
-     "TLS_ECDH_anon_WITH_AES_128_CBC_SHA",
-     "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"
+      "TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
+      "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA",
+      "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA",
+      "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA",
+      "TLS_ECDHE_ECDSA_WITH_NULL_SHA",
+      "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
+      "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
+      "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
+      "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
+      "TLS_ECDH_RSA_WITH_NULL_SHA",
+      "TLS_ECDH_RSA_WITH_RC4_128_SHA",
+      "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA",
+      "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
+      "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA",
+      "TLS_ECDHE_RSA_WITH_NULL_SHA",
+      "TLS_ECDHE_RSA_WITH_RC4_128_SHA",
+      "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
+      "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
+      "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
+      "TLS_ECDH_anon_WITH_NULL_SHA",
+      "TLS_ECDH_anon_WITH_RC4_128_SHA",
+      "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
+      "TLS_ECDH_anon_WITH_AES_128_CBC_SHA",
+      "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"
     };
 
     sslConnector.setExcludeCipherSuites(RFC4492CipherSuites);
 
-    server.setConnectors(new Connector[] { connector, sslConnector });
-    
+    server.setConnectors(new Connector[]{connector, sslConnector});
+
     WebAppContext webapp = new WebAppContext();
     webapp.setLogUrlOnStart(true);
     webapp.setContextPath("/");
-    webapp.setExtractWAR(true); 
+    webapp.setExtractWAR(true);
     webapp.setParentLoaderPriority(false);
 
+    try {
+      // no way to get certificate from within the servlet (SSLEngine/Jetty SSLSocketConnector/SSLContext?)
+      if (log.isTraceEnabled()) {
+        log.trace("local ca certificate from " + keystoreFile + " in webapp context at " + SERVER_CA_CERTIFICATE_ATTRIBUTE);
+      }
+      BufferedInputStream bis = new BufferedInputStream(new FileInputStream(keystoreFile));
+      KeyStore sslKeyStore = KeyStore.getInstance("JKS");
+      sslKeyStore.load(bis, passwd.toCharArray());
+      Certificate[] sslChain = sslKeyStore.getCertificateChain(TLSServerCA.MOCCA_TLS_SERVER_ALIAS);
+      webapp.setAttribute(SERVER_CA_CERTIFICATE_ATTRIBUTE, sslChain[sslChain.length - 1]);
+      bis.close();
+    } catch (Exception ex) {
+      log.error("Failed to load local ca certificate", ex);
+      log.warn("automated web certificate installation will not be available");
+    }
+
     webapp.setWar(copyWebapp(webapp.getTempDirectory()));
     webapp.setPermissions(getPermissions(webapp.getTempDirectory()));
-    
+
     server.setHandler(webapp);
-    server.setGracefulShutdown(1000*3);
+    server.setGracefulShutdown(1000 * 3);
+  }
+
+  /**
+   * @return The first valid (not empty, no comment) line of the passwd file
+   * @throws IOException
+   */
+  protected static String readPassword(File passwdFile) throws IOException {
+    if (passwdFile.exists() && passwdFile.canRead()) {
+      BufferedReader passwdReader = null;
+      try {
+        passwdReader = new BufferedReader(new FileReader(passwdFile));
+        String passwd;
+        while ((passwd = passwdReader.readLine().trim()) != null) {
+          if (passwd.length() > 0 && !passwd.startsWith("#")) {
+            return passwd;
+          }
+        }
+      } catch (IOException ex) {
+        log.error("failed to read password from " + passwdFile, ex);
+        throw ex;
+      } finally {
+        try {
+          passwdReader.close();
+        } catch (IOException ex) {
+        }
+      }
+    }
+    throw new IOException(passwdFile + " not readable");
   }
 
   private String copyWebapp(File webappDir) throws IOException {
@@ -146,43 +187,48 @@ public class Container {
 
   private Permissions getPermissions(File webappDir) {
     Permissions perms = new Permissions();
+    perms.add(new AllPermission());
+
+
+    if (false) {
+
+      // jetty-webstart (spring?)
+      perms.add(new RuntimePermission("getClassLoader"));
+
+      // standard permissions
+      perms.add(new PropertyPermission("*", "read,write"));
+      perms.add(new RuntimePermission("accessDeclaredMembers"));
+      perms.add(new RuntimePermission("accessClassInPackage.*"));
+      perms.add(new RuntimePermission("defineClassInPackage.*"));
+      perms.add(new RuntimePermission("setFactory"));
+      perms.add(new RuntimePermission("getProtectionDomain"));
+      perms.add(new RuntimePermission("modifyThread"));
+      perms.add(new RuntimePermission("modifyThreadGroup"));
+      perms.add(new RuntimePermission("setFactory"));
+      perms.add(new ReflectPermission("suppressAccessChecks"));
+
+      // MOCCA specific
+      perms.add(new SocketPermission("*", "connect,resolve"));
+      perms.add(new NetPermission("specifyStreamHandler"));
+      perms.add(new SecurityPermission("insertProvider.*"));
+      perms.add(new SecurityPermission("putProviderProperty.*"));
+      perms.add(new SecurityPermission("removeProvider.*"));
+      perms.add(new CardPermission("*", "*"));
+      perms.add(new AWTPermission("*"));
+
+      perms.add(new FilePermission(webappDir.getAbsolutePath() + "/-", "read"));
+      perms.add(new FilePermission(new File(System.getProperty("java.home") + "/lib/xalan.properties").getAbsolutePath(), "read"));
+      perms.add(new FilePermission(new File(System.getProperty("java.home") + "/lib/xerces.properties").getAbsolutePath(), "read"));
+      perms.add(new FilePermission(new File(System.getProperty("user.home")).getAbsolutePath(), "read, write"));
+      perms.add(new FilePermission(new File(System.getProperty("user.home") + "/-").getAbsolutePath(), "read, write"));
+      perms.add(new FilePermission(new File(System.getProperty("user.home") + "/.mocca/logs/*").getAbsolutePath(), "read, write,delete"));
+      perms.add(new FilePermission(new File(System.getProperty("user.home") + "/.mocca/certs/-").getAbsolutePath(), "read, write,delete"));
+
+      //TODO
+//    log.trace("granting file read/write permission to MOCCA local");
+//    perms.add(new FilePermission("<<ALL FILES>>", "read, write"));
 
-    // jetty-webstart (spring?)
-    perms.add(new RuntimePermission("getClassLoader"));
-
-    // standard permissions
-    perms.add(new PropertyPermission("*", "read,write"));
-    perms.add(new RuntimePermission("accessDeclaredMembers"));
-    perms.add(new RuntimePermission("accessClassInPackage.*"));
-    perms.add(new RuntimePermission("defineClassInPackage.*"));
-    perms.add(new RuntimePermission("setFactory"));
-    perms.add(new RuntimePermission("getProtectionDomain"));
-    perms.add(new RuntimePermission("modifyThread"));
-    perms.add(new RuntimePermission("modifyThreadGroup"));
-    perms.add(new RuntimePermission("setFactory"));
-    perms.add(new ReflectPermission("suppressAccessChecks"));
-
-    // MOCCA specific
-    perms.add(new SocketPermission("*", "connect,resolve"));
-    perms.add(new NetPermission("specifyStreamHandler"));
-    perms.add(new SecurityPermission("insertProvider.*"));
-    perms.add(new SecurityPermission("putProviderProperty.*"));
-    perms.add(new SecurityPermission("removeProvider.*"));
-    perms.add(new CardPermission("*", "*"));
-    perms.add(new AWTPermission("*"));
-
-    perms.add(new FilePermission(webappDir.getAbsolutePath() + "/-", "read"));
-    perms.add(new FilePermission(new File(System.getProperty("java.home") + "/lib/xalan.properties").getAbsolutePath(), "read"));
-    perms.add(new FilePermission(new File(System.getProperty("java.home") + "/lib/xerces.properties").getAbsolutePath(), "read"));
-    perms.add(new FilePermission(new File(System.getProperty("user.home")).getAbsolutePath(), "read, write"));
-    perms.add(new FilePermission(new File(System.getProperty("user.home") + "/-").getAbsolutePath(), "read, write"));
-    perms.add(new FilePermission(new File(System.getProperty("user.home") + "/.mocca/logs/*").getAbsolutePath(), "read, write,delete"));
-    perms.add(new FilePermission(new File(System.getProperty("user.home") + "/.mocca/certs/-").getAbsolutePath(), "read, write,delete"));
-
-    //TODO
-    log.trace("granting file read/write permission to MOCCA local");
-    perms.add(new FilePermission("<<ALL FILES>>", "read, write"));
-
+    }
     return perms;
   }
 
@@ -205,4 +251,4 @@ public class Container {
   public void join() throws InterruptedException {
     server.join();
   }
-}
\ No newline at end of file
+}
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
index 0cfc14e5..0106de62 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
@@ -27,6 +27,7 @@ import java.awt.event.WindowAdapter;
 import java.net.BindException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.util.jar.Attributes;
@@ -73,21 +74,25 @@ public class Launcher implements BKUControllerInterface, ActionListener {
   /** local bku uri */
   public static final URL HTTP_SECURITY_LAYER_URL;
   public static final URL HTTPS_SECURITY_LAYER_URL;
+  public static final URL INSTALL_CERT_URL;
   public static final URL PIN_MANAGEMENT_URL;
   static {
     URL http = null;
     URL https = null;
     URL pin = null;
+    URL cert = null;
     try {
       http = new URL("http://localhost:" + Integer.getInteger(Container.HTTPS_PORT_PROPERTY, 3495).intValue());
       https = new URL("https://localhost:" + Integer.getInteger(Container.HTTPS_PORT_PROPERTY, 3496).intValue());
       pin = new URL(http, "/PINManagement");
+      cert = new URL(http, "/installCertificate");
     } catch (MalformedURLException ex) {
       log.error(ex);
     } finally {
       HTTP_SECURITY_LAYER_URL = http;
       HTTPS_SECURITY_LAYER_URL = https;
       PIN_MANAGEMENT_URL = pin;
+      INSTALL_CERT_URL = cert;
     }
   }
   public static final String version;
@@ -273,7 +278,7 @@ public class Launcher implements BKUControllerInterface, ActionListener {
           Desktop desktop = Desktop.getDesktop();
           if (desktop.isSupported(Desktop.Action.BROWSE)) {
             try {
-              desktop.browse(HTTPS_SECURITY_LAYER_URL.toURI());
+              desktop.browse(HTTP_SECURITY_LAYER_URL.toURI());
             } catch (Exception ex) {
               log.error("failed to open system browser, install TLS certificate manually: " + HTTPS_SECURITY_LAYER_URL, ex);
             }
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/TLSServerCA.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/TLSServerCA.java
index 97ca716b..fd94958e 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/TLSServerCA.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/TLSServerCA.java
@@ -32,6 +32,7 @@ import org.apache.commons.logging.LogFactory;
 
 public class TLSServerCA {
   public static final int CA_VALIDITY_Y = 3;
+  public static final String MOCCA_TLS_SERVER_ALIAS = "server";
   public static final int SERVER_VALIDITY_Y = 3;
   private final static Log log = LogFactory.getLog(TLSServerCA.class);
 
@@ -127,7 +128,7 @@ public class TLSServerCA {
       generateServerCert();
       KeyStore ks = KeyStore.getInstance("JKS");
       ks.load(null, null);
-      ks.setKeyEntry("server", serverKeyPair.getPrivate(), password, new X509Certificate[]{serverCert, caCert});
+      ks.setKeyEntry(MOCCA_TLS_SERVER_ALIAS, serverKeyPair.getPrivate(), password, new X509Certificate[]{serverCert, caCert});
       return ks;
 //    } catch (Exception e) {
 //      log.error("Cannot generate certificate", e);
diff --git a/BKUWebStart/src/main/jnlp/resources/version.xml b/BKUWebStart/src/main/jnlp/resources/version.xml
index 451fe038..5e504b68 100644
--- a/BKUWebStart/src/main/jnlp/resources/version.xml
+++ b/BKUWebStart/src/main/jnlp/resources/version.xml
@@ -89,41 +89,6 @@
     </pattern>
     <file>servlet-api-2.5-20081211.jar</file>
   </resource>
-  <resource>
-    <pattern>
-      <name>jsp-2.1-jetty-6.1.19.jar</name>
-      <version-id>6.1.19</version-id>
-    </pattern>
-    <file>jsp-2.1-jetty-6.1.19.jar</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>jsp-2.1-glassfish-9.1.1.B60.25.p0.jar</name>
-      <version-id>9.1.1.B60.25.p0</version-id>
-    </pattern>
-    <file>jsp-2.1-glassfish-9.1.1.B60.25.p0.jar</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>jsp-api-2.1-glassfish-9.1.1.B60.25.p0.jar</name>
-      <version-id>9.1.1.B60.25.p0</version-id>
-    </pattern>
-    <file>jsp-api-2.1-glassfish-9.1.1.B60.25.p0.jar</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>ant-1.6.5.jar</name>
-      <version-id>1.6.5</version-id>
-    </pattern>
-    <file>ant-1.6.5.jar</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>core-3.1.1.jar</name>
-      <version-id>3.1.1</version-id>
-    </pattern>
-    <file>core-3.1.1.jar</file>
-  </resource>
   <resource>
     <pattern>
       <name>slf4j-api-1.5.8.jar</name>
diff --git a/BKUWebStart/src/main/jnlp/template.xml b/BKUWebStart/src/main/jnlp/template.xml
index a8ee0341..8181bc31 100644
--- a/BKUWebStart/src/main/jnlp/template.xml
+++ b/BKUWebStart/src/main/jnlp/template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jnlp spec="$jnlpspec" codebase="$$codebase" context="$$context" href="$$name">
+<jnlp spec="$jnlpspec" codebase="http://localhost:8080/webstart/" context="http://localhost:8080" href="mocca.jnlp">
 
   <information>
     <!--title>$project.Name</title-->
@@ -9,15 +9,15 @@
     <homepage href="$project.Url"/>
     <description>$project.Description (BKU) MOCCA Web Start</description>
     <description kind="short">$project.Description</description>
-    <icon kind="shortcut" href="img/chip16.png" width="16" height="16" version="2.0"/>
-    <icon kind="shortcut" href="img/chip24.png" width="24" height="24" version="2.0"/>
-    <icon kind="shortcut" href="img/chip32.png" width="32" height="32" version="2.0"/>
-    <icon kind="shortcut" href="img/chip48.png" width="48" height="48" version="2.0"/>
-    <icon kind="default" href="img/chip16.png" width="16" height="16" version="2.0"/>
-    <icon kind="default" href="img/chip24.png" width="24" height="24" version="2.0"/>
-    <icon kind="default" href="img/chip32.png" width="32" height="32" version="2.0"/>
-    <icon kind="default" href="img/chip48.png" width="48" height="48" version="2.0"/>
-    <icon kind="splash" href="img/splash.png" version="2.0"/>
+    <icon kind="shortcut" href="img/chip16.png" width="16" height="16"/>
+    <icon kind="shortcut" href="img/chip24.png" width="24" height="24"/>
+    <icon kind="shortcut" href="img/chip32.png" width="32" height="32"/>
+    <icon kind="shortcut" href="img/chip48.png" width="48" height="48"/>
+    <icon kind="default" href="img/chip16.png" width="16" height="16"/>
+    <icon kind="default" href="img/chip24.png" width="24" height="24"/>
+    <icon kind="default" href="img/chip32.png" width="32" height="32"/>
+    <icon kind="default" href="img/chip48.png" width="48" height="48"/>
+    <icon kind="splash" href="img/splash.png"/>
     <shortcut online="false">
       <desktop/>
       <menu submenu="e-Government"/>
@@ -39,13 +39,11 @@
 
   <resources os="Mac OS X">
     <java version="$j2seVersion" java-vm-args="-d32"/>
-    <property name="jnlp.versionEnabled" value="true"/>
      $dependencies
   </resources>
 
   <resources>
     <java version="$j2seVersion"/>
-    <property name="jnlp.versionEnabled" value="true"/>
      $dependencies
   </resources>
 
-- 
cgit v1.2.3


From 6d515d832b0c0828a63d0b68d7823054543761ff Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 27 Aug 2009 20:32:15 +0000
Subject: [maven-release-plugin] prepare release mocca-1.2.4

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@479 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml          | 14 +++++++-------
 BKUAppletExt/pom.xml       | 16 ++++++++--------
 BKUCertificates/pom.xml    |  2 +-
 BKUCommonGUI/pom.xml       |  8 ++++----
 BKUGuiExt/pom.xml          |  8 ++++----
 BKUHelp/pom.xml            |  4 ++--
 BKULocal/pom.xml           | 26 +++++++++++++-------------
 BKUOnline/pom.xml          | 26 +++++++++++++-------------
 BKUViewer/pom.xml          |  6 +++---
 BKUWebStart/pom.xml        |  6 +++---
 BKUWebStartPackage/pom.xml | 10 ++++------
 STAL/pom.xml               |  4 ++--
 STALExt/pom.xml            |  6 +++---
 STALService/pom.xml        |  6 +++---
 STALXService/pom.xml       |  8 ++++----
 bkucommon/pom.xml          |  8 ++++----
 pom.xml                    | 10 +++++-----
 smcc/pom.xml               |  4 ++--
 smccSTAL/pom.xml           | 10 +++++-----
 smccSTALExt/pom.xml        |  4 ++--
 utils/pom.xml              |  4 ++--
 21 files changed, 94 insertions(+), 96 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 0844dc95..78b7c809 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.4</version>
   <build>
     <plugins>
       <plugin>
@@ -98,27 +98,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index c85fc3d6..1cdfa5cc 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.4-SNAPSHOT</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.4-SNAPSHOT</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.4-SNAPSHOT</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.4-SNAPSHOT</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.4-SNAPSHOT</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.4-SNAPSHOT</version>
+            <version>1.2.4</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 450d9629..2a29bf9c 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 25c6e133..af0b7f3c 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.4-SNAPSHOT</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.4-SNAPSHOT</version>
+            <version>1.2.4</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 517e17ee..d25cbb87 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.4</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 6dbfd55f..79453c18 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.2-SNAPSHOT</version>
+  <version>1.2</version>
   <name>BKU Help</name>
   <build>
     <resources>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index b3487f68..427b1e6c 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.4-SNAPSHOT</version>
+		<version>1.2.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.4-SNAPSHOT</version>
+	<version>1.2.4</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -76,42 +76,42 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.4-SNAPSHOT</version>
+			<version>1.2.4</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.4-SNAPSHOT</version>
+			<version>1.2.4</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.4-SNAPSHOT</version>
+			<version>1.2.4</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.4-SNAPSHOT</version>
+			<version>1.2.4</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2-SNAPSHOT</version>
+      <version>1.2</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 72738b0d..eb1744eb 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.4</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -24,12 +24,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -39,7 +39,7 @@
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2-SNAPSHOT</version>
+      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -63,13 +63,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -115,13 +115,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -132,9 +132,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 27671999..b4361263 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.4-SNAPSHOT</version>
+		<version>1.2.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.4-SNAPSHOT</version>
+	<version>1.2.4</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.4-SNAPSHOT</version>
+			<version>1.2.4</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index d6369dec..27af82c1 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.4</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -107,7 +107,7 @@
     <dependency>
       <artifactId>utils</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
       <exclusions>
         <exclusion>
           <artifactId>iaik_ecc_signed</artifactId>
diff --git a/BKUWebStartPackage/pom.xml b/BKUWebStartPackage/pom.xml
index 2f9ccb5f..4cf033aa 100644
--- a/BKUWebStartPackage/pom.xml
+++ b/BKUWebStartPackage/pom.xml
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStartPackage</artifactId>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.4</version>
   <packaging>pom</packaging>
   <name>BKU Web Start Package</name>
   <description>Bürgerkartenumgebung</description>
@@ -183,4 +181,4 @@
       <!-- TODO somehow provide javaws.jar on manifest class-path -->
     </profile>
   </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/STAL/pom.xml b/STAL/pom.xml
index cf6f37e0..cc7573a0 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 36c6bb22..d7867a65 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.4</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index c2b965a2..7c4c749d 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.4-SNAPSHOT</version>
+            <version>1.2.4</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index a9016672..068eecda 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.4</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.4-SNAPSHOT</version>
+      <version>1.2.4</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index d62e7688..5e37a7dc 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.4-SNAPSHOT</version>
+		<version>1.2.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.4-SNAPSHOT</version>
+	<version>1.2.4</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.4-SNAPSHOT</version>
+			<version>1.2.4</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.4-SNAPSHOT</version>
+			<version>1.2.4</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 4d5e44b7..b5800ff0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.4</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -47,9 +47,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -244,7 +244,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.4</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index fc180459..28a07c64 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.4</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 44679cc2..24e893ea 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.4-SNAPSHOT</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.4-SNAPSHOT</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.4-SNAPSHOT</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index c414c437..82492851 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.4</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.2.4</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 74597049..61a75764 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.4-SNAPSHOT</version>
+		<version>1.2.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.4-SNAPSHOT</version>
+	<version>1.2.4</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 5eb05982f2e98f56569b4ea07b1961e3eed617d7 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 27 Aug 2009 20:32:33 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@481 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml          | 14 +++++++-------
 BKUAppletExt/pom.xml       | 16 ++++++++--------
 BKUCertificates/pom.xml    |  2 +-
 BKUCommonGUI/pom.xml       |  8 ++++----
 BKUGuiExt/pom.xml          |  8 ++++----
 BKUHelp/pom.xml            |  4 ++--
 BKULocal/pom.xml           | 26 +++++++++++++-------------
 BKUOnline/pom.xml          | 26 +++++++++++++-------------
 BKUViewer/pom.xml          |  6 +++---
 BKUWebStart/pom.xml        |  6 +++---
 BKUWebStartPackage/pom.xml |  4 ++--
 STAL/pom.xml               |  4 ++--
 STALExt/pom.xml            |  6 +++---
 STALService/pom.xml        |  6 +++---
 STALXService/pom.xml       |  8 ++++----
 bkucommon/pom.xml          |  8 ++++----
 pom.xml                    | 10 +++++-----
 smcc/pom.xml               |  4 ++--
 smccSTAL/pom.xml           | 10 +++++-----
 smccSTALExt/pom.xml        |  4 ++--
 utils/pom.xml              |  4 ++--
 21 files changed, 92 insertions(+), 92 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 78b7c809..8ce0c37f 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.4</version>
+  <version>1.2.5-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -98,27 +98,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 1cdfa5cc..06cc6884 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.4</version>
+        <version>1.2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 2a29bf9c..26509d97 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index af0b7f3c..e74960f9 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.4</version>
+        <version>1.2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index d25cbb87..b4421309 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.4</version>
+  <version>1.2.5-SNAPSHOT</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 79453c18..366a2666 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.2</version>
+  <version>1.3-SNAPSHOT</version>
   <name>BKU Help</name>
   <build>
     <resources>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 427b1e6c..23c626c4 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.4</version>
+		<version>1.2.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.4</version>
+	<version>1.2.5-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -76,42 +76,42 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.4</version>
+			<version>1.2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.4</version>
+			<version>1.2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.4</version>
+			<version>1.2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.4</version>
+			<version>1.2.5-SNAPSHOT</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2</version>
+      <version>1.3-SNAPSHOT</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index eb1744eb..8b9072b5 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.4</version>
+  <version>1.2.5-SNAPSHOT</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -24,12 +24,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -39,7 +39,7 @@
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2</version>
+      <version>1.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -63,13 +63,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -115,13 +115,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -132,9 +132,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index b4361263..827a7c6a 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.4</version>
+		<version>1.2.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.4</version>
+	<version>1.2.5-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.4</version>
+			<version>1.2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 27af82c1..de0e0f4a 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.4</version>
+  <version>1.2.5-SNAPSHOT</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -107,7 +107,7 @@
     <dependency>
       <artifactId>utils</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>iaik_ecc_signed</artifactId>
diff --git a/BKUWebStartPackage/pom.xml b/BKUWebStartPackage/pom.xml
index 4cf033aa..48e4a953 100644
--- a/BKUWebStartPackage/pom.xml
+++ b/BKUWebStartPackage/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStartPackage</artifactId>
-  <version>1.2.4</version>
+  <version>1.2.5-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>BKU Web Start Package</name>
   <description>Bürgerkartenumgebung</description>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index cc7573a0..94905376 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.4</version>
+        <version>1.2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index d7867a65..98e3cbae 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.4</version>
+  <version>1.2.5-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 7c4c749d..4cf5b577 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.4</version>
+        <version>1.2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.5-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 068eecda..982bf6c5 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.4</version>
+  <version>1.2.5-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.4</version>
+      <version>1.2.5-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 5e37a7dc..832f3882 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.4</version>
+		<version>1.2.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.4</version>
+	<version>1.2.5-SNAPSHOT</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.4</version>
+			<version>1.2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.4</version>
+			<version>1.2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index b5800ff0..a801b98d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.4</version>
+  <version>1.2.5-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -47,9 +47,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.4</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -244,7 +244,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.4</version>
+        <version>1.2.5-SNAPSHOT</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 28a07c64..ac67e507 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.4</version>
+  <version>1.2.5-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 24e893ea..9c39dbb8 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.4</version>
+        <version>1.2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index 82492851..b346b6c3 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.4</version>
+    <version>1.2.5-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.4</version>
+  <version>1.2.5-SNAPSHOT</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 61a75764..75f94b34 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.4</version>
+		<version>1.2.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.4</version>
+	<version>1.2.5-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 44ee3259546bdcfbdc54563aa2766cce3f5cd704 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 28 Aug 2009 20:13:07 +0000
Subject: [maven-release-plugin] prepare release mocca-1.2.3

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@488 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml          | 14 +++++++-------
 BKUAppletExt/pom.xml       | 16 ++++++++--------
 BKUCertificates/pom.xml    |  2 +-
 BKUCommonGUI/pom.xml       |  8 ++++----
 BKUGuiExt/pom.xml          |  8 ++++----
 BKUHelp/pom.xml            |  4 ++--
 BKULocal/pom.xml           | 26 +++++++++++++-------------
 BKUOnline/pom.xml          | 26 +++++++++++++-------------
 BKUViewer/pom.xml          |  6 +++---
 BKUWebStart/pom.xml        |  6 +++---
 BKUWebStartPackage/pom.xml |  4 ++--
 STAL/pom.xml               |  4 ++--
 STALExt/pom.xml            |  6 +++---
 STALService/pom.xml        |  6 +++---
 STALXService/pom.xml       |  8 ++++----
 bkucommon/pom.xml          |  8 ++++----
 pom.xml                    | 10 +++++-----
 smcc/pom.xml               |  4 ++--
 smccSTAL/pom.xml           | 10 +++++-----
 smccSTALExt/pom.xml        |  4 ++--
 utils/pom.xml              |  4 ++--
 21 files changed, 92 insertions(+), 92 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 8ce0c37f..4ee665ce 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.5</version>
   <build>
     <plugins>
       <plugin>
@@ -98,27 +98,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 06cc6884..413e2b18 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.5-SNAPSHOT</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
+            <version>1.2.5</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
+            <version>1.2.5</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
+            <version>1.2.5</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
+            <version>1.2.5</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
+            <version>1.2.5</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
+            <version>1.2.5</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 26509d97..99160fea 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index e74960f9..25cf4b44 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.5-SNAPSHOT</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
+            <version>1.2.5</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
+            <version>1.2.5</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index b4421309..d9a34ff5 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.5</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index cfdb7178..776cde01 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.5</version>
   <name>BKU Help</name>
   <build>
     <resources>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index c6f69d69..999ae3a3 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.5-SNAPSHOT</version>
+		<version>1.2.5</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.5-SNAPSHOT</version>
+	<version>1.2.5</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -72,42 +72,42 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.5-SNAPSHOT</version>
+			<version>1.2.5</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.5-SNAPSHOT</version>
+			<version>1.2.5</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.5-SNAPSHOT</version>
+			<version>1.2.5</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.5-SNAPSHOT</version>
+			<version>1.2.5</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index bb8af0c2..111616f1 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.5</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -24,12 +24,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -39,7 +39,7 @@
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -63,13 +63,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -115,13 +115,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -132,9 +132,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 827a7c6a..4cee95fc 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.5-SNAPSHOT</version>
+		<version>1.2.5</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.5-SNAPSHOT</version>
+	<version>1.2.5</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.5-SNAPSHOT</version>
+			<version>1.2.5</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 9f25fae6..0ea896ac 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.5</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -149,7 +149,7 @@
     <dependency>
       <artifactId>utils</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
       <exclusions>
         <exclusion>
           <artifactId>iaik_ecc_signed</artifactId>
diff --git a/BKUWebStartPackage/pom.xml b/BKUWebStartPackage/pom.xml
index 48e4a953..957df2ae 100644
--- a/BKUWebStartPackage/pom.xml
+++ b/BKUWebStartPackage/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStartPackage</artifactId>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.5</version>
   <packaging>pom</packaging>
   <name>BKU Web Start Package</name>
   <description>Bürgerkartenumgebung</description>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 94905376..ce54d730 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.5-SNAPSHOT</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 98e3cbae..83a30663 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.5</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 4cf5b577..cf4652c2 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.5-SNAPSHOT</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
+            <version>1.2.5</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 982bf6c5..605dadde 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.5</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.5-SNAPSHOT</version>
+      <version>1.2.5</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 832f3882..dae62182 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.5-SNAPSHOT</version>
+		<version>1.2.5</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.5-SNAPSHOT</version>
+	<version>1.2.5</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.5-SNAPSHOT</version>
+			<version>1.2.5</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.5-SNAPSHOT</version>
+			<version>1.2.5</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 8f64f170..35e53a68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.5</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -47,9 +47,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -244,7 +244,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.5-SNAPSHOT</version>
+        <version>1.2.5</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index ac67e507..586bf3f7 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.5</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 9c39dbb8..9d642b6a 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.5-SNAPSHOT</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
+            <version>1.2.5</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
+            <version>1.2.5</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
+            <version>1.2.5</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index b346b6c3..12c6dad4 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.2.5</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.5</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 75f94b34..69a28a74 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.5-SNAPSHOT</version>
+		<version>1.2.5</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.5-SNAPSHOT</version>
+	<version>1.2.5</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 68ebb57a05d44b25b886749719e7bd9997b0bd11 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 28 Aug 2009 20:16:01 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@490 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml          | 14 +++++++-------
 BKUAppletExt/pom.xml       | 16 ++++++++--------
 BKUCertificates/pom.xml    |  2 +-
 BKUCommonGUI/pom.xml       |  8 ++++----
 BKUGuiExt/pom.xml          |  8 ++++----
 BKUHelp/pom.xml            |  4 ++--
 BKULocal/pom.xml           | 26 +++++++++++++-------------
 BKUOnline/pom.xml          | 26 +++++++++++++-------------
 BKUViewer/pom.xml          |  6 +++---
 BKUWebStart/pom.xml        |  6 +++---
 BKUWebStartPackage/pom.xml |  4 ++--
 STAL/pom.xml               |  4 ++--
 STALExt/pom.xml            |  6 +++---
 STALService/pom.xml        |  6 +++---
 STALXService/pom.xml       |  8 ++++----
 bkucommon/pom.xml          |  8 ++++----
 pom.xml                    | 10 +++++-----
 smcc/pom.xml               |  4 ++--
 smccSTAL/pom.xml           | 10 +++++-----
 smccSTALExt/pom.xml        |  4 ++--
 utils/pom.xml              |  4 ++--
 21 files changed, 92 insertions(+), 92 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 4ee665ce..334ed694 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.5</version>
+  <version>1.2.6-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -98,27 +98,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 413e2b18..e43a70df 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.5</version>
+        <version>1.2.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 99160fea..b3f2290f 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 25cf4b44..5a3135e2 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.5</version>
+        <version>1.2.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.6-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index d9a34ff5..d03d7ccb 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.5</version>
+  <version>1.2.6-SNAPSHOT</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 776cde01..738505c7 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.2.5</version>
+  <version>1.2.6-SNAPSHOT</version>
   <name>BKU Help</name>
   <build>
     <resources>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 999ae3a3..a54e5701 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.5</version>
+		<version>1.2.6-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.5</version>
+	<version>1.2.6-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -72,42 +72,42 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.5</version>
+			<version>1.2.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.5</version>
+			<version>1.2.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.5</version>
+			<version>1.2.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.5</version>
+			<version>1.2.6-SNAPSHOT</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 111616f1..7a6775ee 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.5</version>
+  <version>1.2.6-SNAPSHOT</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -24,12 +24,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -39,7 +39,7 @@
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -63,13 +63,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -115,13 +115,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -132,9 +132,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 4cee95fc..a2ba90bf 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.5</version>
+		<version>1.2.6-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.5</version>
+	<version>1.2.6-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.5</version>
+			<version>1.2.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 0ea896ac..4ceba0b8 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.5</version>
+  <version>1.2.6-SNAPSHOT</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -149,7 +149,7 @@
     <dependency>
       <artifactId>utils</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>iaik_ecc_signed</artifactId>
diff --git a/BKUWebStartPackage/pom.xml b/BKUWebStartPackage/pom.xml
index 957df2ae..09e92ebc 100644
--- a/BKUWebStartPackage/pom.xml
+++ b/BKUWebStartPackage/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStartPackage</artifactId>
-  <version>1.2.5</version>
+  <version>1.2.6-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>BKU Web Start Package</name>
   <description>Bürgerkartenumgebung</description>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index ce54d730..bf2110b4 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.5</version>
+        <version>1.2.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 83a30663..afd970ad 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.5</version>
+  <version>1.2.6-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index cf4652c2..f0bc7e10 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.5</version>
+        <version>1.2.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 605dadde..700ae9ed 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.5</version>
+  <version>1.2.6-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.5</version>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index dae62182..41ba353c 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.5</version>
+		<version>1.2.6-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.5</version>
+	<version>1.2.6-SNAPSHOT</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.5</version>
+			<version>1.2.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.5</version>
+			<version>1.2.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 35e53a68..49e9dfa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.5</version>
+  <version>1.2.6-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -47,9 +47,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.3</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -244,7 +244,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.5</version>
+        <version>1.2.6-SNAPSHOT</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 586bf3f7..a3a4e84a 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.5</version>
+  <version>1.2.6-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 9d642b6a..b0b62a3e 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.5</version>
+        <version>1.2.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index 12c6dad4..c8a9c935 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.5</version>
+    <version>1.2.6-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.5</version>
+  <version>1.2.6-SNAPSHOT</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 69a28a74..8e011964 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.5</version>
+		<version>1.2.6-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.5</version>
+	<version>1.2.6-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 3ca1928f20603069058bf89dce1a47599d064091 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 8 Sep 2009 15:55:46 +0000
Subject: Fixed Bug [#467] Border between Background image and border.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@505 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    | 45 ++++++++++++++++++++--
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   |  1 +
 .../egiz/bku/online/webapp/BKURequestHandler.java  |  6 +++
 BKUOnline/src/main/webapp/SLRequestForm.html       |  3 ++
 BKUOnline/src/main/webapp/applet.jsp               |  4 +-
 .../java/at/gv/egiz/smcc/ccid/ReaderFactory.java   |  1 +
 6 files changed, 56 insertions(+), 4 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 95ac3553..94673266 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -26,6 +26,7 @@ import java.util.Locale;
 
 import javax.net.ssl.HttpsURLConnection;
 import javax.swing.JApplet;
+import javax.swing.JPanel;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -35,6 +36,7 @@ import at.gv.egiz.bku.gui.BKUGUIImpl;
 import at.gv.egiz.stal.service.STALPortType;
 import at.gv.egiz.stal.service.STALService;
 import java.applet.AppletContext;
+import java.awt.Color;
 import java.awt.Container;
 import javax.xml.namespace.QName;
 
@@ -44,6 +46,8 @@ import javax.xml.namespace.QName;
  */
 public class BKUApplet extends JApplet {
 
+  private static final long serialVersionUID = 1L;
+  
   private static Log log = LogFactory.getLog(BKUApplet.class);
   /**
    * Applet parameter keys
@@ -56,6 +60,7 @@ public class BKUApplet extends JApplet {
   public final static String HELP_URL = "HelpURL";
   public final static String SESSION_ID = "SessionID";
   public static final String BACKGROUND_IMG = "Background";
+  public static final String BACKGROUND_COLOR = "BackgroundColor";
   public static final String REDIRECT_URL = "RedirectURL";
   public static final String REDIRECT_TARGET = "RedirectTarget";
   public static final String HASHDATA_DISPLAY_FRAME = "frame";
@@ -82,6 +87,23 @@ public class BKUApplet extends JApplet {
   protected AppletBKUWorker worker;
   protected Thread workerThread;
 
+  /* (non-Javadoc)
+   * @see java.applet.Applet#getParameterInfo()
+   */
+  @Override
+  public String[][] getParameterInfo() {
+    return new String[][] {
+        {WSDL_URL,          "url",                      "URL of the WSDL of the MOCCA server side STAL"},
+        {REDIRECT_URL,      "url",                      "URL to redirect the browser to when finished"},
+        {REDIRECT_TARGET,   "frame target",             "name of the target frame for redirection when finished"},
+        {LOCALE,            "locale",                   "locale for UI localization (optional, default: system default)"},
+        {GUI_STYLE,         "simple, advanced, tiny",   "GUI style (optional, default: simple)"},
+        {BACKGROUND_COLOR,  "#hhhhhh",                  "background color, e.g. '#333333' (optional, default: look and feel dependend)"},
+        {BACKGROUND_IMG,    "url",                      "URL of a background image for the GUI (optional, default: no image)"},
+        {HELP_URL,          "url",                      "URL for locating help files, e.g. '../help/' (no help provided if missing)"}
+    };
+  }
+
   /**
    * Factory method to create and wire HelpListener, GUI and BKUWorker.
    * (Config via applet parameters, see BKUApplet.* constants)
@@ -130,7 +152,24 @@ public class BKUApplet extends JApplet {
       log.warn("failed to load help URL: " + ex.getMessage() + ", disabling help");
     }
 
-    BKUGUIFacade gui = createGUI(getContentPane(), getLocale(),
+    // Note: We need a panel in order to be able to set the background properly.
+    // Setting the background without a panel has side effects with the
+    // different java plugins.
+    JPanel contentPanel = new JPanel();
+    getContentPane().add(contentPanel);
+    
+    String backgroundColor = getParameter(BACKGROUND_COLOR);
+    if (backgroundColor != null && backgroundColor.startsWith("#")) {
+      try {
+        Color color = new Color(Integer.parseInt(backgroundColor.substring(1), 16));
+        log.debug("setting background color to " + color);
+        contentPanel.setBackground(color);
+      } catch (NumberFormatException e) {
+        log.debug("failed to set background color '" + backgroundColor + "'");
+      }
+    }
+    
+    BKUGUIFacade gui = createGUI(contentPanel, getLocale(),
             guiStyle,
             backgroundImgURL,
             helpListener);
@@ -255,8 +294,8 @@ public class BKUApplet extends JApplet {
         throw ex;
       }
     } else {
-      log.error("applet paremeter " + urlParam + " not set");
-      throw new MalformedURLException(urlParam + " not set");
+      log.error("applet paremeter " + paramKey + " not set");
+      throw new MalformedURLException(paramKey + " not set");
     }
   }
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 5ea2499a..35a53ff7 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -218,6 +218,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
         log.debug("loading background " + background);
         contentPanel = new ImagePanel(background);
       }
+      contentPanel.setOpaque(false);
       mainPanel = new JPanel();
       mainPanel.setOpaque(false);
       buttonPanel = new JPanel(); 
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
index 333e3d70..f6d7a50c 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
@@ -130,6 +130,8 @@ public class BKURequestHandler extends SpringBKUServlet {
         .getFormData("appletHeight"), charset);
     String background = getStringFromStream(bindingProcessor
         .getFormData("appletBackground"), charset);
+    String backgroundColor = getStringFromStream(bindingProcessor
+        .getFormData("appletBackgroundColor"), charset);
     String guiStyle = getStringFromStream(bindingProcessor
         .getFormData("appletGuiStyle"), charset);
     String hashDataDisplay = getStringFromStream(bindingProcessor
@@ -161,6 +163,10 @@ public class BKURequestHandler extends SpringBKUServlet {
       log.trace("Found applet background parameter: " + background);
       session.setAttribute("appletBackground", background);
     }
+    if (backgroundColor != null) {
+      log.trace("Faund applet background color parameter: " + backgroundColor);
+      session.setAttribute("appletBackgroundColor", backgroundColor);
+    }
     if (guiStyle != null) {
       log.trace("Found applet GUI style parameter: " + guiStyle);
       session.setAttribute("appletGuiStyle", guiStyle);
diff --git a/BKUOnline/src/main/webapp/SLRequestForm.html b/BKUOnline/src/main/webapp/SLRequestForm.html
index 997a3c82..f705a0cb 100644
--- a/BKUOnline/src/main/webapp/SLRequestForm.html
+++ b/BKUOnline/src/main/webapp/SLRequestForm.html
@@ -159,6 +159,9 @@
                     name="appletHeight" value="130" id="appletHeight">
                 <p><label for="appletBackground">Applet Background</label> <input
                     name="appletBackground" value="" id="appletBackground">
+                <p><label for="appletBackgroundColor">Applet Background Color</label> <input
+                    name="appletBackgroundColor" value="" id="appletBackgroundColor">
+                </p>
 
                 <p>
                     <label for="appletPage">Applet Page</label>
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
index 1e38cc04..5b9f2274 100644
--- a/BKUOnline/src/main/webapp/applet.jsp
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -36,9 +36,10 @@
                 : (Integer) session.getAttribute("appletWidth"); 
         int height = session.getAttribute("appletHeight") == null ? 130
                 : (Integer) session.getAttribute("appletHeight");
-        String backgroundImg = session.getAttribute("appletBackground") == null
+        String backgroundImg = session.getAttribute("appletBackground") == null 
                 ? "../img/chip32.png"
                 : (String) session.getAttribute("appletBackground");
+        String backgroundColor = (String) session.getAttribute("appletBackgroundColor");
         String guiStyle = (String) session.getAttribute("appletGuiStyle");
         String locale = (String) session.getAttribute("locale");
         String extension = (String) session.getAttribute("extension");
@@ -91,6 +92,7 @@
                       GuiStyle : '<%=guiStyle%>',
                       Locale : '<%=locale%>',
                       Background : '<%=backgroundImg%>',
+                      BackgroundColor : '<%=backgroundColor%>',
                       WSDL_URL :'../stal;jsessionid=<%=session.getId()%>?wsdl',
                       HelpURL : '../help/',
                       SessionID : '<%=session.getId()%>',
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java b/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java
index e0625a53..32a9ce9f 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java
@@ -61,6 +61,7 @@ public class ReaderFactory {
       //           http://www.linux-club.de/viewtopic.php?f=61&t=101287&start=0
       //old: REINER SCT CyberJack 00 00
       //new (CCID): 0C4B/0300 Reiner-SCT cyberJack pinpad(a) 00 00
+      //Mac "Snow Leopard": Reiner-SCT cyberJack pinpad(a) 00 00
       //display: REINER SCT CyberJack 00 00
       if(name.startsWith("gemplus gempc pinpad") || name.startsWith("gemalto gempc pinpad")) {
         reader = new GemplusGemPCPinpad(icc, ct);
-- 
cgit v1.2.3


From 025657248e87001b91a5eb90cdc24fb20bc2c62b Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 9 Sep 2009 07:54:21 +0000
Subject: [maven-release-plugin] prepare release mocca-1.2.6

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@506 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml          | 14 +++++++-------
 BKUAppletExt/pom.xml       | 16 ++++++++--------
 BKUCertificates/pom.xml    |  2 +-
 BKUCommonGUI/pom.xml       |  8 ++++----
 BKUGuiExt/pom.xml          |  8 ++++----
 BKUHelp/pom.xml            |  4 ++--
 BKULocal/pom.xml           | 26 +++++++++++++-------------
 BKUOnline/pom.xml          | 26 +++++++++++++-------------
 BKUViewer/pom.xml          |  6 +++---
 BKUWebStart/pom.xml        |  6 +++---
 BKUWebStartPackage/pom.xml |  4 ++--
 STAL/pom.xml               |  4 ++--
 STALExt/pom.xml            |  6 +++---
 STALService/pom.xml        |  6 +++---
 STALXService/pom.xml       |  8 ++++----
 bkucommon/pom.xml          |  8 ++++----
 pom.xml                    | 10 +++++-----
 smcc/pom.xml               |  4 ++--
 smccSTAL/pom.xml           | 10 +++++-----
 smccSTALExt/pom.xml        |  4 ++--
 utils/pom.xml              |  4 ++--
 21 files changed, 92 insertions(+), 92 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 334ed694..32805763 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.6-SNAPSHOT</version>
+  <version>1.2.6</version>
   <build>
     <plugins>
       <plugin>
@@ -98,27 +98,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index e43a70df..efe233e7 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.2.6</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.2.6</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.2.6</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.2.6</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.2.6</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.2.6</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index b3f2290f..796f094c 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 5a3135e2..28cdef91 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.2.6</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.2.6</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index d03d7ccb..6e2cf079 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.6-SNAPSHOT</version>
+  <version>1.2.6</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 738505c7..b338e942 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.2.6-SNAPSHOT</version>
+  <version>1.2.6</version>
   <name>BKU Help</name>
   <build>
     <resources>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index a54e5701..28047b96 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.6-SNAPSHOT</version>
+		<version>1.2.6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.6-SNAPSHOT</version>
+	<version>1.2.6</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -72,42 +72,42 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.6-SNAPSHOT</version>
+			<version>1.2.6</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.6-SNAPSHOT</version>
+			<version>1.2.6</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.6-SNAPSHOT</version>
+			<version>1.2.6</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.6-SNAPSHOT</version>
+			<version>1.2.6</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 7a6775ee..8c8e1873 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.6-SNAPSHOT</version>
+  <version>1.2.6</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -24,12 +24,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -39,7 +39,7 @@
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -63,13 +63,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -115,13 +115,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -132,9 +132,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index a2ba90bf..024fb90b 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.6-SNAPSHOT</version>
+		<version>1.2.6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.6-SNAPSHOT</version>
+	<version>1.2.6</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.6-SNAPSHOT</version>
+			<version>1.2.6</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 4ceba0b8..06c269d3 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.6-SNAPSHOT</version>
+  <version>1.2.6</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -149,7 +149,7 @@
     <dependency>
       <artifactId>utils</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
       <exclusions>
         <exclusion>
           <artifactId>iaik_ecc_signed</artifactId>
diff --git a/BKUWebStartPackage/pom.xml b/BKUWebStartPackage/pom.xml
index 09e92ebc..c2a1bf26 100644
--- a/BKUWebStartPackage/pom.xml
+++ b/BKUWebStartPackage/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStartPackage</artifactId>
-  <version>1.2.6-SNAPSHOT</version>
+  <version>1.2.6</version>
   <packaging>pom</packaging>
   <name>BKU Web Start Package</name>
   <description>Bürgerkartenumgebung</description>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index bf2110b4..b81fddfc 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index afd970ad..6f2e4c61 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.6-SNAPSHOT</version>
+  <version>1.2.6</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index f0bc7e10..db97c974 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.2.6</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 700ae9ed..3e647d61 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.6-SNAPSHOT</version>
+  <version>1.2.6</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 41ba353c..2a33d977 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.6-SNAPSHOT</version>
+		<version>1.2.6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.6-SNAPSHOT</version>
+	<version>1.2.6</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.6-SNAPSHOT</version>
+			<version>1.2.6</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.6-SNAPSHOT</version>
+			<version>1.2.6</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 49e9dfa8..c7bdab5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.6-SNAPSHOT</version>
+  <version>1.2.6</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -47,9 +47,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -244,7 +244,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.6</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index a3a4e84a..6e71273e 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.6-SNAPSHOT</version>
+  <version>1.2.6</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index b0b62a3e..efa5ed53 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.2.6</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.2.6</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.2.6</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index c8a9c935..a9dba949 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.6</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.6-SNAPSHOT</version>
+  <version>1.2.6</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 8e011964..5a8d7907 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.6-SNAPSHOT</version>
+		<version>1.2.6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.6-SNAPSHOT</version>
+	<version>1.2.6</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From ce450c6eee4977040072b5f51a91183c15846b1a Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 9 Sep 2009 07:54:58 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@508 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml          | 14 +++++++-------
 BKUAppletExt/pom.xml       | 16 ++++++++--------
 BKUCertificates/pom.xml    |  2 +-
 BKUCommonGUI/pom.xml       |  8 ++++----
 BKUGuiExt/pom.xml          |  8 ++++----
 BKUHelp/pom.xml            |  2 +-
 BKULocal/pom.xml           | 24 ++++++++++++------------
 BKUOnline/pom.xml          | 24 ++++++++++++------------
 BKUViewer/pom.xml          |  6 +++---
 BKUWebStart/pom.xml        |  6 +++---
 BKUWebStartPackage/pom.xml |  4 ++--
 STAL/pom.xml               |  4 ++--
 STALExt/pom.xml            |  6 +++---
 STALService/pom.xml        |  6 +++---
 STALXService/pom.xml       |  8 ++++----
 bkucommon/pom.xml          |  8 ++++----
 pom.xml                    | 10 +++++-----
 smcc/pom.xml               |  4 ++--
 smccSTAL/pom.xml           | 10 +++++-----
 smccSTALExt/pom.xml        |  4 ++--
 utils/pom.xml              |  4 ++--
 21 files changed, 89 insertions(+), 89 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 32805763..547c4098 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.6</version>
+  <version>1.2.7-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -98,27 +98,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index efe233e7..832ed03b 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.6</version>
+        <version>1.2.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 796f094c..e72f42cb 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 28cdef91..b6e779fc 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.6</version>
+        <version>1.2.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.7-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 6e2cf079..b3220ede 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.6</version>
+  <version>1.2.7-SNAPSHOT</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index b338e942..366ed202 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 28047b96..63ecfc34 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.6</version>
+		<version>1.2.7-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.6</version>
+	<version>1.2.7-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -72,37 +72,37 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.6</version>
+			<version>1.2.7-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.6</version>
+			<version>1.2.7-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.6</version>
+			<version>1.2.7-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.6</version>
+			<version>1.2.7-SNAPSHOT</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 8c8e1873..ed7f7d50 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.6</version>
+  <version>1.2.7-SNAPSHOT</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -24,12 +24,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -63,13 +63,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -115,13 +115,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -132,9 +132,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 024fb90b..4069374c 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.6</version>
+		<version>1.2.7-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.6</version>
+	<version>1.2.7-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.6</version>
+			<version>1.2.7-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 06c269d3..18652eec 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.6</version>
+  <version>1.2.7-SNAPSHOT</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -149,7 +149,7 @@
     <dependency>
       <artifactId>utils</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>iaik_ecc_signed</artifactId>
diff --git a/BKUWebStartPackage/pom.xml b/BKUWebStartPackage/pom.xml
index c2a1bf26..014c3337 100644
--- a/BKUWebStartPackage/pom.xml
+++ b/BKUWebStartPackage/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStartPackage</artifactId>
-  <version>1.2.6</version>
+  <version>1.2.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>BKU Web Start Package</name>
   <description>Bürgerkartenumgebung</description>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index b81fddfc..3e04a917 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.6</version>
+        <version>1.2.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 6f2e4c61..553b8804 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.6</version>
+  <version>1.2.7-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index db97c974..68bcb875 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.6</version>
+        <version>1.2.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.7-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 3e647d61..90d5e048 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.6</version>
+  <version>1.2.7-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.6</version>
+      <version>1.2.7-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 2a33d977..240d0a42 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.6</version>
+		<version>1.2.7-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.6</version>
+	<version>1.2.7-SNAPSHOT</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.6</version>
+			<version>1.2.7-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.6</version>
+			<version>1.2.7-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index c7bdab5e..feaf775f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.6</version>
+  <version>1.2.7-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -47,9 +47,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.6</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -244,7 +244,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.6</version>
+        <version>1.2.7-SNAPSHOT</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 6e71273e..7bb547a3 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.6</version>
+  <version>1.2.7-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index efa5ed53..a46cb87f 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.6</version>
+        <version>1.2.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.6</version>
+            <version>1.2.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index a9dba949..d0b96076 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.6</version>
+    <version>1.2.7-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.6</version>
+  <version>1.2.7-SNAPSHOT</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 5a8d7907..7e29c7ac 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.6</version>
+		<version>1.2.7-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.6</version>
+	<version>1.2.7-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 3b59e8f40dbddf0a752d39bb7d5c8bab86546205 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 2 Oct 2009 17:48:37 +0000
Subject: [#439], [#478] MOCCA Dialog is AlwaysOnTop (follow up for [#439])

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@518 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java    | 9 +++++++++
 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java    | 1 +
 .../src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java     | 1 +
 .../main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java    | 6 ++++++
 4 files changed, 17 insertions(+)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 35a53ff7..b84a2164 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -23,6 +23,7 @@ import java.awt.Color;
 import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.Font;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -1243,6 +1244,14 @@ public class BKUGUIImpl implements BKUGUIFacade {
       if (secureViewer == null) {
         secureViewer = new SecureViewerDialog(null, messages,
                 helpListener.getActionListener());
+
+        // workaround for [#439]
+        // avoid AlwaysOnTop at least in applet, otherwise make secureViewer AlwaysOnTop since MOCCA Dialog (JFrame created in LocalSTALFactory) is always on top.
+        Window window = SwingUtilities.getWindowAncestor(contentPane);
+        if (window != null && window.isAlwaysOnTop()) {
+          log.debug("make secureViewer alwaysOnTop");
+          secureViewer.setAlwaysOnTop(true);
+        }
       }
       secureViewer.setContent(dataToBeSigned);
       log.trace("show secure viewer returned");
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
index 364da6ec..48393101 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
@@ -86,6 +86,7 @@ public class HelpViewer extends JDialog
     }
     dialog = new HelpViewer(frame, messages, ctx, helpURL); //, helpTopic);
     dialog.setVisible(true);
+    dialog.toFront();
   }
 
   private HelpViewer(Frame frame,
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
index 6a16306b..84c2a5ff 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
@@ -239,6 +239,7 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
     }
 
     setVisible(true);
+    toFront();
   }
 
   private JPanel createButtonPanel() { //ActionListener saveListener, String saveCommand) {
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java
index ddbcaf46..d961b56f 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java
@@ -33,6 +33,7 @@ import at.gv.egiz.bku.local.gui.LocalHelpListener;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.STALFactory;
 import java.awt.Image;
+import java.awt.Window;
 import java.awt.event.WindowAdapter;
 import java.net.URL;
 import java.util.ArrayList;
@@ -85,6 +86,11 @@ public class LocalSTALFactory implements STALFactory {
     // use undecorated JFrame instead of JWindow,
     // which creates an invisible owning frame and therefore cannot getFocusInWindow()
     JFrame dialog = new JFrame("Bürgerkarte");
+    if (log.isTraceEnabled()) {
+      log.debug("alwaysOnTop supported: " + dialog.isAlwaysOnTopSupported());
+    }
+    // [#439] make mocca dialog alwaysOnTop
+    dialog.setAlwaysOnTop(true);
     dialog.setIconImages(icons);
     dialog.setUndecorated(true);
 //    dialog.getRootPane().setWindowDecorationStyle(JRootPane.NONE);
-- 
cgit v1.2.3


From 390f6aab59c3fb7a9250d087dc9aec77b6bd865b Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 2 Oct 2009 17:56:27 +0000
Subject: [maven-release-plugin] prepare release mocca-1.2.7

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@519 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 14 +++++++-------
 BKUAppletExt/pom.xml    | 16 ++++++++--------
 BKUCertificates/pom.xml |  2 +-
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUGuiExt/pom.xml       |  8 ++++----
 BKUHelp/pom.xml         |  2 +-
 BKULocal/pom.xml        | 24 ++++++++++++------------
 BKUOnline/pom.xml       | 24 ++++++++++++------------
 BKUViewer/pom.xml       |  6 +++---
 BKUWebStart/pom.xml     |  4 ++--
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  8 ++++----
 pom.xml                 | 10 +++++-----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 smccSTALExt/pom.xml     |  4 ++--
 utils/pom.xml           |  4 ++--
 20 files changed, 86 insertions(+), 86 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 547c4098..c30d451c 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.7-SNAPSHOT</version>
+  <version>1.2.7</version>
   <build>
     <plugins>
       <plugin>
@@ -98,27 +98,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 832ed03b..5f19e8f2 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.7-SNAPSHOT</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.7-SNAPSHOT</version>
+            <version>1.2.7</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.7-SNAPSHOT</version>
+            <version>1.2.7</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.7-SNAPSHOT</version>
+            <version>1.2.7</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.7-SNAPSHOT</version>
+            <version>1.2.7</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.7-SNAPSHOT</version>
+            <version>1.2.7</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.7-SNAPSHOT</version>
+            <version>1.2.7</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index e72f42cb..183a5701 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index b6e779fc..5f0b5a1b 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.7-SNAPSHOT</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.7-SNAPSHOT</version>
+            <version>1.2.7</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.7-SNAPSHOT</version>
+            <version>1.2.7</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index b3220ede..7510706f 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.7-SNAPSHOT</version>
+  <version>1.2.7</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 366ed202..331317e7 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 63ecfc34..4b451c86 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.7-SNAPSHOT</version>
+		<version>1.2.7</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.7-SNAPSHOT</version>
+	<version>1.2.7</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -72,37 +72,37 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.7-SNAPSHOT</version>
+			<version>1.2.7</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.7-SNAPSHOT</version>
+			<version>1.2.7</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.7-SNAPSHOT</version>
+			<version>1.2.7</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.7-SNAPSHOT</version>
+			<version>1.2.7</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index c42ae981..3c622bae 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.7-SNAPSHOT</version>
+  <version>1.2.7</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -28,12 +28,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -67,13 +67,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -119,13 +119,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -136,9 +136,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 4069374c..8ec857eb 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.7-SNAPSHOT</version>
+		<version>1.2.7</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.7-SNAPSHOT</version>
+	<version>1.2.7</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.7-SNAPSHOT</version>
+			<version>1.2.7</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index b4f910f9..d66f8194 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.7-SNAPSHOT</version>
+  <version>1.2.7</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 3e04a917..23f14e69 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.7-SNAPSHOT</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 553b8804..46e5816a 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.7-SNAPSHOT</version>
+  <version>1.2.7</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 68bcb875..512ea24c 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.7-SNAPSHOT</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.7-SNAPSHOT</version>
+            <version>1.2.7</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 90d5e048..7a9b0891 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.7-SNAPSHOT</version>
+  <version>1.2.7</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.7</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 240d0a42..76d6339a 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.7-SNAPSHOT</version>
+		<version>1.2.7</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.7-SNAPSHOT</version>
+	<version>1.2.7</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.7-SNAPSHOT</version>
+			<version>1.2.7</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.7-SNAPSHOT</version>
+			<version>1.2.7</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 19818054..012cbcb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.7-SNAPSHOT</version>
+  <version>1.2.7</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -47,9 +47,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -244,7 +244,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.7-SNAPSHOT</version>
+        <version>1.2.7</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 7bb547a3..7ac2e852 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.7-SNAPSHOT</version>
+  <version>1.2.7</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index a46cb87f..78e903a1 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.7-SNAPSHOT</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.7-SNAPSHOT</version>
+            <version>1.2.7</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.7-SNAPSHOT</version>
+            <version>1.2.7</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.7-SNAPSHOT</version>
+            <version>1.2.7</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index d0b96076..50a53167 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.7-SNAPSHOT</version>
+  <version>1.2.7</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 7e29c7ac..ff9917cb 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.7-SNAPSHOT</version>
+		<version>1.2.7</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.7-SNAPSHOT</version>
+	<version>1.2.7</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From a47eafbbc567163f0319b066f65eaa7d2d9226c2 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 2 Oct 2009 17:56:38 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@521 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 14 +++++++-------
 BKUAppletExt/pom.xml    | 16 ++++++++--------
 BKUCertificates/pom.xml |  2 +-
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUGuiExt/pom.xml       |  8 ++++----
 BKUHelp/pom.xml         |  4 ++--
 BKULocal/pom.xml        | 26 +++++++++++++-------------
 BKUOnline/pom.xml       | 26 +++++++++++++-------------
 BKUViewer/pom.xml       |  6 +++---
 BKUWebStart/pom.xml     |  4 ++--
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  8 ++++----
 pom.xml                 | 10 +++++-----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 smccSTALExt/pom.xml     |  4 ++--
 utils/pom.xml           |  4 ++--
 20 files changed, 89 insertions(+), 89 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index c30d451c..397c5670 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.7</version>
+  <version>1.2.8-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -98,27 +98,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 5f19e8f2..488d0808 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.7</version>
+        <version>1.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.8-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 183a5701..dd4f355d 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 5f0b5a1b..9fecb661 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.7</version>
+        <version>1.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.8-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 7510706f..2291d7d6 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.7</version>
+  <version>1.2.8-SNAPSHOT</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 331317e7..07b31ddb 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.2.6</version>
+  <version>1.2.8-SNAPSHOT</version>
   <name>BKU Help</name>
   <build>
     <resources>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 4b451c86..73ed5cf3 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.7</version>
+		<version>1.2.8-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.7</version>
+	<version>1.2.8-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -72,42 +72,42 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.7</version>
+			<version>1.2.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.7</version>
+			<version>1.2.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.7</version>
+			<version>1.2.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.7</version>
+			<version>1.2.8-SNAPSHOT</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.6</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 3c622bae..408ce195 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.7</version>
+  <version>1.2.8-SNAPSHOT</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -28,12 +28,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -43,7 +43,7 @@
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.6</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -67,13 +67,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -119,13 +119,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -136,9 +136,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 8ec857eb..24605880 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.7</version>
+		<version>1.2.8-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.7</version>
+	<version>1.2.8-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.7</version>
+			<version>1.2.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index d66f8194..a4132ed9 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.7</version>
+  <version>1.2.8-SNAPSHOT</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 23f14e69..4435a483 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.7</version>
+        <version>1.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 46e5816a..6b94e071 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.7</version>
+  <version>1.2.8-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 512ea24c..b86f20cf 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.7</version>
+        <version>1.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.8-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 7a9b0891..334c6e0a 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.7</version>
+  <version>1.2.8-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.7</version>
+      <version>1.2.8-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 76d6339a..bb696fba 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.7</version>
+		<version>1.2.8-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.7</version>
+	<version>1.2.8-SNAPSHOT</version>
 
 	<build>
 		<plugins>
@@ -49,12 +49,12 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.7</version>
+			<version>1.2.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.7</version>
+			<version>1.2.8-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 012cbcb9..e1b6843b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.7</version>
+  <version>1.2.8-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -47,9 +47,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -244,7 +244,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.7</version>
+        <version>1.2.8-SNAPSHOT</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 7ac2e852..16d7635a 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.7</version>
+  <version>1.2.8-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 78e903a1..f11aa550 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.7</version>
+        <version>1.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index 50a53167..e2bf28d2 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.7</version>
+  <version>1.2.8-SNAPSHOT</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index ff9917cb..b372a616 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.7</version>
+		<version>1.2.8-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.7</version>
+	<version>1.2.8-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 4b8b858ddcab0bfbde80304a0f631233388a13d1 Mon Sep 17 00:00:00 2001
From: tzefferer <tzefferer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 16 Oct 2009 09:54:37 +0000
Subject: Keyboard accessibility for Online-BKU

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@528 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   5 +
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 280 ++++++++++++++++++---
 .../java/at/gv/egiz/bku/gui/HelpKeyListener.java   |  46 ++++
 .../at/gv/egiz/bku/gui/HelpLinkFocusManager.java   | 138 ++++++++++
 .../main/java/at/gv/egiz/bku/gui/HelpViewer.java   |   4 +
 .../at/gv/egiz/bku/gui/SecureViewerDialog.java     |  35 ++-
 .../gv/egiz/bku/gui/SwitchFocusFocusListener.java  |  38 +++
 .../at/gv/egiz/bku/gui/SwitchFocusListener.java    |  44 ++++
 .../at/gv/egiz/bku/gui/Messages.properties         |   2 +
 .../at/gv/egiz/bku/gui/Messages_en.properties      |   2 +
 .../resources/at/gv/egiz/bku/gui/help_focus.png    | Bin 0 -> 343 bytes
 .../test/java/at/gv/egiz/bku/gui/BKUGUITest.java   |   2 +-
 12 files changed, 557 insertions(+), 39 deletions(-)
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpKeyListener.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpLinkFocusManager.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusFocusListener.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusListener.java
 create mode 100644 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/help_focus.png

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 6c27910a..e4af6443 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -46,6 +46,7 @@ public interface BKUGUIFacade {
   public static final String DEFAULT_BACKGROUND = "/at/gv/egiz/bku/gui/chip32.png";
   public static final String DEFAULT_ICON = "/at/gv/egiz/bku/gui/chiperling105.png";
   public static final String HELP_IMG = "/at/gv/egiz/bku/gui/help.png";
+  public static final String HELP_IMG_FOCUS = "/at/gv/egiz/bku/gui/help_focus.png";
   public static final String HASHDATA_FONT = "Monospaced";
   public static final Color ERROR_COLOR = Color.RED;
   public static final Color HYPERLINK_COLOR = Color.BLUE;
@@ -75,6 +76,8 @@ public interface BKUGUIFacade {
   public static final String MESSAGE_ENTERPIN_PINPAD = "enterpin.pinpad";
   public static final String MESSAGE_HASHDATALINK = "hashdatalink";
   public static final String MESSAGE_HASHDATALINK_TINY = "hashdatalink.tiny";
+  public static final String MESSAGE_HASHDATALINK_FOCUS = "hashdatalink.focus";
+  public static final String MESSAGE_HASHDATALINK_TINY_FOCUS = "hashdatalink.tiny.focus";
   public static final String MESSAGE_HASHDATALIST = "hashdatalist";
   public static final String MESSAGE_RETRIES = "retries";
   public static final String MESSAGE_LAST_RETRY = "retries.last";
@@ -153,4 +156,6 @@ public interface BKUGUIFacade {
 
   public void showMessageDialog(String titleKey,
           String msgKey);
+  
+  public void getFocusFromBrowser();
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index b84a2164..e83502a8 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -26,6 +26,10 @@ import java.awt.Font;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionAdapter;
@@ -45,11 +49,14 @@ import javax.swing.JTable;
 import javax.swing.LayoutStyle;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+
+
 /**
  *
  * @author clemens
@@ -62,7 +69,9 @@ public class BKUGUIImpl implements BKUGUIFacade {
       LEFT, ABOVE
     }
 
-    protected HelpMouseListener helpListener;
+    protected HelpMouseListener helpMouseListener;
+    protected HelpKeyListener helpKeyListener;
+    protected SwitchFocusFocusListener switchFocusKeyListener;
     protected SecureViewerDialog secureViewer;
     
     protected Container contentPane;
@@ -77,6 +86,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
     /** right side fixed labels  */
     protected JLabel titleLabel;
     protected JLabel helpLabel;
+    protected JLabel switchFocusDummyLabel; 
     /** remember the pinfield to return to worker */
     protected JPasswordField pinField;
 
@@ -107,7 +117,8 @@ public class BKUGUIImpl implements BKUGUIFacade {
             Locale locale, 
             Style guiStyle, 
             URL background, 
-            ActionListener helpListener) {
+            ActionListener helpListener,
+            SwitchFocusListener switchFocusListener) {
       this.contentPane = contentPane;
 
       loadMessageBundle(locale);
@@ -122,8 +133,13 @@ public class BKUGUIImpl implements BKUGUIFacade {
         pinLabelPos = PinLabelPosition.ABOVE;
       }
 
+      // ensure that buttons can be fired with enter key too
+      UIManager.put("Button.defaultButtonFollowsFocus", Boolean.TRUE);
+      
       registerHelpListener(helpListener);
       
+      registerSwitchFocusListener(switchFocusListener);
+      
       createGUI(background);
     }
     
@@ -224,12 +240,35 @@ public class BKUGUIImpl implements BKUGUIFacade {
       mainPanel.setOpaque(false);
       buttonPanel = new JPanel(); 
       buttonPanel.setOpaque(false);
-
+      
       helpLabel = new JLabel();
       helpLabel.setIcon(new ImageIcon(getClass().getResource(HELP_IMG))); 
       helpLabel.getAccessibleContext().setAccessibleName(getMessage(ALT_HELP));
-      helpLabel.addMouseListener(helpListener);
+      helpLabel.setFocusable(true);
+      helpLabel.addMouseListener(helpMouseListener);
+      helpLabel.addKeyListener(helpKeyListener);
+      helpLabel.addFocusListener(new FocusAdapter() {
+    	 
+    	  @Override
+    	  public void focusGained(FocusEvent e) {
+    		     		 
+    		  helpLabel.setIcon(new ImageIcon(getClass().getResource(HELP_IMG_FOCUS)));
+    	  }
+    	  
+    	  @Override
+    	  public void focusLost(FocusEvent e) {
+    		 
+    		  helpLabel.setIcon(new ImageIcon(getClass().getResource(HELP_IMG)));
+    	  }
+    	  
+    	  
+      });
       helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+      
+      switchFocusDummyLabel = new JLabel();
+      switchFocusDummyLabel.setText("");
+      switchFocusDummyLabel.setFocusable(true);
+      switchFocusDummyLabel.addFocusListener(switchFocusKeyListener);
     
       buttonSize = initButtonSize();
         
@@ -248,11 +287,15 @@ public class BKUGUIImpl implements BKUGUIFacade {
           headerPanelLayout.createSequentialGroup()
             .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
             .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-            .addComponent(helpLabel));
+            .addComponent(switchFocusDummyLabel)
+            .addComponent(helpLabel)
+            );
         headerPanelLayout.setVerticalGroup(
           headerPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
             .addComponent(titleLabel, 0, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
-            .addComponent(helpLabel));
+            .addComponent(switchFocusDummyLabel)
+            .addComponent(helpLabel)
+            );
       }
 
       GroupLayout contentPanelLayout = new GroupLayout(contentPanel);
@@ -566,7 +609,8 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   } else {
                     infoLabel.setText(MessageFormat.format(infoPattern, new Object[] {pinSpec.getLocalizedName()}));
                   }
-                  helpListener.setHelpTopic(HELP_CARDPIN);
+                  helpMouseListener.setHelpTopic(HELP_CARDPIN);
+                  helpKeyListener.setHelpTopic(HELP_CARDPIN);
                 } else {
                   String retryPattern;
                   if (numRetries < 2) {
@@ -577,7 +621,8 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
                   infoLabel.setText(MessageFormat.format(retryPattern, new Object[]{String.valueOf(numRetries)}));
                   infoLabel.setForeground(ERROR_COLOR);
-                  helpListener.setHelpTopic(HELP_RETRY);
+                  helpMouseListener.setHelpTopic(HELP_RETRY);
+                  helpKeyListener.setHelpTopic(HELP_RETRY);
                 }
                 
                 JLabel pinsizeLabel = new JLabel();
@@ -595,9 +640,13 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 if (!renderHeaderPanel) {
                   infoHorizontal
                           .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel);
+                          .addComponent(switchFocusDummyLabel)
+                          .addComponent(helpLabel)
+                          ;
                   infoVertical
-                          .addComponent(helpLabel);
+                          .addComponent(switchFocusDummyLabel)
+                          .addComponent(helpLabel)
+                          ;
                 } 
 
                 // align pinfield and pinsize to the right
@@ -668,7 +717,9 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
                 buttonPanelLayout.setVerticalGroup(buttonVertical);
 
-                pinField.requestFocusInWindow();
+//                pinField.requestFocusInWindow();
+//                helpLabel.requestFocus();
+                pinField.requestFocus();
                 contentPanel.validate();
 
             }
@@ -715,7 +766,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   }
                 }
 
-                JLabel infoLabel = new JLabel();
+                final JLabel infoLabel = new JLabel();
                 if (numRetries < 0) {
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                   if (shortText) {
@@ -723,6 +774,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   } else {
                     infoLabel.setText(getMessage(MESSAGE_HASHDATALINK));
                   }
+                  infoLabel.setFocusable(true);
                   infoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
                   infoLabel.setForeground(HYPERLINK_COLOR);
                   infoLabel.addMouseListener(new MouseAdapter() {
@@ -733,7 +785,47 @@ public class BKUGUIImpl implements BKUGUIFacade {
                           hashdataListener.actionPerformed(e);
                       }
                   });
-                  helpListener.setHelpTopic(HELP_SIGNPIN);
+                  
+                  infoLabel.addKeyListener(new KeyAdapter() {
+                	  
+                 	 @Override
+                 	 public void keyPressed(KeyEvent e) {
+                 		 
+                 		 if(e.getKeyCode() == KeyEvent.VK_ENTER) {                			 
+                 			 ActionEvent e1 = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
+                              hashdataListener.actionPerformed(e1);
+                 		 }
+                 	 }
+                 	  
+                   });  
+                  
+                  infoLabel.addFocusListener(new FocusAdapter() {
+                	  
+                	  @Override
+                	  public void focusGained(FocusEvent e) {
+                		  
+                          if (shortText) {
+                              infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_TINY_FOCUS));
+                            } else {
+                              infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_FOCUS));
+                            }
+                	  }
+                	  
+                	  @Override
+                	  public void focusLost(FocusEvent e) {
+                		  
+                          if (shortText) {
+                              infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_TINY));
+                            } else {
+                              infoLabel.setText(getMessage(MESSAGE_HASHDATALINK));
+                            }
+                		  
+                	  }                	  
+                	  
+                  });                  
+                  
+                  helpMouseListener.setHelpTopic(HELP_SIGNPIN);
+                  helpKeyListener.setHelpTopic(HELP_SIGNPIN);
                 } else {
                   String retryPattern;
                   if (numRetries < 2) {
@@ -741,10 +833,12 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   } else {
                     retryPattern = getMessage(MESSAGE_RETRIES);
                   }
+                  infoLabel.setFocusable(true);
                   infoLabel.setText(MessageFormat.format(retryPattern, new Object[]{String.valueOf(numRetries)}));
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
                   infoLabel.setForeground(ERROR_COLOR);
-                  helpListener.setHelpTopic(HELP_RETRY);
+                  helpMouseListener.setHelpTopic(HELP_RETRY);
+                  helpKeyListener.setHelpTopic(HELP_RETRY);
                 }
 
                 String msgPattern = getMessage(MESSAGE_ENTERPIN_PINPAD);
@@ -766,9 +860,13 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 if (!renderHeaderPanel) {
                   infoHorizontal
                           .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel);
+                          .addComponent(switchFocusDummyLabel)
+                          .addComponent(helpLabel)
+                          ;
                   infoVertical
-                          .addComponent(helpLabel);
+                          .addComponent(switchFocusDummyLabel)
+                          .addComponent(helpLabel)
+                          ;
                 }
 
                 mainPanelLayout.setHorizontalGroup(
@@ -837,7 +935,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   }
                 }
 
-                JLabel infoLabel = new JLabel();
+                final JLabel infoLabel = new JLabel();
                 if (numRetries < 0) {
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                   if (shortText) {
@@ -845,6 +943,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   } else {
                     infoLabel.setText(getMessage(MESSAGE_HASHDATALINK));
                   }
+                  infoLabel.setFocusable(true);
                   infoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
                   infoLabel.setForeground(HYPERLINK_COLOR);
                   infoLabel.addMouseListener(new MouseAdapter() {
@@ -855,7 +954,49 @@ public class BKUGUIImpl implements BKUGUIFacade {
                           hashdataListener.actionPerformed(e);
                       }
                   });
-                  helpListener.setHelpTopic(HELP_SIGNPIN);
+                  
+                  infoLabel.addKeyListener(new KeyAdapter() {
+                	  
+                	 @Override
+                	 public void keyPressed(KeyEvent e) {
+                		 
+                		 if(e.getKeyCode() == KeyEvent.VK_ENTER) {                			 
+                			 ActionEvent e1 = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
+                             hashdataListener.actionPerformed(e1);
+                		 }
+                	 }
+                	  
+                  });
+                  
+                  infoLabel.addFocusListener(new FocusAdapter() {
+                	  
+                	  @Override
+                	  public void focusGained(FocusEvent e) {
+                		  
+                		  
+                          if (shortText) {
+                              infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_TINY_FOCUS));
+                            } else {
+                              infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_FOCUS));
+                            }
+                	  }
+                	  
+                	  @Override
+                	  public void focusLost(FocusEvent e) {
+                		  
+                		  
+                          if (shortText) {
+                              infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_TINY));
+                            } else {
+                              infoLabel.setText(getMessage(MESSAGE_HASHDATALINK));
+                            }
+                		  
+                	  }                	  
+                	  
+                  });
+                  
+                  helpMouseListener.setHelpTopic(HELP_SIGNPIN);
+                  helpKeyListener.setHelpTopic(HELP_SIGNPIN);
                 } else {
                   String retryPattern;
                   if (numRetries < 2) {
@@ -863,10 +1004,12 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   } else {
                     retryPattern = getMessage(MESSAGE_RETRIES);
                   }
+                  infoLabel.setFocusable(true);
                   infoLabel.setText(MessageFormat.format(retryPattern, new Object[]{String.valueOf(numRetries)}));
                   infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
                   infoLabel.setForeground(ERROR_COLOR);
-                  helpListener.setHelpTopic(HELP_RETRY);
+                  helpMouseListener.setHelpTopic(HELP_RETRY);
+                  helpKeyListener.setHelpTopic(HELP_RETRY);
                 }
 
                 JButton signButton = new JButton();
@@ -895,6 +1038,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                     }
                 });
 
+                
                 JLabel pinsizeLabel = new JLabel();
                 pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
                 pinsizeLabel.setText(MessageFormat.format(getMessage(LABEL_PINSIZE), pinSpec.getLocalizedLength()));
@@ -910,9 +1054,13 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 if (!renderHeaderPanel) {
                   infoHorizontal
                           .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(helpLabel);
+                          .addComponent(switchFocusDummyLabel)
+                          .addComponent(helpLabel)
+                          ;
                   infoVertical
-                          .addComponent(helpLabel);
+                          .addComponent(switchFocusDummyLabel)
+                          .addComponent(helpLabel)
+                          ;
                 }
 
                 // align pinfield and pinsize to the right
@@ -973,21 +1121,27 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   buttonHorizontal
                           .addComponent(signButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
                           .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
+                          ;
                   buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
                           .addComponent(signButton)
-                          .addComponent(cancelButton);
+                          .addComponent(cancelButton)
+                          ;
                 } else {
                   buttonHorizontal
-                          .addComponent(signButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
+                          .addComponent(signButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
+                          ;
                   buttonVertical = buttonPanelLayout.createSequentialGroup()
-                          .addComponent(signButton);
+                          .addComponent(signButton)
+                          ;
                 }
 
                 buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
                 buttonPanelLayout.setVerticalGroup(buttonVertical);
 
-                pinField.requestFocusInWindow();
+//                pinField.requestFocusInWindow();
+//                helpLabel.requestFocus();
+                pinField.requestFocus();
                 contentPanel.validate();
 
             }
@@ -1065,7 +1219,8 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   titleLabel.setText(getMessage(titleKey));
                 }
 
-                helpListener.setHelpTopic(msgKey);
+                helpMouseListener.setHelpTopic(msgKey);
+                helpKeyListener.setHelpTopic(msgKey);
 
                 String msgPattern = getMessage(msgKey);
                 String msg = MessageFormat.format(msgPattern, msgParams);
@@ -1080,6 +1235,9 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 GroupLayout.ParallelGroup mainHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING);
                 GroupLayout.SequentialGroup mainVertical = mainPanelLayout.createSequentialGroup();
 
+                log.debug("focus to contentPanel");
+                contentPanel.requestFocus();
+                
                 if (!renderHeaderPanel) {
                   JLabel titleLabel = new JLabel();
                   titleLabel.setFont(titleLabel.getFont().deriveFont(titleLabel.getFont().getStyle() | Font.BOLD));
@@ -1092,11 +1250,18 @@ public class BKUGUIImpl implements BKUGUIFacade {
                           .addGroup(mainPanelLayout.createSequentialGroup()
                             .addComponent(titleLabel)
                             .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                            .addComponent(helpLabel));
+                            .addComponent(switchFocusDummyLabel)
+                            .addComponent(helpLabel)
+                            );
                   mainVertical
                           .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
                             .addComponent(titleLabel)
-                            .addComponent(helpLabel));
+                            .addComponent(switchFocusDummyLabel)
+                            .addComponent(helpLabel)
+                            );
+                  
+                  log.debug("focus to helpLabel");
+                  helpLabel.requestFocus();
                 }
 
                 mainPanelLayout.setHorizontalGroup(mainHorizontal
@@ -1105,6 +1270,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                         .addComponent(msgLabel));
 
                 if (okListener != null) {
+                	
                   JButton okButton = new JButton();
                   okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~java.awt.Font.BOLD));
                   okButton.setText(getMessage((buttonKey != null) ? buttonKey : BUTTON_OK));
@@ -1120,6 +1286,9 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   buttonPanelLayout.setVerticalGroup(
                     buttonPanelLayout.createSequentialGroup()
                       .addComponent(okButton));
+                  
+                  log.debug("focus to ok-button");
+                  okButton.requestFocus();
                 }
 
                 contentPanel.validate();
@@ -1243,7 +1412,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
       log.debug("show secure viewer [" + Thread.currentThread().getName() + "]");
       if (secureViewer == null) {
         secureViewer = new SecureViewerDialog(null, messages,
-                helpListener.getActionListener());
+                helpMouseListener.getActionListener());
 
         // workaround for [#439]
         // avoid AlwaysOnTop at least in applet, otherwise make secureViewer AlwaysOnTop since MOCCA Dialog (JFrame created in LocalSTALFactory) is always on top.
@@ -1276,7 +1445,8 @@ public class BKUGUIImpl implements BKUGUIFacade {
             titleLabel.setText(getMessage(TITLE_HASHDATA));
           }
           
-          helpListener.setHelpTopic(HELP_HASHDATALIST);
+          helpMouseListener.setHelpTopic(HELP_HASHDATALIST);
+          helpKeyListener.setHelpTopic(HELP_HASHDATALIST);
           
           JLabel refIdLabel = new JLabel();
           refIdLabel.setFont(refIdLabel.getFont().deriveFont(refIdLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
@@ -1335,10 +1505,14 @@ public class BKUGUIImpl implements BKUGUIFacade {
           
           if (!renderHeaderPanel) {
             messageHorizontal
-                    .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                    .addComponent(helpLabel);
-            messageVertical
-                    .addComponent(helpLabel);
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)                    
+                    .addComponent(switchFocusDummyLabel)
+                    .addComponent(helpLabel)
+                    ;
+            messageVertical                    
+                    .addComponent(switchFocusDummyLabel)
+                    .addComponent(helpLabel)
+                    ;
           }
 
           mainPanelLayout.setHorizontalGroup(
@@ -1469,19 +1643,42 @@ public class BKUGUIImpl implements BKUGUIFacade {
 
     private void registerHelpListener(ActionListener helpListener) {
       if (helpListener != null) {
-        this.helpListener = new HelpMouseListener(helpListener);
+        this.helpMouseListener = new HelpMouseListener(helpListener);
+        this.helpKeyListener = new HelpKeyListener(helpListener);
       } else {
         log.error("no help listener provided, will not be able to display help");
-        this.helpListener = new HelpMouseListener(new ActionListener() {
+        this.helpMouseListener = new HelpMouseListener(new ActionListener() {
 
           @Override
           public void actionPerformed(ActionEvent e) {
             log.error("no help listener registered (requested help topic: " + e.getActionCommand() + ")");
           }
         });
+        this.helpKeyListener = new HelpKeyListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+              log.error("no help listener registered (requested help topic: " + e.getActionCommand() + ")");
+            }
+          });
       }
     }
 
+    private void registerSwitchFocusListener(ActionListener switchFocusListener) {
+        if (switchFocusListener != null) {
+          this.switchFocusKeyListener = new SwitchFocusFocusListener(switchFocusListener);
+          
+        } else {
+   
+          this.switchFocusKeyListener = new SwitchFocusFocusListener(new ActionListener() {
+
+              @Override
+              public void actionPerformed(ActionEvent e) {
+                log.warn("no switch focus listener registered");
+              }
+            });          
+        }
+      }
 
     ////////////////////////////////////////////////////////////////////////////
     // INITIALIZERS (MAY BE OVERRIDDEN BY SUBCLASSES)
@@ -1539,4 +1736,13 @@ public class BKUGUIImpl implements BKUGUIFacade {
       }
       return bs;
     }
+
+	@Override
+	public void getFocusFromBrowser() {
+		
+		// This method puts the focus to the helpLabel as this 
+		// element is supposed to appear in each dialogue. 			
+		helpLabel.requestFocus();
+		
+	}
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpKeyListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpKeyListener.java
new file mode 100644
index 00000000..4ca20f7e
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpKeyListener.java
@@ -0,0 +1,46 @@
+package at.gv.egiz.bku.gui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * 
+ * @author Thomas Zefferer <thomas.zefferer@iaik.tugraz.at>
+ */
+public class HelpKeyListener extends KeyAdapter {
+
+	  protected static final Log log = LogFactory.getLog(HelpKeyListener.class);
+	  
+	  protected ActionListener helpListener;
+	  protected String locale;
+	  protected String topic;
+
+	  public HelpKeyListener(ActionListener externalHelpListener) {
+	    super();
+	    this.helpListener = externalHelpListener;
+	  }
+
+	  public void setHelpTopic(String topic) {
+	    log.trace("setting help topic: " + topic);
+	    this.topic = topic;
+	  }
+	  
+	  public ActionListener getActionListener() {
+	    return helpListener;
+	  }
+
+	  @Override
+	  public void keyPressed(KeyEvent arg0) {
+		  
+		  if(arg0.getKeyCode() == KeyEvent.VK_ENTER) { 
+			  ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, topic);
+			  helpListener.actionPerformed(e);
+		  }
+	  }
+	
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpLinkFocusManager.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpLinkFocusManager.java
new file mode 100644
index 00000000..f5882b3d
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpLinkFocusManager.java
@@ -0,0 +1,138 @@
+package at.gv.egiz.bku.gui;
+
+import java.awt.Color;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.net.URL;
+
+import javax.accessibility.AccessibleHyperlink;
+import javax.accessibility.AccessibleHypertext;
+import javax.swing.JEditorPane;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.text.DefaultStyledDocument;
+import javax.swing.text.Element;
+import javax.swing.text.MutableAttributeSet;
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.StyleConstants;
+
+/**
+ * 
+ * @author Thomas Zefferer <thomas.zefferer@iaik.tugraz.at>
+ */
+public final class HelpLinkFocusManager extends KeyAdapter { 
+
+	private static final int FOCUS_UNDEFINED = -1;
+	
+	private int focusedHyperlinkIndex = FOCUS_UNDEFINED;
+	private JEditorPane displayPane;
+	
+	public HelpLinkFocusManager(JEditorPane displayPane) {
+
+		super();
+		this.displayPane = displayPane;
+	}
+
+	public void keyPressed(KeyEvent e) {
+
+		AccessibleHypertext accessibleHypertext = (AccessibleHypertext) this.displayPane
+				.getAccessibleContext().getAccessibleText();
+
+		if (accessibleHypertext.getLinkCount() > 0) {
+			switch (e.getKeyCode()) {
+
+			case KeyEvent.VK_RIGHT:
+				if (this.focusedHyperlinkIndex != FOCUS_UNDEFINED) {
+					removeHyperlinkFocus();
+				}
+
+				this.focusedHyperlinkIndex++;
+
+				if (this.focusedHyperlinkIndex >= accessibleHypertext
+						.getLinkCount()) {
+
+					this.focusedHyperlinkIndex = 0;
+				}
+
+				setHyperlinkFocus();
+				break;
+
+			case KeyEvent.VK_LEFT:
+				if (this.focusedHyperlinkIndex != FOCUS_UNDEFINED) {
+					removeHyperlinkFocus();
+				}
+
+				this.focusedHyperlinkIndex--;
+
+				if (this.focusedHyperlinkIndex < 0) {
+					this.focusedHyperlinkIndex = accessibleHypertext
+							.getLinkCount() - 1;
+				}
+
+				setHyperlinkFocus();
+				break;
+
+			case KeyEvent.VK_SPACE:
+			case KeyEvent.VK_ENTER:
+				
+
+				AccessibleHyperlink link = accessibleHypertext
+						.getLink(this.focusedHyperlinkIndex);
+				if (link != null) {
+					URL url = (URL) link.getAccessibleActionObject(0);
+					Element element = ((DefaultStyledDocument) this.displayPane
+							.getDocument()).getCharacterElement(link
+							.getStartIndex());
+					HyperlinkEvent linkEvent = new HyperlinkEvent(
+							this.displayPane,
+							HyperlinkEvent.EventType.ACTIVATED, url, null,
+							element);
+					this.displayPane.fireHyperlinkUpdate(linkEvent);
+				}
+				
+				removeHyperlinkFocus();
+				this.focusedHyperlinkIndex = FOCUS_UNDEFINED;
+				break;
+			default: 
+				// nothig to do
+				break;
+			}
+		}
+	}
+
+	private void setHyperlinkFocus() {
+
+		AccessibleHypertext accessibleHypertext = (AccessibleHypertext) this.displayPane
+				.getAccessibleContext().getAccessibleText();
+		AccessibleHyperlink link = accessibleHypertext
+				.getLink(this.focusedHyperlinkIndex);		
+		
+		if (link != null) {
+			
+			MutableAttributeSet style = new SimpleAttributeSet();
+			StyleConstants.setForeground(style, Color.RED);
+			((DefaultStyledDocument) this.displayPane.getDocument())
+					.setCharacterAttributes(link.getStartIndex(), link
+							.getEndIndex()
+							- link.getStartIndex(), style, false);
+		}
+	}
+
+	private void removeHyperlinkFocus() {
+		Color textColor = Color.BLUE;
+		AccessibleHypertext accessibleHypertext = (AccessibleHypertext) this.displayPane
+				.getAccessibleContext().getAccessibleText();
+		AccessibleHyperlink link = accessibleHypertext
+				.getLink(this.focusedHyperlinkIndex);
+
+		if (link != null) {
+			
+			MutableAttributeSet style = new SimpleAttributeSet();
+			StyleConstants.setForeground(style, textColor);
+			((DefaultStyledDocument) this.displayPane.getDocument())
+					.setCharacterAttributes(link.getStartIndex(), link
+							.getEndIndex()
+							- link.getStartIndex(), style, false);
+		}
+	}
+
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
index 48393101..0f887f78 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
@@ -135,6 +135,10 @@ public class HelpViewer extends JDialog
     try {
       viewer.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
       viewer.setPage(helpURL);
+
+      HelpLinkFocusManager editorFocusManager = new HelpLinkFocusManager (viewer);
+      viewer.addKeyListener(editorFocusManager );
+      
       viewer.addHyperlinkListener(new HyperlinkListener() {
 
         @Override
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
index 84c2a5ff..ef70f94b 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
@@ -24,6 +24,10 @@ import java.awt.Font;
 import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.BufferedOutputStream;
@@ -149,7 +153,8 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
     infoVertical.addComponent(viewerLabel);
 
     if (helpListener != null) {
-      JLabel helpLabel = new JLabel();
+      final JLabel helpLabel = new JLabel();
+      helpLabel.setFocusable(true);
       helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG)));
       helpLabel.getAccessibleContext().setAccessibleName(messages.getString(BKUGUIFacade.ALT_HELP));
       helpLabel.addMouseListener(new MouseAdapter() {
@@ -159,6 +164,34 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
           ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, BKUGUIFacade.HELP_HASHDATAVIEWER);
           helpListener.actionPerformed(e);
         }
+      });
+      helpLabel.addKeyListener(new KeyAdapter() {
+
+          @Override
+          public void keyPressed(KeyEvent arg0) {
+        	  
+        	  if(arg0.getKeyCode() == KeyEvent.VK_ENTER) {
+	            ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, BKUGUIFacade.HELP_HASHDATAVIEWER);
+	            helpListener.actionPerformed(e);
+        	  }
+          }
+        });      
+      
+      helpLabel.addFocusListener(new FocusAdapter() {
+     	 
+    	  @Override
+    	  public void focusGained(FocusEvent e) {
+    		     		 
+    		  helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG_FOCUS)));
+    	  }
+    	  
+    	  @Override
+    	  public void focusLost(FocusEvent e) {
+    		 
+    		  helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG)));
+    	  }
+    	  
+    	  
       });
       helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusFocusListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusFocusListener.java
new file mode 100644
index 00000000..06e37a89
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusFocusListener.java
@@ -0,0 +1,38 @@
+package at.gv.egiz.bku.gui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * 
+ * @author Thomas Zefferer <thomas.zefferer@iaik.tugraz.at>
+ */
+public class SwitchFocusFocusListener extends FocusAdapter {
+
+	  protected static final Log log = LogFactory.getLog(SwitchFocusFocusListener.class);
+	  
+	  protected ActionListener swichFocusListener;
+
+	  public SwitchFocusFocusListener(ActionListener externalSwitchFocusListener) {
+	    super();
+	    this.swichFocusListener = externalSwitchFocusListener;
+	  }
+	  
+	  public ActionListener getActionListener() {
+	    return swichFocusListener;
+	  }
+	  
+	  @Override
+	  public void focusGained(FocusEvent arg0) {
+		  
+		  ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, null);
+		  swichFocusListener.actionPerformed(e);
+	  }
+	
+	
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusListener.java
new file mode 100644
index 00000000..1e3fabbd
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusListener.java
@@ -0,0 +1,44 @@
+package at.gv.egiz.bku.gui;
+
+import java.applet.AppletContext;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * 
+ * @author Thomas Zefferer <thomas.zefferer@iaik.tugraz.at>
+ */
+public class SwitchFocusListener implements ActionListener {
+
+	protected final static Log log = LogFactory.getLog(SwitchFocusListener.class);
+	
+	protected AppletContext ctx;
+	protected String javascriptFunction;
+	
+	  public SwitchFocusListener(AppletContext ctx, String javascriptFunction) {
+		    
+		    this.ctx = ctx;
+		    this.javascriptFunction = javascriptFunction;
+		  }
+	
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		
+	    try {
+	        ctx.showDocument
+	          (new URL("javascript:" + javascriptFunction));
+	        }
+	      catch (MalformedURLException me) { 
+	    	  
+	    	  log.warn("Unable to call external javascript function.", me);
+	      }
+		
+
+	}
+
+}
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 146d9353..a96b835f 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -40,6 +40,8 @@ enterpin=<html>{0} eingeben</html>
 enterpin.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben</html>
 hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
 hashdatalink.tiny=<html><a href=\"anzeige\">Signaturdaten</a></html>
+hashdatalink.focus=<html><a href=\"anzeige\">[Signaturdaten anzeigen]</a></html>
+hashdatalink.tiny.focus=<html><a href=\"anzeige\">[Signaturdaten]</a></html>
 #message.hashdata=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
 #message.hashdata=<html>Dies ist eine Voransicht des zu signierenden Inhaltes. F\u00FCr Details siehe Hilfe (i).</html> 
 #verwenden sie bitte die von ihrem System zur Verf\u00FCgung gestellte {0} Anwendung. 
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index 1a40aeea..c795b3fa 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -40,6 +40,8 @@ enterpin=<html>Enter {0}</html>
 enterpin.pinpad=<html>Enter {0} ({1} digits) on card reader pinpad</html>
 hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
 hashdatalink.tiny=<html><a href=\"anzeige\">signature data</a></html>
+hashdatalink.focus=<html><a href=\"anzeige\">[Display signature data]</a></html>
+hashdatalink.tiny.focus=<html><a href=\"anzeige\">[signature data]</a></html>
 #message.hashdata=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
 hashdatalist=<html>{0} signature data objects:</html>
 retries.last=<html>Last try!</html>
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/help_focus.png b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/help_focus.png
new file mode 100644
index 00000000..d650bea2
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/help_focus.png differ
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index b3eaf8c7..9f1cb612 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -41,7 +41,7 @@ public class BKUGUITest {
         Container contentPane = testFrame.getContentPane();
 //        contentPane.setPreferredSize(new Dimension(170, 150));
         contentPane.setPreferredSize(new Dimension(290, 190));
-        BKUGUIFacade gui = new BKUGUIImpl(contentPane, null, BKUGUIFacade.Style.advanced, null, null);
+        BKUGUIFacade gui = new BKUGUIImpl(contentPane, null, BKUGUIFacade.Style.advanced, null, null, null);
         BKUGUIWorker worker = new BKUGUIWorker();
         worker.init(gui);
         testFrame.pack();
-- 
cgit v1.2.3


From 83e8c95ea7d257166d350a59bfd81e9833ec14fd Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 5 Nov 2009 19:05:14 +0000
Subject: [#484] European Language support

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@535 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml                                  |   1 +
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    | 572 ++++++++--------
 .../bku/online/applet/viewer/URLFontLoader.java    |  82 +++
 BKUApplet/src/test/resources/appletTest.html       |  35 +-
 .../egiz/bku/online/applet/ActivationApplet.java   |   4 +-
 .../bku/online/applet/PINManagementApplet.java     |   4 +-
 BKUCommonGUI/pom.xml                               |  18 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   |  27 +-
 .../src/main/java/at/gv/egiz/bku/gui/BKUIcons.java |  57 ++
 .../at/gv/egiz/bku/gui/SecureViewerDialog.java     |  98 +--
 .../at/gv/egiz/bku/gui/viewer/FontProvider.java    |  40 ++
 .../egiz/bku/gui/viewer/FontProviderException.java |  29 +
 .../at/gv/egiz/bku/gui/Messages.properties         |   2 +-
 .../at/gv/egiz/bku/gui/Messages_en.properties      |   2 +-
 .../main/resources/at/gv/egiz/bku/gui/chip128.png  | Bin 0 -> 7775 bytes
 .../main/resources/at/gv/egiz/bku/gui/chip16.png   | Bin 0 -> 787 bytes
 .../main/resources/at/gv/egiz/bku/gui/chip24.png   | Bin 0 -> 1227 bytes
 .../main/resources/at/gv/egiz/bku/gui/chip48.png   | Bin 0 -> 2771 bytes
 .../test/java/at/gv/egiz/bku/gui/BKUGUITest.java   |   2 +-
 .../java/at/gv/egiz/bku/gui/DummyFontLoader.java   |  35 +
 .../at/gv/egiz/bku/gui/SecureViewerDialogTest.java | 165 +++++
 BKUFonts/pom.xml                                   |  43 ++
 BKUFonts/src/main/fonts/DejaVuLGCSans.ttf          | Bin 0 -> 498636 bytes
 BKUFonts/src/main/fonts/DejaVuLGCSansMono.ttf      | Bin 0 -> 282704 bytes
 BKUFonts/src/main/fonts/DejaVuLGCSerif.ttf         | Bin 0 -> 304924 bytes
 BKUFonts/src/main/fonts/LICENSE                    |  99 +++
 .../services/at.gv.egiz.bku.gui.SecureFontProvider |   3 +
 .../java/at/gv/egiz/bku/gui/ActivationGUI.java     |   6 +-
 .../main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java  |   5 +-
 .../java/at/gv/egiz/bku/gui/PINManagementGUI.java  |   4 +-
 .../at/gv/egiz/bku/gui/PINManagementGUIFacade.java |   1 -
 .../java/at/gv/egiz/bku/gui/ActivationGuiTest.java |   3 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |   1 -
 .../java/at/gv/egiz/bku/gui/DummyFontLoader.java   |  35 +
 .../gv/egiz/bku/local/stal/LocalSTALFactory.java   |  36 +-
 .../main/resources/at/gv/egiz/bku/gui/chip128.png  | Bin 7775 -> 0 bytes
 .../main/resources/at/gv/egiz/bku/gui/chip16.png   | Bin 787 -> 0 bytes
 .../main/resources/at/gv/egiz/bku/gui/chip24.png   | Bin 1227 -> 0 bytes
 .../main/resources/at/gv/egiz/bku/gui/chip32.png   | Bin 1753 -> 0 bytes
 .../main/resources/at/gv/egiz/bku/gui/chip48.png   | Bin 2771 -> 0 bytes
 BKUOnline/pom.xml                                  |  22 +
 .../stal/service/impl/STALRequestBrokerImpl.java   |   1 -
 BKUOnline/src/main/webapp/SLRequestForm.html       |  40 +-
 BKUOnline/src/main/webapp/applet.jsp               |  13 +-
 BKUOnline/src/main/webapp/index.html               |   3 +-
 BKUOnline/src/main/webapp/js/deployJava_orig.js    | 725 +++++++++++++++++++++
 BKUViewer/pom.xml                                  |  15 +-
 .../java/at/gv/egiz/bku/text/TextValidator.java    |  38 +-
 .../at/gv/egiz/bku/text/TestTextValidator.java     | 121 +++-
 bkucommon/pom.xml                                  |  10 +-
 .../at/gv/egiz/bku/viewer/ResourceFontLoader.java  |  61 ++
 .../at/gv/egiz/bku/viewer/ValidatorFactory.java    |  23 +-
 pom.xml                                            |   1 +
 53 files changed, 1983 insertions(+), 499 deletions(-)
 create mode 100644 BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUIcons.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProvider.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProviderException.java
 create mode 100644 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip128.png
 create mode 100644 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip16.png
 create mode 100644 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip24.png
 create mode 100644 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip48.png
 create mode 100644 BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java
 create mode 100644 BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
 create mode 100644 BKUFonts/pom.xml
 create mode 100644 BKUFonts/src/main/fonts/DejaVuLGCSans.ttf
 create mode 100644 BKUFonts/src/main/fonts/DejaVuLGCSansMono.ttf
 create mode 100644 BKUFonts/src/main/fonts/DejaVuLGCSerif.ttf
 create mode 100644 BKUFonts/src/main/fonts/LICENSE
 create mode 100644 BKUFonts/src/main/fonts/META-INF/services/at.gv.egiz.bku.gui.SecureFontProvider
 create mode 100644 BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java
 delete mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip128.png
 delete mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip16.png
 delete mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip24.png
 delete mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip32.png
 delete mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip48.png
 create mode 100644 BKUOnline/src/main/webapp/js/deployJava_orig.js
 create mode 100644 bkucommon/src/main/java/at/gv/egiz/bku/viewer/ResourceFontLoader.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 397c5670..4172517b 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -21,6 +21,7 @@
             </goals>
             <configuration>
               <includeGroupIds>at.gv.egiz</includeGroupIds>
+              <!-- don't include transitive dependency BKUFonts [runtime] from BKUCommonGUI -->
               <excludeTransitive>true</excludeTransitive>
               <outputDirectory>${project.build.outputDirectory}</outputDirectory>
               <excludes>META-INF\/</excludes>
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 6346b7f4..7a15f7a5 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -16,6 +16,7 @@
  */
 package at.gv.egiz.bku.online.applet;
 
+import at.gv.egiz.bku.online.applet.viewer.URLFontLoader;
 import at.gv.egiz.bku.gui.BKUGUIFacade.Style;
 import at.gv.egiz.bku.gui.DefaultHelpListener;
 import at.gv.egiz.bku.gui.AbstractHelpListener;
@@ -25,6 +26,8 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Locale;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.net.ssl.HttpsURLConnection;
 import javax.swing.JApplet;
 import javax.swing.JPanel;
@@ -34,6 +37,7 @@ import org.apache.commons.logging.LogFactory;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.BKUGUIImpl;
+import at.gv.egiz.bku.gui.viewer.FontProvider;
 import at.gv.egiz.stal.service.STALPortType;
 import at.gv.egiz.stal.service.STALService;
 import java.applet.AppletContext;
@@ -46,289 +50,287 @@ import javax.xml.namespace.QName;
  * Note: all swing code is executed by the event dispatch thread (see
  * BKUGUIFacade)
  */
-public class BKUApplet extends JApplet { 
-
-	private static final long serialVersionUID = 1L;
-
-	private static Log log = LogFactory.getLog(BKUApplet.class);
-	/**
-	 * Applet parameter keys
-	 */
-	public static final String GUI_STYLE = "GuiStyle";
-	public final static String LOCALE = "Locale";
-	public final static String WSDL_URL = "WSDL_URL";
-	public static final String HASHDATA_DISPLAY = "HashDataDisplay";
-	public final static String HASHDATA_URL = "HashDataURL";
-	public final static String HELP_URL = "HelpURL";
-	public final static String SESSION_ID = "SessionID";
-	public static final String BACKGROUND_IMG = "Background";
-	public static final String BACKGROUND_COLOR = "BackgroundColor";
-	public static final String REDIRECT_URL = "RedirectURL";
-	public static final String REDIRECT_TARGET = "RedirectTarget";
-	public static final String HASHDATA_DISPLAY_FRAME = "frame";
-	/**
-	 * STAL WSDL namespace and service name
-	 */
-	public static final String STAL_WSDL_NS = "http://www.egiz.gv.at/wsdl/stal";
-	public static final String STAL_SERVICE = "STALService";
-	/**
-	 * Dummy session id, used if no sessionId parameter is provided
-	 */
-	protected static final String TEST_SESSION_ID = "TestSession";
-
-	static {
-		if (log.isTraceEnabled()) {
-			log.trace("enabling webservice communication dump");
-			System
-					.setProperty(
-							"com.sun.xml.ws.transport.http.client.HttpTransportPipe.dump",
-							"true");
-		}
-	}
-
-	/**
-	 * STAL
-	 */
-	protected AppletBKUWorker worker;
-	protected Thread workerThread;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.applet.Applet#getParameterInfo()
-	 */
-	@Override
-	public String[][] getParameterInfo() {
-		return new String[][] {
-				{ WSDL_URL, "url",
-						"URL of the WSDL of the MOCCA server side STAL" },
-				{ REDIRECT_URL, "url",
-						"URL to redirect the browser to when finished" },
-				{ REDIRECT_TARGET, "frame target",
-						"name of the target frame for redirection when finished" },
-				{ LOCALE, "locale",
-						"locale for UI localization (optional, default: system default)" },
-				{ GUI_STYLE, "simple, advanced, tiny",
-						"GUI style (optional, default: simple)" },
-				{ BACKGROUND_COLOR, "#hhhhhh",
-						"background color, e.g. '#333333' (optional, default: look and feel dependend)" },
-				{ BACKGROUND_IMG, "url",
-						"URL of a background image for the GUI (optional, default: no image)" },
-				{ HELP_URL, "url",
-						"URL for locating help files, e.g. '../help/' (no help provided if missing)" } };
-	}
-
-	/**
-	 * Factory method to create and wire HelpListener, GUI and BKUWorker.
-	 * (Config via applet parameters, see BKUApplet.* constants)
-	 */
-	@Override
-	public void init() {
-		log.info("Welcome to MOCCA");
-		log.trace("Called init()");
-
-		HttpsURLConnection.setDefaultSSLSocketFactory(InternalSSLSocketFactory
-				.getInstance());
-
-		String locale = getParameter(LOCALE);
-		if (locale != null) {
-			this.setLocale(new Locale(locale));
-		}
-		log.trace("default locale: " + Locale.getDefault());
-		log.debug("setting locale: " + getLocale());
-
-		BKUGUIFacade.Style guiStyle;
-		String guiStyleParam = getParameter(GUI_STYLE);
-		if ("advanced".equals(guiStyleParam)) {
-			guiStyle = BKUGUIFacade.Style.advanced;
-		} else if ("tiny".equals(guiStyleParam)) {
-			guiStyle = BKUGUIFacade.Style.tiny;
-		} else {
-			guiStyle = BKUGUIFacade.Style.simple;
-		}
-		log.debug("setting gui-style: " + guiStyle);
-
-		URL backgroundImgURL = null;
-		try {
-			backgroundImgURL = getURLParameter(BACKGROUND_IMG, null);
-			log.debug("setting background: " + backgroundImgURL);
-		} catch (MalformedURLException ex) {
-			log.warn("cannot load applet background image: " + ex.getMessage());
-		}
-
-		AbstractHelpListener helpListener = null;
-		try {
-			helpListener = new DefaultHelpListener(getAppletContext(),
-					getURLParameter(HELP_URL, null), getLocale());
-			if (log.isDebugEnabled()) {
-				log
-						.debug("setting helpURL: "
-								+ getURLParameter(HELP_URL, null));
-			}
-		} catch (MalformedURLException ex) {
-			log.warn("failed to load help URL: " + ex.getMessage()
-					+ ", disabling help");
-		}
-
-		SwitchFocusListener switchFocusListener = new SwitchFocusListener(
-				getAppletContext(), "focusToBrowser()");
-
-		// Note: We need a panel in order to be able to set the background
-		// properly.
-		// Setting the background without a panel has side effects with the
-		// different java plugins.
-		JPanel contentPanel = new JPanel();
-		getContentPane().add(contentPanel);
-
-		String backgroundColor = getParameter(BACKGROUND_COLOR);
-		if (backgroundColor != null && backgroundColor.startsWith("#")) {
-			try {
-				Color color = new Color(Integer.parseInt(backgroundColor
-						.substring(1), 16));
-				log.debug("setting background color to " + color);
-				contentPanel.setBackground(color);
-			} catch (NumberFormatException e) {
-				log.debug("failed to set background color '" + backgroundColor
-						+ "'");
-			}
-		}
-
-		BKUGUIFacade gui = createGUI(contentPanel, getLocale(), guiStyle,
-				backgroundImgURL, helpListener, switchFocusListener);
-
-		worker = createBKUWorker(this, gui);
-	}
-
-	@Override
-	public void start() {
-		log.trace("Called start()");
-		workerThread = new Thread(worker);
-		workerThread.start();
-	}
-
-	@Override
-	public void stop() {
-		log.trace("Called stop()");
-		if ((workerThread != null) && (workerThread.isAlive())) {
-			workerThread.interrupt();
-		}
-	}
-
-	@Override
-	public void destroy() {
-		log.trace("Called destroy()");
-	}
-
-	// ///////////////////////////////////////////////////////////////////////////
-	// factory methods for subclasses to inject different components
-	// ///////////////////////////////////////////////////////////////////////////
-
-	protected BKUGUIFacade createGUI(Container contentPane, Locale locale,
-			Style guiStyle, URL backgroundImgURL,
-			AbstractHelpListener helpListener,
-			SwitchFocusListener switchFocusListener) {
-		return new BKUGUIImpl(contentPane, locale, guiStyle, backgroundImgURL,
-				helpListener, switchFocusListener);
-	}
-
-	protected AppletBKUWorker createBKUWorker(BKUApplet applet, BKUGUIFacade gui) {
-		return new AppletBKUWorker(applet, gui);
-	}
-
-	// ///////////////////////////////////////////////////////////////////////////
-	// callback for BKUWorker to allow extension
-	// ///////////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Callback for BKUWorker to allow extension
-	 * 
-	 * @return
-	 * @throws java.net.MalformedURLException
-	 */
-	public STALPortType getSTALPort() throws MalformedURLException {
-		URL wsdlURL = getURLParameter(WSDL_URL, null);
-		log.debug("setting STAL WSDL: " + wsdlURL);
-		QName endpointName = new QName(STAL_WSDL_NS, STAL_SERVICE);
-		STALService stal = new STALService(wsdlURL, endpointName);
-		return stal.getSTALPort();
-	}
-
-	/**
-	 * Callback for BKUWorker to allow extension (TODO STALPort could know its
-	 * STALTranslator)
-	 * 
-	 * @return
-	 * @throws java.net.MalformedURLException
-	 */
-	public STALTranslator getSTALTranslator() {
-		return new STALTranslator();
-	}
-
-	/**
-	 * Callback for BKUWorker to keep applet context out of BKUWorker
-	 * 
-	 * @return
-	 * @throws java.net.MalformedURLException
-	 */
-	protected void sendRedirect(String sessionId) {
-		try {
-			AppletContext ctx = getAppletContext();
-			if (ctx == null) {
-				log
-						.error("no applet context (applet might already have been destroyed)");
-				return;
-			}
-			URL redirectURL = getURLParameter(REDIRECT_URL, sessionId);
-			String redirectTarget = getParameter(REDIRECT_TARGET);
-			if (redirectTarget == null) {
-				log.info("Done. Redirecting to " + redirectURL + " ...");
-				ctx.showDocument(redirectURL);
-			} else {
-				log.info("Done. Redirecting to " + redirectURL + " (target="
-						+ redirectTarget + ") ...");
-				ctx.showDocument(redirectURL, redirectTarget);
-			}
-		} catch (MalformedURLException ex) {
-			log.warn("Failed to redirect: " + ex.getMessage(), ex);
-			// gui.showErrorDialog(errorMsg, okListener, actionCommand)
-		}
-	}
-
-	public void getFocusFromBrowser() {
-
-		worker.getFocusFromBrowser();
-	}
-
-	// ///////////////////////////////////////////////////////////////////////////
-	// utility methods
-	// ///////////////////////////////////////////////////////////////////////////
-
-	protected URL getURLParameter(String paramKey, String sessionId)
-			throws MalformedURLException {
-		String urlParam = getParameter(paramKey);
-		if (urlParam != null && !"".equals(urlParam)) {
-			URL codebase = getCodeBase();
-			try {
-				URL url;
-				if (codebase.getProtocol().equalsIgnoreCase("file")) {
-					// for debugging in appletrunner
-					url = new URL(urlParam);
-				} else {
-					if (sessionId != null) {
-						urlParam = urlParam + ";jsessionid=" + sessionId;
-					}
-					url = new URL(codebase, urlParam);
-				}
-				return url;
-			} catch (MalformedURLException ex) {
-				log.error("applet paremeter " + urlParam
-						+ " is not a valid URL: " + ex.getMessage());
-				throw ex;
-			}
-		} else {
-			log.error("applet paremeter " + paramKey + " not set");
-			throw new MalformedURLException(paramKey + " not set");
-		}
-	}
-
+public class BKUApplet extends JApplet {
+
+  private static final long serialVersionUID = 1L;
+  private static Log log = LogFactory.getLog(BKUApplet.class);
+  /**
+   * Applet parameter keys
+   */
+  public static final String GUI_STYLE = "GuiStyle";
+  public final static String LOCALE = "Locale";
+  public final static String WSDL_URL = "WSDL_URL";
+  public static final String HASHDATA_DISPLAY = "HashDataDisplay";
+  public final static String HASHDATA_URL = "HashDataURL";
+  public final static String HELP_URL = "HelpURL";
+  public final static String SESSION_ID = "SessionID";
+  public static final String BACKGROUND_IMG = "Background";
+  public static final String BACKGROUND_COLOR = "BackgroundColor";
+  public static final String REDIRECT_URL = "RedirectURL";
+  public static final String REDIRECT_TARGET = "RedirectTarget";
+  public static final String HASHDATA_DISPLAY_FRAME = "frame";
+  /**
+   * STAL WSDL namespace and service name
+   */
+  public static final String STAL_WSDL_NS = "http://www.egiz.gv.at/wsdl/stal";
+  public static final String STAL_SERVICE = "STALService";
+  /**
+   * Dummy session id, used if no sessionId parameter is provided
+   */
+  protected static final String TEST_SESSION_ID = "TestSession";
+
+  static {
+    if (log.isTraceEnabled()) {
+      log.trace("enabling webservice communication dump");
+      System.setProperty(
+              "com.sun.xml.ws.transport.http.client.HttpTransportPipe.dump",
+              "true");
+    }
+  }
+  /**
+   * STAL
+   */
+  protected AppletBKUWorker worker;
+  protected Thread workerThread;
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see java.applet.Applet#getParameterInfo()
+   */
+  @Override
+  public String[][] getParameterInfo() {
+    return new String[][]{
+              {WSDL_URL, "url",
+                "URL of the WSDL of the MOCCA server side STAL"},
+              {REDIRECT_URL, "url",
+                "URL to redirect the browser to when finished"},
+              {REDIRECT_TARGET, "frame target",
+                "name of the target frame for redirection when finished"},
+              {LOCALE, "locale",
+                "locale for UI localization (optional, default: system default)"},
+              {GUI_STYLE, "simple, advanced, tiny",
+                "GUI style (optional, default: simple)"},
+              {BACKGROUND_COLOR, "#hhhhhh",
+                "background color, e.g. '#333333' (optional, default: look and feel dependend)"},
+              {BACKGROUND_IMG, "url",
+                "URL of a background image for the GUI (optional, default: no image)"},
+              {HELP_URL, "url",
+                "URL for locating help files, e.g. '../help/' (no help provided if missing)"}};
+  }
+
+  /**
+   * Factory method to create and wire HelpListener, GUI and BKUWorker.
+   * (Config via applet parameters, see BKUApplet.* constants)
+   */
+  @Override
+  public void init() {
+    log.info("Welcome to MOCCA");
+    log.trace("Called init()");
+    showStatus("Initializing MOCCA applet");
+
+    HttpsURLConnection.setDefaultSSLSocketFactory(InternalSSLSocketFactory.getInstance());
+
+    String locale = getParameter(LOCALE);
+    if (locale != null) {
+      this.setLocale(new Locale(locale));
+    }
+    log.trace("default locale: " + Locale.getDefault());
+    log.debug("setting locale: " + getLocale());
+
+    BKUGUIFacade.Style guiStyle;
+    String guiStyleParam = getParameter(GUI_STYLE);
+    if ("advanced".equals(guiStyleParam)) {
+      guiStyle = BKUGUIFacade.Style.advanced;
+    } else if ("tiny".equals(guiStyleParam)) {
+      guiStyle = BKUGUIFacade.Style.tiny;
+    } else {
+      guiStyle = BKUGUIFacade.Style.simple;
+    }
+    log.debug("setting gui-style: " + guiStyle);
+
+    URL backgroundImgURL = null;
+    try {
+      backgroundImgURL = getURLParameter(BACKGROUND_IMG, null);
+      log.debug("setting background: " + backgroundImgURL);
+    } catch (MalformedURLException ex) {
+      log.warn("cannot load applet background image: " + ex.getMessage());
+    }
+
+    AbstractHelpListener helpListener = null;
+    try {
+      helpListener = new DefaultHelpListener(getAppletContext(),
+              getURLParameter(HELP_URL, null), getLocale());
+      if (log.isDebugEnabled()) {
+        log.debug("setting helpURL: " + getURLParameter(HELP_URL, null));
+      }
+    } catch (MalformedURLException ex) {
+      log.warn("failed to load help URL: " + ex.getMessage() + ", disabling help");
+    }
+
+    SwitchFocusListener switchFocusListener = new SwitchFocusListener(
+            getAppletContext(), "focusToBrowser()");
+
+    // Note: We need a panel in order to be able to set the background
+    // properly.
+    // Setting the background without a panel has side effects with the
+    // different java plugins.
+    JPanel contentPanel = new JPanel();
+    getContentPane().add(contentPanel);
+
+    String backgroundColor = getParameter(BACKGROUND_COLOR);
+    if (backgroundColor != null && backgroundColor.startsWith("#")) {
+      try {
+        Color color = new Color(Integer.parseInt(backgroundColor.substring(1), 16));
+        log.debug("setting background color to " + color);
+        contentPanel.setBackground(color);
+      } catch (NumberFormatException e) {
+        log.debug("failed to set background color '" + backgroundColor + "'");
+      }
+    }
+
+    try {
+      URLFontLoader fontProvider = new URLFontLoader(getCodeBase());
+      fontProvider.loadInBackground();
+      BKUGUIFacade gui = createGUI(contentPanel, getLocale(), guiStyle,
+              backgroundImgURL, fontProvider, helpListener, switchFocusListener);
+
+      worker = createBKUWorker(this, gui);
+    } catch (MalformedURLException ex) {
+      log.fatal("failed to load font provider URL", ex);
+      System.err.println("invalid font provider URL " + ex.getMessage());
+    }
+  }
+
+  @Override
+  public void start() {
+    log.trace("Called start()");
+    if (worker != null) {
+      showStatus("Starting MOCCA applet");
+      workerThread = new Thread(worker);
+      workerThread.start();
+    } else {
+      log.debug("cannot start uninitialzed MOCCA applet");
+    }
+  }
+
+  @Override
+  public void stop() {
+    log.trace("Called stop()");
+    showStatus("Stopping MOCCA applet");
+    if ((workerThread != null) && (workerThread.isAlive())) {
+      workerThread.interrupt();
+    }
+  }
+
+  @Override
+  public void destroy() {
+    log.trace("Called destroy()");
+  }
+
+  // ///////////////////////////////////////////////////////////////////////////
+  // factory methods for subclasses to inject different components
+  // ///////////////////////////////////////////////////////////////////////////
+  protected BKUGUIFacade createGUI(Container contentPane, Locale locale,
+          Style guiStyle, URL backgroundImgURL,
+          FontProvider fontProvider, AbstractHelpListener helpListener,
+          SwitchFocusListener switchFocusListener) {
+    return new BKUGUIImpl(contentPane, locale, guiStyle, backgroundImgURL,
+            fontProvider, helpListener, switchFocusListener);
+  }
+
+  protected AppletBKUWorker createBKUWorker(BKUApplet applet, BKUGUIFacade gui) {
+    return new AppletBKUWorker(applet, gui);
+  }
+
+  // ///////////////////////////////////////////////////////////////////////////
+  // callback for BKUWorker to allow extension
+  // ///////////////////////////////////////////////////////////////////////////
+  /**
+   * Callback for BKUWorker to allow extension
+   *
+   * @return
+   * @throws java.net.MalformedURLException
+   */
+  public STALPortType getSTALPort() throws MalformedURLException {
+    URL wsdlURL = getURLParameter(WSDL_URL, null);
+    log.debug("setting STAL WSDL: " + wsdlURL);
+    QName endpointName = new QName(STAL_WSDL_NS, STAL_SERVICE);
+    STALService stal = new STALService(wsdlURL, endpointName);
+    return stal.getSTALPort();
+  }
+
+  /**
+   * Callback for BKUWorker to allow extension (TODO STALPort could know its
+   * STALTranslator)
+   *
+   * @return
+   * @throws java.net.MalformedURLException
+   */
+  public STALTranslator getSTALTranslator() {
+    return new STALTranslator();
+  }
+
+  /**
+   * Callback for BKUWorker to keep applet context out of BKUWorker
+   *
+   * @return
+   * @throws java.net.MalformedURLException
+   */
+  protected void sendRedirect(String sessionId) {
+    try {
+      AppletContext ctx = getAppletContext();
+      if (ctx == null) {
+        log.error("no applet context (applet might already have been destroyed)");
+        return;
+      }
+      URL redirectURL = getURLParameter(REDIRECT_URL, sessionId);
+      String redirectTarget = getParameter(REDIRECT_TARGET);
+      if (redirectTarget == null) {
+        log.info("Done. Redirecting to " + redirectURL + " ...");
+        ctx.showDocument(redirectURL);
+      } else {
+        log.info("Done. Redirecting to " + redirectURL + " (target=" + redirectTarget + ") ...");
+        ctx.showDocument(redirectURL, redirectTarget);
+      }
+    } catch (MalformedURLException ex) {
+      log.warn("Failed to redirect: " + ex.getMessage(), ex);
+      // gui.showErrorDialog(errorMsg, okListener, actionCommand)
+    }
+  }
+
+  public void getFocusFromBrowser() {
+
+    worker.getFocusFromBrowser();
+  }
+
+  // ///////////////////////////////////////////////////////////////////////////
+  // utility methods
+  // ///////////////////////////////////////////////////////////////////////////
+  protected URL getURLParameter(String paramKey, String sessionId)
+          throws MalformedURLException {
+    String urlParam = getParameter(paramKey);
+    if (urlParam != null && !"".equals(urlParam)) {
+      URL codebase = getCodeBase();
+      try {
+        URL url;
+        if (codebase.getProtocol().equalsIgnoreCase("file")) {
+          // for debugging in appletrunner
+          url = new URL(urlParam);
+        } else {
+          if (sessionId != null) {
+            urlParam = urlParam + ";jsessionid=" + sessionId;
+          }
+          url = new URL(codebase, urlParam);
+        }
+        return url;
+      } catch (MalformedURLException ex) {
+        log.error("applet paremeter " + urlParam + " is not a valid URL: " + ex.getMessage());
+        throw ex;
+      }
+    } else {
+      log.error("applet paremeter " + paramKey + " not set");
+      throw new MalformedURLException(paramKey + " not set");
+    }
+  }
 }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java
new file mode 100644
index 00000000..f914aed7
--- /dev/null
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.online.applet.viewer;
+
+import at.gv.egiz.bku.gui.viewer.FontProviderException;
+import at.gv.egiz.bku.gui.viewer.FontProvider;
+import java.awt.Font;
+import java.awt.FontFormatException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.concurrent.ExecutionException;
+import javax.swing.SwingWorker;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class URLFontLoader extends SwingWorker<Font, Object> implements FontProvider {
+
+  protected static final Log log = LogFactory.getLog(URLFontLoader.class);
+  protected URL fontURL;
+  protected Font font;
+
+  public URLFontLoader(URL codebase) throws MalformedURLException {
+    this.fontURL = new URL(codebase, SANSMONO_FONT_RESOURCE);
+    if (log.isDebugEnabled()) {
+      log.debug(Thread.currentThread() + " setting font load URL: " + fontURL);
+    }
+  }
+
+  public void loadInBackground() {
+    if (log.isDebugEnabled()) {
+      log.debug(Thread.currentThread() + " scheduling font loading in background: " + fontURL);
+    }
+    this.execute();
+  }
+
+  @Override
+  protected Font doInBackground() throws MalformedURLException, FontFormatException, IOException {
+    if (log.isDebugEnabled()) {
+      log.debug(Thread.currentThread() + " loading font in background...");
+    }
+    return Font.createFont(Font.TRUETYPE_FONT, fontURL.openStream());
+  }
+
+  /**
+   * waits for loadInBackground to finish 
+   * @return the font loaded in loadInbackground
+   * @throws Exception
+   */
+  @Override
+  public Font getFont() throws FontProviderException {
+    log.debug(Thread.currentThread() + " get font");
+    try {
+      return get();
+    } catch (InterruptedException ex) {
+      log.error("font loader interrupted");
+//      Thread.currentThread().interrupt();
+      throw new FontProviderException("font loader interrupted", ex);
+    } catch (ExecutionException ex) {
+      log.error("failed to load font", ex.getCause());
+      throw new FontProviderException("failed to load font", ex.getCause());
+    }
+  }
+}
diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
index 4a768f91..d1a0f6e2 100644
--- a/BKUApplet/src/test/resources/appletTest.html
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -15,20 +15,25 @@
   limitations under the License.
 -->
 <html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>MOCCA Applet</title>
+    <link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon">
+  </head>
   <body>
-    <center>
-      <applet code="at.gv.egiz.bku.online.applet.BKUApplet.class"
-              archive="../BKUApplet-1.0.5-SNAPSHOT.jar, commons-logging.jar , iaik_jce_me4se.jar"
-              width=152 height=145>
-              <param name="GuiStyle" value="tiny"/>
-              <param name="Locale" value="ja_JA"/>
-              <!--param name="Background" value="jar:file:/home/clemens/workspace/mocca/BKUApplet/target/BKUApplet-1.0-SNAPSHOT.jar!/images/help.png"/-->
-              <!--param name="Background" value="http://localhost:3495/img/BackgroundChipperling.png"/-->
-              <param name="WSDL_URL" value="https://danu.gv.at:3496/stal?wsdl"/>
-              <param name="HelpURL" value="http://apps.egiz.gv.at/bkuonline/help/"/>
-              <param name="SessionId" value="TestSession"/>
-              <param name="RedirectURL" value="http://localhost:3495/bkuResult"/>
-      </applet>
-    </center>
+    <applet code="at.gv.egiz.bku.online.applet.BKUApplet.class"
+            archive="../BKUApplet-1.2.8-SNAPSHOT.jar, commons-logging.jar , iaik_jce_me4se.jar"
+            width=190 height=130 name="moccaapplet" id="moccaapplet">
+      <param name="GuiStyle" value="simple"/>
+      <param name="Locale" value="ja_JA"/>
+      <!--param name="Background" value="jar:file:/home/clemens/workspace/mocca/BKUApplet/target/BKUApplet-1.0-SNAPSHOT.jar!/images/help.png"/-->
+      <!--param name="Background" value="http://localhost:3495/img/BackgroundChipperling.png"/-->
+      <param name="BackgroundColor" value="#ff0000"/>
+      <param name="WSDL_URL" value="https://danu.gv.at:3496/stal?wsdl"/>
+      <param name="HelpURL" value="http://apps.egiz.gv.at/bkuonline/help/"/>
+      <param name="SessionId" value="TestSession"/>
+      <param name="RedirectURL" value="http://localhost:3495/bkuResult"/>
+      <param name="RedirectTarget" value="_parent"/>
+    </applet>
   </body>
-</html>
\ No newline at end of file
+</html>
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 5bab2ef8..4f2f1331 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
@@ -21,6 +21,7 @@ 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.viewer.FontProvider;
 import at.gv.egiz.bku.online.applet.BKUApplet;
 import at.gv.egiz.bku.smccstal.AbstractSMCCSTAL;
 import at.gv.egiz.bku.smccstal.CardMgmtRequestHandler;
@@ -85,8 +86,9 @@ public class ActivationApplet extends BKUApplet {
           Locale locale,
           Style guiStyle,
           URL backgroundImgURL,
+          FontProvider fontProvider,
           AbstractHelpListener helpListener,
           SwitchFocusListener switchFocusListener) {
-    return new ActivationGUI(contentPane, locale, guiStyle, backgroundImgURL, helpListener, 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 055e9c31..bf323969 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
@@ -21,6 +21,7 @@ import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.PINManagementGUI;
 import at.gv.egiz.bku.gui.PINManagementGUIFacade;
 import at.gv.egiz.bku.gui.SwitchFocusListener;
+import at.gv.egiz.bku.gui.viewer.FontProvider;
 import java.awt.Container;
 import java.net.URL;
 import java.util.Locale;
@@ -41,9 +42,10 @@ public class PINManagementApplet extends BKUApplet {
           Locale locale,
           BKUGUIFacade.Style guiStyle,
           URL backgroundImgURL,
+          FontProvider fontProvider,
           AbstractHelpListener helpListener,
           SwitchFocusListener switchFocusListener) {
-    return new PINManagementGUI(contentPane, locale, guiStyle, backgroundImgURL, helpListener, switchFocusListener);
+    return new PINManagementGUI(contentPane, locale, guiStyle, backgroundImgURL, fontProvider, helpListener, switchFocusListener);
   }
 
   @Override
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 9fecb661..feefa18b 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -21,6 +21,13 @@
             <version>1.2.8-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <!-- see BKUFonts.pom
+        <dependency>
+          <groupId>at.gv.egiz</groupId>
+          <artifactId>BKUFonts</artifactId>
+          <version>1.0</version>
+          <scope>runtime</scope>
+        </dependency-->
     </dependencies>
 	  <build>
 	    <plugins>
@@ -33,15 +40,4 @@
 	      </plugin>
 	    </plugins>
 	  </build>
-    <!--build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build-->
 </project>
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index e83502a8..8df4bd72 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -17,6 +17,8 @@
 
 package at.gv.egiz.bku.gui;
 
+import at.gv.egiz.bku.gui.viewer.FontProviderException;
+import at.gv.egiz.bku.gui.viewer.FontProvider;
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.stal.HashDataInput;
 import java.awt.Color;
@@ -73,6 +75,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
     protected HelpKeyListener helpKeyListener;
     protected SwitchFocusFocusListener switchFocusKeyListener;
     protected SecureViewerDialog secureViewer;
+    protected FontProvider fontProvider;
     
     protected Container contentPane;
     protected ResourceBundle messages;
@@ -115,8 +118,9 @@ public class BKUGUIImpl implements BKUGUIFacade {
      */
     public BKUGUIImpl(Container contentPane, 
             Locale locale, 
-            Style guiStyle, 
+            Style guiStyle,
             URL background, 
+            FontProvider fontProvider,
             ActionListener helpListener,
             SwitchFocusListener switchFocusListener) {
       this.contentPane = contentPane;
@@ -139,7 +143,8 @@ public class BKUGUIImpl implements BKUGUIFacade {
       registerHelpListener(helpListener);
       
       registerSwitchFocusListener(switchFocusListener);
-      
+
+      this.fontProvider = fontProvider;
       createGUI(background);
     }
     
@@ -1386,7 +1391,12 @@ public class BKUGUIImpl implements BKUGUIFacade {
 
             @Override
             public void run() {
-              showSecureViewer(dataToBeSigned.get(0)); 
+              try {
+                showSecureViewer(dataToBeSigned.get(0));
+              } catch (FontProviderException ex) {
+                log.error("failed to display secure viewer", ex);
+                showErrorDialog(ERR_VIEWER, new Object[] {ex.getMessage()}, backListener, backCommand);
+              }
             }
           });
        
@@ -1407,12 +1417,12 @@ public class BKUGUIImpl implements BKUGUIFacade {
      * @param saveListener
      * @param saveCommand
      */
-    private void showSecureViewer(HashDataInput dataToBeSigned) {
+    private void showSecureViewer(HashDataInput dataToBeSigned) throws FontProviderException {
       
       log.debug("show secure viewer [" + Thread.currentThread().getName() + "]");
       if (secureViewer == null) {
         secureViewer = new SecureViewerDialog(null, messages,
-                helpMouseListener.getActionListener());
+                fontProvider, helpMouseListener.getActionListener());
 
         // workaround for [#439]
         // avoid AlwaysOnTop at least in applet, otherwise make secureViewer AlwaysOnTop since MOCCA Dialog (JFrame created in LocalSTALFactory) is always on top.
@@ -1485,7 +1495,12 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   int selectionIdx = lsm.getMinSelectionIndex();
                   if (selectionIdx >= 0) {
                     final HashDataInput selection = signedReferences.get(selectionIdx);
-                    showSecureViewer(selection);
+                    try {
+                      showSecureViewer(selection);
+                    } catch (FontProviderException ex) {
+                      log.error("failed to display secure viewer", ex);
+                      showErrorDialog(ERR_VIEWER, new Object[] {ex.getMessage()}, backListener, backCommand);
+                    }
                   }
                 }
               });
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUIcons.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUIcons.java
new file mode 100644
index 00000000..92d6897b
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUIcons.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import java.awt.Image;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import javax.imageio.ImageIO;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class BKUIcons {
+
+  protected static final Log log = LogFactory.getLog(BKUIcons.class);
+
+  /** 16x16, 24x24, 32x32, 48x48, 128x128 pixels */
+  public static final ArrayList<Image> icons = new ArrayList<Image>();
+
+  static {
+    String[] iconResources = new String[] {
+      "/at/gv/egiz/bku/gui/chip16.png",
+      "/at/gv/egiz/bku/gui/chip24.png",
+      "/at/gv/egiz/bku/gui/chip32.png",
+      "/at/gv/egiz/bku/gui/chip48.png",
+      "/at/gv/egiz/bku/gui/chip128.png" };
+    for (String ir : iconResources) {
+      URL resource = BKUIcons.class.getResource(ir);
+      if (ir != null) {
+        try {
+          icons.add(ImageIO.read(resource));
+        } catch (IOException ex) {
+          log.warn("failed to load mocca icon " + ir, ex);
+        }
+      }
+    }
+  }
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
index ef70f94b..1883fce5 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
@@ -16,6 +16,7 @@
  */
 package at.gv.egiz.bku.gui;
 
+import at.gv.egiz.bku.gui.viewer.FontProvider;
 import at.gv.egiz.stal.HashDataInput;
 import java.awt.Container;
 import java.awt.Cursor;
@@ -53,9 +54,12 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.LayoutStyle;
 import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.text.DefaultEditorKit;
 import javax.swing.text.Document;
 import javax.swing.text.EditorKit;
 import javax.swing.text.StyledEditorKit;
+import javax.swing.text.html.HTMLEditorKit;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -65,16 +69,20 @@ import org.apache.commons.logging.LogFactory;
  */
 public class SecureViewerDialog extends JDialog implements ActionListener {
 
-  public static final String PLAINTEXT_FONT = "Monospaced";
+  /** don't import BKUFonts in order not to load BKUFonts.jar
+   * BKUApplet includes BKUFonts as runtime dependency only, the jar is copied to the applet dir in BKUOnline with dependency-plugin
+   * BKUViewer has compile dependency BKUFonts, transitive in BKUOnline and BKULocal
+   */
+  public static final String PLAINTEXT_FONT_RESOURCE = "DejaVuSansMono.ttf";
   public static final Dimension VIEWER_DIMENSION = new Dimension(600, 400);
   protected static final Log log = LogFactory.getLog(SecureViewerDialog.class);
-
 //  private static SecureViewerDialog dialog;
   protected ResourceBundle messages;
   protected JEditorPane viewer;
   protected JLabel viewerLabel;
   protected JScrollPane scrollPane;
   protected HashDataInput content; //remember for save dialog
+  protected FontProvider fontProvider;
 
   /**
    * Create and display a modal SecureViewer dialog.
@@ -97,10 +105,12 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
 //    dialog.setVisible(true);
 //  }
   public SecureViewerDialog(Frame owner, ResourceBundle messages,
-//          ActionListener saveListener, String saveCommand,
-          ActionListener helpListener) {
+          //          ActionListener saveListener, String saveCommand,
+          FontProvider fontProvider, ActionListener helpListener) {
     super(owner, messages.getString(BKUGUIFacade.WINDOWTITLE_VIEWER), true);
+    this.setIconImages(BKUIcons.icons);
     this.messages = messages;
+    this.fontProvider = fontProvider;
 
     initContentPane(VIEWER_DIMENSION,
             createViewerPanel(helpListener),
@@ -135,7 +145,8 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
   private JPanel createViewerPanel(final ActionListener helpListener) {
     viewer = new JEditorPane();
     viewer.setEditable(false);
-
+    viewer.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);
+    
     scrollPane = new JScrollPane();
 
     JPanel viewerPanel = new JPanel();
@@ -167,31 +178,29 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
       });
       helpLabel.addKeyListener(new KeyAdapter() {
 
-          @Override
-          public void keyPressed(KeyEvent arg0) {
-        	  
-        	  if(arg0.getKeyCode() == KeyEvent.VK_ENTER) {
-	            ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, BKUGUIFacade.HELP_HASHDATAVIEWER);
-	            helpListener.actionPerformed(e);
-        	  }
+        @Override
+        public void keyPressed(KeyEvent arg0) {
+
+          if (arg0.getKeyCode() == KeyEvent.VK_ENTER) {
+            ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, BKUGUIFacade.HELP_HASHDATAVIEWER);
+            helpListener.actionPerformed(e);
           }
-        });      
-      
+        }
+      });
+
       helpLabel.addFocusListener(new FocusAdapter() {
-     	 
-    	  @Override
-    	  public void focusGained(FocusEvent e) {
-    		     		 
-    		  helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG_FOCUS)));
-    	  }
-    	  
-    	  @Override
-    	  public void focusLost(FocusEvent e) {
-    		 
-    		  helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG)));
-    	  }
-    	  
-    	  
+
+        @Override
+        public void focusGained(FocusEvent e) {
+
+          helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG_FOCUS)));
+        }
+
+        @Override
+        public void focusLost(FocusEvent e) {
+
+          helpLabel.setIcon(new ImageIcon(getClass().getResource(BKUGUIFacade.HELP_IMG)));
+        }
       });
       helpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
 
@@ -216,9 +225,10 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
 
    * @param hashDataInput
    */
-  public void setContent(HashDataInput hashDataInput) {
+  public void setContent(HashDataInput hashDataInput) { //throws FontProviderException {
 
     this.content = null;
+    viewer.setText(null);
 
     String mimeType = hashDataInput.getMimeType();
     if (mimeType == null) {
@@ -228,20 +238,21 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
     // loads editorkit for text/plain if unrecognized
     viewer.setContentType(mimeType);
 
-    if ("text/plain".equals(mimeType)) {
-      viewer.setEditorKit(new StyledEditorKit());
-      viewer.setFont(new Font(PLAINTEXT_FONT, viewer.getFont().getStyle(), viewer.getFont().getSize()));
-//    } else if ("text/html".equals(mimeType)) {
-//      viewer.setEditorKit(new RestrictedHTMLEditorKit());
-    } else if ("application/xhtml+xml".equals(mimeType)) {
-      viewer.setContentType("text/html");
-    }
+    try {
+      
+      if ("text/plain".equals(mimeType)) {
+        viewer.setEditorKit(new StyledEditorKit());
+        viewer.setFont(fontProvider.getFont().deriveFont(Font.PLAIN, viewer.getFont().getSize()));
+      } else if ("application/xhtml+xml".equals(mimeType)) {
+        viewer.setEditorKit(new HTMLEditorKit());
+        //reset font if fontprovider font was set before (TODO also html font from fontprovider)
+        viewer.setFont(new Font("Dialog", Font.PLAIN, viewer.getFont().getSize())); //UIManager.getFont("Label.font"));
+      }
 
-    EditorKit editorKit = viewer.getEditorKit();
-    Document document = editorKit.createDefaultDocument();
-//    document.putProperty("IgnoreCharsetDirective", new Boolean(true));
+      EditorKit editorKit = viewer.getEditorKit();
+      Document document = editorKit.createDefaultDocument();
+  //    document.putProperty("IgnoreCharsetDirective", new Boolean(true));
 
-    try {
       Charset cs = (hashDataInput.getEncoding() == null) ? Charset.forName("UTF-8") : Charset.forName(hashDataInput.getEncoding());
       log.debug("secure viewer encoding: " + cs.toString());
 
@@ -252,11 +263,14 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
 
       this.content = hashDataInput;
 
+//    } catch (Exception ex) // fontProvider
 //    } catch (IllegalCharsetNameException ex) {
 //    } catch (UnsupportedCharsetException ex) {
+//    } catch (FontProviderException ex) {
     } catch (Exception ex) {
       log.error(ex.getMessage(), ex);
       String p = messages.getString(BKUGUIFacade.ERR_VIEWER);
+      viewer.setContentType("text/plain");
       viewer.setText(MessageFormat.format(p, ex.getMessage()));
     }
     viewer.setCaretPosition(0);
@@ -280,7 +294,7 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
     closeButton.setText(messages.getString(BKUGUIFacade.BUTTON_CLOSE));
     closeButton.setActionCommand("close");
     closeButton.addActionListener(this);
-    
+
     JButton saveButton = new JButton();
     saveButton.setText(messages.getString(BKUGUIFacade.BUTTON_SAVE));
     saveButton.setActionCommand("save");
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProvider.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProvider.java
new file mode 100644
index 00000000..8fb815b0
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProvider.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui.viewer;
+
+import java.awt.Font;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public interface FontProvider {
+
+  /** will be replaced by more sophisticated font selection mechanism
+   * (see java.awt.Font int/String constants) */
+  String SANSMONO_FONT_RESOURCE = "DejaVuLGCSansMono.ttf";
+
+  /**
+   *
+   * @return
+   * @throws InterruptedException
+   * @throws FileNotFoundException if remote font file cannot be retrieved
+   */
+  Font getFont() throws FontProviderException;
+
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProviderException.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProviderException.java
new file mode 100644
index 00000000..5a6a277e
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProviderException.java
@@ -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.
+ */
+
+package at.gv.egiz.bku.gui.viewer;
+
+/**
+ * Encapsulates the reason why a font could not be loaded.
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class FontProviderException extends Exception {
+
+  public FontProviderException(String msg, Throwable cause) {
+    super(msg, cause);
+  }
+}
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index a96b835f..b458a214 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -86,7 +86,7 @@ error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
 error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
 error.card.notactivated=<html>Die B\u00FCrgerkarte ist nicht aktiviert</html>
 error.pin.timeout=<html>Zeit\u00FCberschreitung bei Eingabe der PIN</html>
-error.viewer=Der Inhalt kann nicht dargestellt werden: {0}
+error.viewer=<html>Der Inhalt kann nicht dargestellt werden: {0}
 error.external.link=<html>Externer Link {0} wird nicht ge\u00F6ffnet</html>
 error.config=<html>Fehlerhafte Konfiguration des Systems: {0}</html>
 
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index c795b3fa..22b9095c 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -84,7 +84,7 @@ error.test=<html>Error1 {0} - Error2 {1}</html>
 error.card.locked=<html>Citizen card is locked</html>
 error.card.notactivated=<html>Citizen card not activated</html>
 error.pin.timeout=<html>Timeout during PIN entry</html>
-error.viewer=Failed to display contents: {0}
+error.viewer=<html>Failed to display contents: {0}
 error.external.link=<html>Cannot open external link {0}</html>
 error.config=<html>Incorrect system configuration: {0}</html>
 
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip128.png b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip128.png
new file mode 100644
index 00000000..c36d8079
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip128.png differ
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip16.png b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip16.png
new file mode 100644
index 00000000..96b580e9
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip16.png differ
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip24.png b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip24.png
new file mode 100644
index 00000000..efd6dbeb
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip24.png differ
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip48.png b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip48.png
new file mode 100644
index 00000000..491fbcac
Binary files /dev/null and b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/chip48.png differ
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index 9f1cb612..fdd58850 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -41,7 +41,7 @@ public class BKUGUITest {
         Container contentPane = testFrame.getContentPane();
 //        contentPane.setPreferredSize(new Dimension(170, 150));
         contentPane.setPreferredSize(new Dimension(290, 190));
-        BKUGUIFacade gui = new BKUGUIImpl(contentPane, null, BKUGUIFacade.Style.advanced, null, null, null);
+        BKUGUIFacade gui = new BKUGUIImpl(contentPane, null, BKUGUIFacade.Style.advanced, null, new DummyFontLoader(), null, null);
         BKUGUIWorker worker = new BKUGUIWorker();
         worker.init(gui);
         testFrame.pack();
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java
new file mode 100644
index 00000000..87d67adc
--- /dev/null
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.bku.gui.viewer.FontProviderException;
+import at.gv.egiz.bku.gui.viewer.FontProvider;
+import java.awt.Font;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class DummyFontLoader implements FontProvider {
+
+  @Override
+  public Font getFont() throws FontProviderException {
+    return new Font("monospaced", Font.PLAIN, 10);
+  }
+
+}
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
new file mode 100644
index 00000000..fc8dcd96
--- /dev/null
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
@@ -0,0 +1,165 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
+import java.awt.Font;
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.ResourceBundle;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ *
+ * @author clemens
+ */
+@Ignore
+public class SecureViewerDialogTest {
+
+  static SecureViewerDialog secureViewer;
+  static ResourceBundle messages;
+
+  @BeforeClass
+  public static void setUpClass() throws Exception {
+    messages = ResourceBundle.getBundle("at/gv/egiz/bku/gui/Messages");
+    secureViewer = new SecureViewerDialog(null, messages, new DummyFontLoader(), null);
+  }
+
+  @AfterClass
+  public static void tearDownClass() throws Exception {
+  }
+
+    @Before
+    public void setUp() {
+    }
+
+    @After
+    public void tearDown() {
+    }
+
+
+    @Test
+    @Ignore
+    public void testLatin1Supplement() throws UnsupportedEncodingException, FileNotFoundException, IOException {
+//      StringBuilder data = new StringBuilder();
+//      data.append("\nhttp://www.unicode.org/charts/PDF/U0080.pdf\n");
+//      for (int i = 0x0080; i <= 0x00ff; i++) {
+//        data.append((char) i);
+//      }
+//      System.out.println(data.toString());
+      BufferedInputStream bis = new BufferedInputStream(new FileInputStream("/home/clemens/IAIK/MOCCA/encoding/test_iso-8859-1.txt"));
+      byte[] bytes = new byte[bis.available()];
+      bis.read(bytes);
+      String s = new String(bytes, "iso-8859-1");
+      System.out.println("read iso-8859-1 bytes " + s);
+
+      secureViewer.setContent(new ByteArrayHashDataInput(s.getBytes("UTF-8"), "id-1", "text/plain", "iso-8859-1"));
+
+    }
+
+    @Test
+    @Ignore
+    public void testGreek() throws UnsupportedEncodingException {
+//      Font fm = new Font(Font.MONOSPACED, Font.PLAIN, 10);
+      Font fm = new Font("Lucida Sans Typewriter", Font.PLAIN, 18); //GothicBBB-MediumH", Font.PLAIN, 10);
+      System.out.println(fm.getFontName() + ", " + fm.getPSName() + ", " + fm);
+
+      StringBuilder data = new StringBuilder();
+      data.append("\nhttp://www.unicode.org/charts/PDF/U0370.pdf\n");
+      for (int i = 0x0370; i <= 0x03ff; i++) {
+        if (!fm.canDisplay((char) i)) {
+          System.out.println("cannot display " + Integer.toHexString(i) );
+        }
+        data.append((char) i);
+      }
+
+      System.out.println(data.toString());
+      secureViewer.setContent(new ByteArrayHashDataInput(data.toString().getBytes("UTF-8"), "id-1", "text/plain", "UTF-8"));
+
+    }
+
+  /**
+   * Test of setContent method, of class SecureViewerDialog.
+   */
+  @Test
+//  @Ignore
+  public void testCyrillic() throws UnsupportedEncodingException {
+
+    StringBuilder data = new StringBuilder("\n");
+    
+    int[] mocca = new int[] {0x041c, 0x04a8, 0x0480, 0x0480, 0x0466 };
+    
+    for (int i = 0; i < mocca.length; i++) {
+      data.append((char) mocca[i]);
+    }
+    data.append(" goes cyrillic\n");
+
+    data.append("\nCyrillic - http://www.unicode.org/charts/PDF/U0400.pdf\n");
+    for (int i = 0x0400; i <= 0x04ff; i++) {
+//      System.out.printf("%c%04x=%c\t", (i & 7) == 0 ? '\n' : '\0', i, (char)i);
+//      System.out.print((char) i);
+      data.append((char)i);
+    }
+
+    data.append("\n\nCyrillic Supplement - http://www.unicode.org/charts/PDF/U0500.pdf\n");
+    for (int i = 0x0500; i <= 0x0525; i++) {
+//      System.out.printf("%c%04x=%c\t", (i & 7) == 0 ? '\n' : '\0', i, (char)i);
+//      System.out.print((char) i);
+      data.append((char) i);
+    }
+
+    for (int i = 0; i < data.length(); i++) {
+      char c = data.charAt(i);
+      if (c >= '\u0400' && c <= '\u0525') {
+        System.out.println(c + "\tcyrillic");
+      } else if (c < '\u007f') {
+        System.out.println(c + "\tlatin");
+      } else {
+        System.out.println(c + "\tunknown");
+      }
+    }
+
+    System.out.println(data.toString());
+
+//    char[] cyrillicChars = new char[] {(char) 0x0411, (char) 0x0444};
+//    System.out.println(new String(cyrillicChars)); // + ": " + SMCCHelper.toString(cyrillicBytes));
+//    byte[] cyrillicBytes = new byte[] {(byte) 0x11, (byte) 0x04, (byte) 0x0444};
+//    System.out.println(new String(cyrillicBytes, "UTF-8") + ": " + SMCCHelper.toString(cyrillicBytes));
+
+//    String encoding = "cp1252";
+//    String data = "öäü߀";
+//    byte[] bytes = data.getBytes(encoding);
+//    System.out.println(data + "\t" +  SMCCHelper.toString(bytes));
+//    byte[] bytes2 = data.getBytes("cp1252");
+//    System.out.println(data + "\t" +  SMCCHelper.toString(bytes2));
+
+    secureViewer.setContent(new ByteArrayHashDataInput(data.toString().getBytes("UTF-8"), "id-1", "text/plain", "UTF-8"));
+
+    System.out.println("\n\n=============================\n");
+//
+////    int[] mocca = new int[] {0x0428, 0x0429, 0x04a8, 0x04e8, 0x047a, 0x042d, 0x042d, 0x0421, 0x0421, 0x04d0, 0x0466 };
+//    int[] mocca = new int[] {0x0429, 0x04a8, 0x0480, 0x0480, 0x0466 };
+    for (int i = 0; i < mocca.length; i++) {
+      System.out.print((char) mocca[i]);
+    }
+//    for (int i = 0; i < mocca.length; i++) {
+//      System.out.printf(" 0x%04x", mocca[i]);
+//    }
+//
+    System.out.println("\n=============================\n");
+
+  }
+
+  
+}
\ No newline at end of file
diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml
new file mode 100644
index 00000000..a798f5d1
--- /dev/null
+++ b/BKUFonts/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>bku</artifactId>
+    <groupId>at.gv.egiz</groupId>
+    <version>1.2.8-SNAPSHOT</version>
+  </parent>
+  <groupId>at.gv.egiz</groupId>
+  <artifactId>BKUFonts</artifactId>
+  <version>1.0</version>
+  <name>BKUFonts</name>
+  <description>
+    This module is used in validator(s) and viewer and is a direct dependency of
+      - BKUViewer (attention, this is the validator!)
+        TextValidator depends on the fonts. (compile scope, make available for BKULocal/Online TextValidator)
+        (TextValidator should rather use a FontProvider)
+      - BKUOnline:
+          - direct/provided if jar inclusion in applet dir, but do not enforce inclusion as WEB-INF/lib
+          - transitive from BKUViewer if unpack-fonts to applet dir
+      - removed the BKUCommonGUI (runtime; propagate dependency to BKUApplet):
+          no real dependency: BKUCommonGUI contains SecureFontProvider interface only
+          (which does not state how fonts are loaded); implementations should depend no BKUFonts
+          (ResourceFontLoader in BKULocal depends on the fonts, however URLFontLoader in BKUApplet doesn't.
+          BKUOnline however depends on BKUFonts for providing the fonts as web-resource for the applet)
+
+
+    at.gv.egiz.bku.text.TextValidator and xxx.LocalFontProvider load fonts from classpath,
+    resource name must be known, TODO: encapsulate resource loading (FontProvider constants?)
+
+    at.gv.egiz.bku.online.applet.URLFontLoader loads (unpacked) font files from applet codebase, 
+    resource names _must_ be known since applet has no BKUFonts dependency
+
+  </description>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/fonts</directory>
+      </resource>
+    </resources>
+  </build>
+</project>
diff --git a/BKUFonts/src/main/fonts/DejaVuLGCSans.ttf b/BKUFonts/src/main/fonts/DejaVuLGCSans.ttf
new file mode 100644
index 00000000..cae5a48b
Binary files /dev/null and b/BKUFonts/src/main/fonts/DejaVuLGCSans.ttf differ
diff --git a/BKUFonts/src/main/fonts/DejaVuLGCSansMono.ttf b/BKUFonts/src/main/fonts/DejaVuLGCSansMono.ttf
new file mode 100644
index 00000000..21647753
Binary files /dev/null and b/BKUFonts/src/main/fonts/DejaVuLGCSansMono.ttf differ
diff --git a/BKUFonts/src/main/fonts/DejaVuLGCSerif.ttf b/BKUFonts/src/main/fonts/DejaVuLGCSerif.ttf
new file mode 100644
index 00000000..4b3bf2e6
Binary files /dev/null and b/BKUFonts/src/main/fonts/DejaVuLGCSerif.ttf differ
diff --git a/BKUFonts/src/main/fonts/LICENSE b/BKUFonts/src/main/fonts/LICENSE
new file mode 100644
index 00000000..254e2cc4
--- /dev/null
+++ b/BKUFonts/src/main/fonts/LICENSE
@@ -0,0 +1,99 @@
+Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
+
+Bitstream Vera Fonts Copyright
+------------------------------
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute the
+Font Software, including without limitation the rights to use, copy, merge,
+publish, distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright and trademark notices and this permission notice shall
+be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular
+the designs of glyphs or characters in the Fonts may be modified and
+additional glyphs or characters may be added to the Fonts, only if the fonts
+are renamed to names not containing either the words "Bitstream" or the word
+"Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font
+Software that has been modified and is distributed under the "Bitstream
+Vera" names.
+
+The Font Software may be sold as part of a larger software package but no
+copy of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font Software
+without prior written authorization from the Gnome Foundation or Bitstream
+Inc., respectively. For further information, contact: fonts at gnome dot
+org. 
+
+Arev Fonts Copyright
+------------------------------
+
+Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and
+associated documentation files (the "Font Software"), to reproduce
+and distribute the modifications to the Bitstream Vera Font Software,
+including without limitation the rights to use, copy, merge, publish,
+distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Tavmjong Bah" or the word "Arev".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the 
+"Tavmjong Bah Arev" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the name of Tavmjong Bah shall not
+be used in advertising or otherwise to promote the sale, use or other
+dealings in this Font Software without prior written authorization
+from Tavmjong Bah. For further information, contact: tavmjong @ free
+. fr.
+
+$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $
diff --git a/BKUFonts/src/main/fonts/META-INF/services/at.gv.egiz.bku.gui.SecureFontProvider b/BKUFonts/src/main/fonts/META-INF/services/at.gv.egiz.bku.gui.SecureFontProvider
new file mode 100644
index 00000000..c9bf2059
--- /dev/null
+++ b/BKUFonts/src/main/fonts/META-INF/services/at.gv.egiz.bku.gui.SecureFontProvider
@@ -0,0 +1,3 @@
+Serif DejaVuLGCSerif.ttf
+Sans DejaVuLGCSans.ttf
+SansMono DejaVuLGCSansMono.ttf
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java
index 1a1426a5..37f30340 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java
@@ -16,14 +16,13 @@
  */
 package at.gv.egiz.bku.gui;
 
-import at.gv.egiz.bku.gui.*;
+import at.gv.egiz.bku.gui.viewer.FontProvider;
 import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.event.ActionListener;
 import java.net.URL;
 import java.text.MessageFormat;
 import java.util.Locale;
-import java.util.ResourceBundle;
 import javax.swing.GroupLayout;
 import javax.swing.JButton;
 import javax.swing.JLabel;
@@ -50,9 +49,10 @@ public class ActivationGUI extends CardMgmtGUI implements ActivationGUIFacade {
           Locale locale,
           Style guiStyle,
           URL backgroundImgURL,
+          FontProvider fontProvider,
           AbstractHelpListener helpListener,
           SwitchFocusListener switchFocusListener) {
-    super(contentPane, locale, guiStyle, backgroundImgURL, helpListener, switchFocusListener);
+    super(contentPane, locale, guiStyle, backgroundImgURL, fontProvider, helpListener, switchFocusListener);
 
     progressBar = new JProgressBar();
   }
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java
index 68b2a2ba..98f44d55 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java
@@ -17,7 +17,7 @@
 
 package at.gv.egiz.bku.gui;
 
-import at.gv.egiz.bku.gui.*;
+import at.gv.egiz.bku.gui.viewer.FontProvider;
 import java.awt.Container;
 import java.net.URL;
 import java.util.Locale;
@@ -38,9 +38,10 @@ public class CardMgmtGUI extends BKUGUIImpl {
           Locale locale,
           Style guiStyle,
           URL backgroundImgURL,
+          FontProvider fontProvider,
           AbstractHelpListener helpListener,
           SwitchFocusListener switchFocusListener) {
-    super(contentPane, locale, guiStyle, backgroundImgURL, helpListener, switchFocusListener);
+    super(contentPane, locale, guiStyle, backgroundImgURL, fontProvider, helpListener, switchFocusListener);
 
   }
 
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
index 12f032d8..6699554e 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
@@ -17,6 +17,7 @@
 
 package at.gv.egiz.bku.gui;
 
+import at.gv.egiz.bku.gui.viewer.FontProvider;
 import at.gv.egiz.smcc.PINSpec;
 import java.awt.Container;
 import java.awt.Cursor;
@@ -58,9 +59,10 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
           Locale locale,
           Style guiStyle,
           URL backgroundImgURL,
+          FontProvider fontProvider,
           AbstractHelpListener helpListener,
           SwitchFocusListener switchFocusListener) {
-    super(contentPane, locale, guiStyle, backgroundImgURL, helpListener, switchFocusListener);
+    super(contentPane, locale, guiStyle, backgroundImgURL, fontProvider, helpListener, switchFocusListener);
   }
 
   @Override
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
index 297173d9..f99bcfd1 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
@@ -17,7 +17,6 @@
 
 package at.gv.egiz.bku.gui;
 
-import at.gv.egiz.bku.gui.*;
 import at.gv.egiz.smcc.PINSpec;
 import java.awt.event.ActionListener;
 import java.util.Map;
diff --git a/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java
index fd562a21..cb05e5f1 100644
--- a/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java
+++ b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java
@@ -21,7 +21,6 @@
 
 package at.gv.egiz.bku.gui;
 
-import at.gv.egiz.bku.gui.*;
 import java.awt.Container;
 import java.awt.Dimension;
 import javax.swing.JFrame;
@@ -42,7 +41,7 @@ public class ActivationGuiTest {
         Container contentPane = testFrame.getContentPane();
         contentPane.setPreferredSize(new Dimension(152, 145));
 //        contentPane.setPreferredSize(new Dimension(300, 190));
-        ActivationGUIFacade gui = new ActivationGUI(contentPane, null, BKUGUIFacade.Style.tiny, null, null, null);
+        ActivationGUIFacade gui = new ActivationGUI(contentPane, null, BKUGUIFacade.Style.tiny, null, new DummyFontLoader(), null, null);
         BKUGUIWorker worker = new BKUGUIWorker();
         worker.init(gui);
         testFrame.pack();
diff --git a/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
index 74ea8952..b01abe72 100644
--- a/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
+++ b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java
@@ -20,7 +20,6 @@
  */
 package at.gv.egiz.bku.gui;
 
-import at.gv.egiz.bku.gui.*;
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
diff --git a/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java
new file mode 100644
index 00000000..87d67adc
--- /dev/null
+++ b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.gui;
+
+import at.gv.egiz.bku.gui.viewer.FontProviderException;
+import at.gv.egiz.bku.gui.viewer.FontProvider;
+import java.awt.Font;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class DummyFontLoader implements FontProvider {
+
+  @Override
+  public Font getFont() throws FontProviderException {
+    return new Font("monospaced", Font.PLAIN, 10);
+  }
+
+}
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java
index 65a0d5ae..44322a07 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java
@@ -16,33 +16,23 @@
  */
 package at.gv.egiz.bku.local.stal;
 
+import at.gv.egiz.bku.viewer.ResourceFontLoader;
 import java.awt.Dimension;
 import java.awt.Toolkit;
-import java.awt.event.WindowEvent;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.Locale;
 
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
-import at.gv.egiz.bku.gui.BKUGUIImpl;
+import at.gv.egiz.bku.gui.BKUIcons;
 import at.gv.egiz.bku.gui.PINManagementGUI;
 import at.gv.egiz.bku.gui.PINManagementGUIFacade;
 import at.gv.egiz.bku.local.gui.GUIProxy;
 import at.gv.egiz.bku.local.gui.LocalHelpListener;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.STALFactory;
-import java.awt.Image;
-import java.awt.Window;
-import java.awt.event.WindowAdapter;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.imageio.ImageIO;
-import javax.swing.ImageIcon;
 import javax.swing.JFrame;
-import javax.swing.JRootPane;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -56,25 +46,6 @@ public class LocalSTALFactory implements STALFactory {
 
   protected static final Log log = LogFactory.getLog(LocalSTALFactory.class);
   protected static final Dimension PREFERRED_SIZE = new Dimension(318, 200);
-  protected static ArrayList<Image> icons = new ArrayList<Image>();
-  static {
-    String[] iconResources = new String[] {
-      "/at/gv/egiz/bku/gui/chip16.png",
-      "/at/gv/egiz/bku/gui/chip24.png",
-      "/at/gv/egiz/bku/gui/chip32.png",
-      "/at/gv/egiz/bku/gui/chip48.png",
-      "/at/gv/egiz/bku/gui/chip128.png" };
-    for (String ir : iconResources) {
-      URL resource = LocalSTALFactory.class.getResource(ir);
-      if (ir != null) {
-        try {
-          icons.add(ImageIO.read(resource));
-        } catch (IOException ex) {
-          log.warn("failed to set ui dialog icon", ex);
-        }
-      }
-    }
-  }
   protected String helpURL;
   protected Locale locale;
 
@@ -91,7 +62,7 @@ public class LocalSTALFactory implements STALFactory {
     }
     // [#439] make mocca dialog alwaysOnTop
     dialog.setAlwaysOnTop(true);
-    dialog.setIconImages(icons);
+    dialog.setIconImages(BKUIcons.icons);
     dialog.setUndecorated(true);
 //    dialog.getRootPane().setWindowDecorationStyle(JRootPane.NONE);
 //    dialog.addWindowListener(new WindowAdapter() {
@@ -120,6 +91,7 @@ public class LocalSTALFactory implements STALFactory {
             dialog.getLocale(),
             BKUGUIFacade.Style.advanced,
             null,
+            new ResourceFontLoader(),
             helpListener, 
             null);
     BKUGUIFacade proxy = (BKUGUIFacade) GUIProxy.newInstance(gui, dialog, new Class[] { PINManagementGUIFacade.class} );
diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip128.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip128.png
deleted file mode 100644
index c36d8079..00000000
Binary files a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip128.png and /dev/null differ
diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip16.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip16.png
deleted file mode 100644
index 96b580e9..00000000
Binary files a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip16.png and /dev/null differ
diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip24.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip24.png
deleted file mode 100644
index efd6dbeb..00000000
Binary files a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip24.png and /dev/null differ
diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip32.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip32.png
deleted file mode 100644
index e7efb020..00000000
Binary files a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip32.png and /dev/null differ
diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip48.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip48.png
deleted file mode 100644
index 491fbcac..00000000
Binary files a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip48.png and /dev/null differ
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 408ce195..3d504a8d 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -128,6 +128,15 @@
       <version>1.2.8-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <!--
+     |   Transitive dependency from BKUViewer,
+     |   set excludeTransitive=false in unpack-fonts
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>BKUFonts</artifactId>
+      <version>1.0</version>
+      <scope>provided</scope>
+    </dependency-->
     <dependency>
       <groupId>iaik</groupId>
       <artifactId>iaik_jce_me4se</artifactId>
@@ -159,6 +168,19 @@
               <stripVersion>true</stripVersion>
             </configuration>
           </execution>
+          <execution>
+            <id>unpack-fonts</id>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/${project.build.finalName}/applet</outputDirectory>
+              <includeGroupIds>at.gv.egiz</includeGroupIds>
+              <includeArtifactIds>BKUFonts</includeArtifactIds>
+              <excludes>META-INF/,LICENSE</excludes>
+              <excludeTransitive>false</excludeTransitive>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-certificates</id>
             <goals>
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
index 9a9bd444..a2447ab7 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
@@ -33,7 +33,6 @@ import at.gv.egiz.stalx.service.translator.STALXTranslationHandler;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 import javax.xml.bind.JAXBElement;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/BKUOnline/src/main/webapp/SLRequestForm.html b/BKUOnline/src/main/webapp/SLRequestForm.html
index f705a0cb..24a88a1e 100644
--- a/BKUOnline/src/main/webapp/SLRequestForm.html
+++ b/BKUOnline/src/main/webapp/SLRequestForm.html
@@ -20,7 +20,7 @@
         <title>Security-Layer v1.2 Request Formular</title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon">
-        <script language="JavaScript">
+        <script language="JavaScript" type="text/javascript">
             <!--
             function setAppletDimension(width, height)
             {
@@ -34,13 +34,10 @@
             //-->
         </script>
         <style type="text/css" media="all">@import "css/main.css";</style>
-
-    </head>
-    <body>
-        <h1>Security-Layer v1.2 Request Formular</h1>
         <style type="text/css">
             fieldset {
                 padding: 1em;
+                margin: 1em;
                 font: 80%/ 1 sans-serif;
                 background-color: #F2EFE9;
                 padding-left: 5em;
@@ -72,6 +69,9 @@
             }
         </style>
 
+    </head>
+    <body>
+        <h1>Security-Layer v1.2 Request Formular</h1>
         <p>
         <form action="./http-security-layer-request" method="Post"
               enctype="application/x-www-form-urlencoded" name="slform">
@@ -110,7 +110,7 @@
   <sl:KeyboxIdentifier>SecureSignatureKeypair</sl:KeyboxIdentifier>
    <sl:DataObjectInfo Structure="enveloping">
      <sl:DataObject>
-       <sl:XMLContent>Ich bin ein einfacher Text.</sl:XMLContent>
+       <sl:XMLContent>Ich bin ein einfacher Text. llöäü߀</sl:XMLContent>
      </sl:DataObject>
     <sl:TransformsInfo>
       <sl:FinalDataMetaInfo>
@@ -120,7 +120,27 @@
   </sl:DataObjectInfo>
   <sl:DataObjectInfo Structure="enveloping">
      <sl:DataObject>
-       <sl:XMLContent><html xmlns="http://www.w3.org/1999/xhtml"><head><title>TestXHTML</title><style/></head><body><p>Ich bin ein einfacher Text.</p></body></html></sl:XMLContent>
+       <sl:XMLContent>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>TestXHTML</title>
+    <style type="text/css" media="screen">
+      .heading { font-size: large; font-weight: bold; }
+      .content1 { }
+      .content2 { font-style: italic; }
+      .content3 { font-family: serif; }
+      .footer { font-size: small; }
+    </style>
+  </head>
+  <body>
+    <h3 class="heading">Heading3 large bold llöäü߀</h3>
+    <p class="content1">Ich bin ein einfacher Text. llöäü߀</p>
+    <p class="content2">Ich bin ein einfacher Text. llöäü߀</p>
+    <p class="content3">Ich bin ein einfacher Text. llöäü߀</p>
+    <p class="footer">Ich bin ein einfacher Text. llöäü߀</p>
+  </body>
+</html>
+        </sl:XMLContent>
      </sl:DataObject>
     <sl:TransformsInfo>
       <sl:FinalDataMetaInfo>
@@ -145,7 +165,8 @@
     </sl10:BinaryFileParameters>
 </sl10:InfoboxUpdateRequest>
 -->
-
+            </fieldset>
+            <fieldset><legend>Request Parameters</legend>
                 <p>
                     <label for="appletGuiStyle">GUI Style</label>
                     <input type="radio" name="appletGuiStyle" value="tiny" onclick="setAppletDimension(152, 145)">tiny
@@ -185,8 +206,9 @@
                     name="StylesheetURL" value="" id="StylesheetURL"></p>
                 <p>
 -->
+                
             </fieldset>
-            <fieldset class="submit"><input type="submit" class="submit"></fieldset>
+            <fieldset class="submit"><input type="submit" class="submit"/></fieldset>
         </form>
 
     </body>
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
index 31f3362b..df0b3ca5 100644
--- a/BKUOnline/src/main/webapp/applet.jsp
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -72,14 +72,13 @@
 
     %>
     <body id="appletpage" style="width:<%=width%>px" onFocus="focusToApplet()">
-            <script>
+      <script type="text/javascript">
 
             	// avoid selection of applet before it is completely loaded
 				var allowSelectionByJS = false;
             
                 if (!deployJava.versionCheck('1.6.0_04+')) {
-                    document
-                    .write('<p>Diese Anwendung benötigt Version 6 Update 4 oder höher der <a href="" onclick="deployJava.installLatestJRE();">Java&trade; Laufzeitumgebung</a>.</p>');
+                    document.write('<p>Diese Anwendung benötigt Version 6 Update 4 oder höher der <a href="" onclick="deployJava.installLatestJRE();">Java&trade; Laufzeitumgebung</a>.</p>');
                 } else {
                   // to enable applet caching, remove AppletDispatcher servlet,
                   // change codebase to 'applet',
@@ -105,14 +104,8 @@
                       RedirectURL : '../bkuResult',
                       RedirectTarget: '_parent'
                     };
-                    var version = '1.6.0_04';
-                    deployJava.runApplet(attributes, parameters, version);
-
-                    
+                    deployJava.runApplet(attributes, parameters, '1.6.0_04');
                 }
-
-
-                
             </script>
 			
     </body>
diff --git a/BKUOnline/src/main/webapp/index.html b/BKUOnline/src/main/webapp/index.html
index 5bc01297..b39dafb7 100644
--- a/BKUOnline/src/main/webapp/index.html
+++ b/BKUOnline/src/main/webapp/index.html
@@ -22,6 +22,7 @@
         <link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon">
         <link href="css/main.css" rel="stylesheet" type="text/css" />
         <script src="js/deployJava.js" type="text/javascript"></script>
+        <!--script src="http://java.com/js/deployJava.js" type="text/javascript"></script-->
     </head>
     <body>
         <div id="animDiv" class="box">
@@ -46,7 +47,7 @@
           <p>
               <h1>MOCCA Web Start</h1>
               <p>
-              <script>
+                <script type="text/javascript">
                   var url="webstart/mocca.jnlp"
                   deployJava.createWebStartLaunchButton(url, "1.6")
               </script></p>
diff --git a/BKUOnline/src/main/webapp/js/deployJava_orig.js b/BKUOnline/src/main/webapp/js/deployJava_orig.js
new file mode 100644
index 00000000..316fa278
--- /dev/null
+++ b/BKUOnline/src/main/webapp/js/deployJava_orig.js
@@ -0,0 +1,725 @@
+/*
+ * Copyright (c)  2008 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Sun Microsystems nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Added by EGIZ:
+ * This file contains workarounds to
+ * [#423] Firefox 3.0.11 bug #498132 causes applet loading failure
+ *   (lines 95-99)
+ * [#424] Web Start loading via java plugin (Sun deployment script) fails on WinXP/Vista
+ *   (lines 501-506)
+ *
+ * features:
+ * [#425] Disable WebStart Launch Button for MacOS
+ *   (lines 492-504)
+ *
+ */
+
+/*
+ * deployJava.js
+ *
+ * This file is part of the Deployment Toolkit.  It provides functions for web
+ * pages to detect the presence of a JRE, install the latest JRE, and easily run
+ * applets or Web Start programs.  Usage guide may be found at http://<TBD>/.
+ *
+ * The "live" copy of this file may be found at
+ * http://java.com/js/deployJava.js.
+ * You are encouraged to link directly to the live copy of the file.
+ *
+ * @version @(#)deployJava.js	XXXXX
+ */
+
+var deployJava={
+  debug:null,
+
+  myInterval:null,
+  preInstallJREList:null,
+  returnPage:null,
+  brand:null,
+  locale:null,
+  installType:null,
+
+  EAInstallEnabled:false,
+  EarlyAccessURL:null,
+
+    // GetJava page
+  getJavaURL:'http://java.sun.com/webapps/getjava/BrowserRedirect?host=java.com',
+
+    // Apple redirect page
+  appleRedirectPage:'http://www.apple.com/support/downloads/',
+  oldMimeType:'application/npruntime-scriptable-plugin;DeploymentToolkit',
+  mimeType:'application/java-deployment-toolkit',
+  launchButtonPNG:'http://java.sun.com/products/jfc/tsc/articles/swing2d/webstart.png',
+
+  getJREs:function(){
+    var list=new Array();
+    if(deployJava.isPluginInstalled()){
+      var plugin=deployJava.getPlugin();
+      var VMs=plugin.jvms;
+      for(var i=0;i<VMs.getLength();i++){
+        list[i]=VMs.get(i).version;
+      }
+      }else{
+      var browser=deployJava.getBrowser();
+
+      if(browser=='MSIE'){
+        if(deployJava.testUsingActiveX('1.8.0')){
+          list[0]='1.8.0';
+        }else if(deployJava.testUsingActiveX('1.7.0')){
+          list[0]='1.7.0';
+        }else if(deployJava.testUsingActiveX('1.6.0')){
+          list[0]='1.6.0';
+        }else if(deployJava.testUsingActiveX('1.5.0')){
+          list[0]='1.5.0';
+        }else if(deployJava.testUsingActiveX('1.4.2')){
+          list[0]='1.4.2';
+        }else if(deployJava.testForMSVM()){
+          list[0]='1.1';
+        }
+        }
+      else if(browser=='Netscape Family'){
+        if(deployJava.testUsingMimeTypes('1.8')){
+          list[0]='1.8.0';
+        }else if(deployJava.testUsingMimeTypes('1.7')){
+          list[0]='1.7.0';
+        }else if(deployJava.testUsingMimeTypes('1.6')){
+          list[0]='1.6.0';
+        }else if(deployJava.testUsingMimeTypes('1.5')){
+          list[0]='1.5.0';
+        }else if(deployJava.testUsingMimeTypes('1.4.2')){
+          list[0]='1.4.2';
+        }
+        }else if(browser=='Safari'){
+        if(deployJava.testUsingPluginsArray('1.8.0')){
+          list[0]='1.8.0';
+        }else if(deployJava.testUsingPluginsArray('1.7.0')){
+          list[0]='1.7.0';
+        }else if(deployJava.testUsingPluginsArray('1.6.0')){
+          list[0]='1.6.0';
+        }else if(deployJava.testUsingPluginsArray('1.5.0')){
+          list[0]='1.5.0';
+        }else if(deployJava.testUsingPluginsArray('1.4.2')){
+          list[0]='1.4.2';
+        }
+        }
+      }
+
+    if(deployJava.debug){
+      for(var i=0;i<list.length;++i){
+        alert('We claim to have detected Java SE '+list[i]);
+      }
+      }
+
+    return list;
+  },
+
+  installJRE:function(requestVersion){
+    var ret=false;
+    if(deployJava.isPluginInstalled()){
+      if(deployJava.getPlugin().installJRE(requestVersion)){
+        deployJava.refresh();
+        if(deployJava.returnPage!=null){
+          document.location=deployJava.returnPage;
+        }
+        return true;
+      }else{
+        return false;
+      }
+      }else{
+      return deployJava.installLatestJRE();
+    }
+    },
+
+  installLatestJRE:function(){
+    if(deployJava.isPluginInstalled()){
+      if(deployJava.getPlugin().installLatestJRE()){
+        deployJava.refresh();
+        if(deployJava.returnPage!=null){
+          document.location=deployJava.returnPage;
+        }
+        return true;
+      }else{
+        return false;
+      }
+      }else{
+      var browser=deployJava.getBrowser();
+      var platform=navigator.platform.toLowerCase();
+      if((deployJava.EAInstallEnabled=='true') &&
+         (platform.indexOf('win')!=-1) &&
+         (deployJava.EarlyAccessURL!=null)) {
+
+        deployJava.preInstallJREList=deployJava.getJREs();
+        if(deployJava.returnPage!=null){
+          deployJava.myInterval=
+            setInterval("deployJava.poll()",3000);
+        }
+
+        location.href=deployJava.EarlyAccessURL;
+        return false;
+      }else{
+        if(browser=='MSIE'){
+          return deployJava.IEInstall();
+        }else if((browser=='Netscape Family')&&
+          (platform.indexOf('win32')!=-1)){
+          return deployJava.FFInstall();
+        }else{
+          location.href=deployJava.getJavaURL+
+          ((deployJava.returnPage!=null)?
+          ('&returnPage='+deployJava.returnPage):'')+
+          ((deployJava.locale!=null)?
+          ('&locale='+deployJava.locale):'')+
+          ((deployJava.brand!=null)?
+          ('&brand='+deployJava.brand):'');
+        }
+        return false;
+      }
+      }
+    },
+
+  runApplet:function(attributes,parameters,minimumVersion){
+    if(minimumVersion=='undefined'||minimumVersion==null){
+      minimumVersion='1.1';
+    }
+
+    var regex="^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
+
+    var matchData=minimumVersion.match(regex);
+
+    if(deployJava.returnPage==null){
+      deployJava.returnPage=document.location;
+    }
+
+    if(matchData!=null){
+      var browser=deployJava.getBrowser();
+      if((browser!='?')&&(browser!='Safari')){
+        if(deployJava.versionCheck(minimumVersion+'+')){
+          deployJava.writeAppletTag(attributes,parameters);
+        }else if(deployJava.installJRE(minimumVersion+'+')){
+          deployJava.refresh();
+          location.href=document.location;
+          deployJava.writeAppletTag(attributes,parameters);
+        }
+        }else{
+        deployJava.writeAppletTag(attributes,parameters);
+      }
+      }else{
+      if(deployJava.debug){
+        alert('Invalid minimumVersion argument to runApplet():'+
+          minimumVersion);
+      }
+      }
+    },
+
+  writeAppletTag:function(attributes,parameters){
+    var s='<'+'applet ';
+    for(var attribute in attributes){
+      s+=(' '+attribute+'="'+attributes[attribute]+'"');
+    }
+    s+='>';
+    document.write(s);
+
+    if(parameters!='undefined'&&parameters!=null){
+      var codebaseParam=false;
+      for(var parameter in parameters){
+        if(parameter=='codebase_lookup'){
+          codebaseParam=true;
+        }
+        s='<param name="'+parameter+'" value="'+
+        parameters[parameter]+'">';
+      document.write(s);
+      }
+      if(!codebaseParam){
+        document.write('<param name="codebase_lookup" value="false">');
+      }
+      }
+    document.write('<'+'/'+'applet'+'>');
+  },
+
+  versionCheck:function(versionPattern)
+
+  {
+    var index=0;
+    var regex="^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?(\\*|\\+)?$";
+
+    var matchData=versionPattern.match(regex);
+
+    if(matchData!=null){
+      var familyMatch=true;
+
+      var patternArray=new Array();
+
+      for(var i=1;i<matchData.length;++i){
+        if((typeof matchData[i]=='string')&&(matchData[i]!='')){
+          patternArray[index]=matchData[i];
+          index++;
+        }
+        }
+
+      if(patternArray[patternArray.length-1]=='+'){
+        familyMatch=false;
+        patternArray.length--;
+      }else{
+        if(patternArray[patternArray.length-1]=='*'){
+          patternArray.length--;
+        }
+        }
+
+      var list=deployJava.getJREs();
+      for(var i=0;i<list.length;++i){
+        if(deployJava.compareVersionToPattern(list[i],patternArray,
+        familyMatch)){
+          return true;
+        }
+        }
+
+      return false;
+    }else{
+      alert('Invalid versionPattern passed to versionCheck: '+
+        versionPattern);
+      return false;
+    }
+    },
+
+  isWebStartInstalled:function(minimumVersion){
+
+    var browser=deployJava.getBrowser();
+    if((browser=='?')||(browser=='Safari')){
+      return true;
+    }
+
+    if(minimumVersion=='undefined'||minimumVersion==null){
+      minimumVersion='1.4.2';
+    }
+
+    var retval=false;
+    var regex="^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
+    var matchData=minimumVersion.match(regex);
+
+    if(matchData!=null){
+      retval=deployJava.versionCheck(minimumVersion+'+');
+    }else{
+      if(deployJava.debug){
+        alert('Invalid minimumVersion argument to isWebStartInstalled(): '+minimumVersion);
+      }
+      retval=deployJava.versionCheck('1.4.2+');
+    }
+    return retval;
+  },
+
+  createWebStartLaunchButton:function(jnlp,minimumVersion){
+    
+    if(deployJava.returnPage==null){
+      deployJava.returnPage=jnlp;
+    }
+    var url='javascript:'+'if (!deployJava.isWebStartInstalled(&quot;'+
+    minimumVersion+'&quot;)) {'+'if (deployJava.installLatestJRE()) {'+'if (deployJava.launch(&quot;'+jnlp+'&quot;)) {}'+'}'+'} else {'+'if (deployJava.launch(&quot;'+jnlp+'&quot;)) {}'+'}';document.write('<'+'a href="'+url+'" onMouseOver="window.status=\'\'; '+'return true;"><'+'img '+'src="'+deployJava.launchButtonPNG+'" '+'border="0" /><'+'/'+'a'+'>');
+  },
+
+  launch:function(jnlp){
+    if(deployJava.isPluginInstalled()){
+      return deployJava.getPlugin().launch(jnlp);
+    }else{
+      document.location=jnlp;return true;
+    }
+    },
+
+  isPluginInstalled:function(){
+    var plugin=deployJava.getPlugin();
+    if(plugin&&plugin.jvms){
+      return true;
+    }else{
+      return false;
+    }
+    },
+
+  isAutoUpdateEnabled:function(){
+    if(deployJava.isPluginInstalled()){
+      return deployJava.getPlugin().isAutoUpdateEnabled();
+    }
+    return false;
+  },
+
+  setAutoUpdateEnabled:function(){
+    if(deployJava.isPluginInstalled()){
+      return deployJava.getPlugin().setAutoUpdateEnabled();
+    }
+    return false;
+  },
+
+  setInstallerType:function(type){
+    deployJava.installType=type;
+    if(deployJava.isPluginInstalled()){
+      return deployJava.getPlugin().setInstallerType(type);
+    }
+    return false;
+  },
+
+  setAdditionalPackages:function(packageList){
+    if(deployJava.isPluginInstalled()){
+      return deployJava.getPlugin().setAdditionalPackages(
+      packageList);
+    }
+    return false;
+  },
+
+  setEarlyAccess:function(enabled){
+    deployJava.EAInstallEnabled=enabled;
+  },
+
+  isPlugin2:function(){
+    if(deployJava.isPluginInstalled()){
+      if(deployJava.versionCheck('1.6.0_10+')){
+        try{
+          return deployJava.getPlugin().isPlugin2();
+        }catch(err){
+
+        }
+        }
+      }
+    return false;
+  },
+
+
+  getPlugin:function(){
+    deployJava.refresh();
+    var ret=document.getElementById('deployJavaPlugin');
+    return ret;
+  },
+
+  compareVersionToPattern:function(version,patternArray,familyMatch){
+    var regex="^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
+    var matchData=version.match(regex);
+
+    if(matchData!=null){
+      var index=0;
+      var result=new Array();
+
+      for(var i=1;i<matchData.length;++i){
+        if((typeof matchData[i]=='string')&&(matchData[i]!=''))
+        {
+          result[index]=matchData[i];
+          index++;
+        }
+        }
+
+      var l=Math.min(result.length,patternArray.length);
+
+      if(familyMatch){
+        for(var i=0;i<l;++i){
+          if(result[i]!=patternArray[i])return false;
+        }
+
+        return true;
+      }else{
+        for(var i=0;i<l;++i){
+          if(result[i]<patternArray[i]){
+            return false;
+          }else if(result[i]>patternArray[i]){
+            return true;
+          }
+          }
+
+        return true;
+      }
+      }else{
+      return false;
+    }
+    },
+
+
+  getBrowser:function(){
+    var browser=navigator.userAgent.toLowerCase();
+
+    if(deployJava.debug){
+      alert('userAgent -> '+browser);
+    }
+
+    if((navigator.vendor)&&
+      (navigator.vendor.toLowerCase().indexOf('apple')!=-1)&&
+      (browser.indexOf('safari')!=-1)){
+      if(deployJava.debug){
+        alert('We claim to have detected "Safari".');
+      }
+      return'Safari';
+    }else if(browser.indexOf('msie')!=-1){
+      if(deployJava.debug){
+        alert('We claim to have detected "IE".');
+      }
+      return'MSIE';
+    }else if((browser.indexOf('mozilla')!=-1)||
+      (browser.indexOf('firefox')!=-1)){
+      if(deployJava.debug){
+        alert('We claim to have detected a Netscape family browser.');
+      }
+      return'Netscape Family';
+    }else{
+      if(deployJava.debug){
+        alert('We claim to have failed to detect a browser.');
+      }
+      return'?';
+    }
+    },
+
+
+  testUsingActiveX:function(version){
+    var objectName='JavaWebStart.isInstalled.'+version+'.0';
+
+    if(!ActiveXObject){
+      if(deployJava.debug){
+        alert('Browser claims to be IE, but no ActiveXObject object?');
+      }
+      return false;
+    }
+
+    try{
+      return(new ActiveXObject(objectName)!=null);
+    }catch(exception){
+      return false;
+    }
+    },
+
+
+  testForMSVM:function(){
+    var clsid='{08B0E5C0-4FCB-11CF-AAA5-00401C608500}';
+
+    if(typeof oClientCaps!='undefined'){
+      var v=oClientCaps.getComponentVersion(clsid,"ComponentID");
+      if((v=='')||(v=='5,0,5000,0')){
+        return false;
+      }else{
+        return true;
+      }
+      }else{
+      return false;
+    }
+    },
+
+
+  testUsingMimeTypes:function(version){
+    if(!navigator.mimeTypes){
+      if(deployJava.debug){
+        alert('Browser claims to be Netscape family, but no mimeTypes[] array?');
+      }
+      return false;
+    }
+
+    for(var i=0;i<navigator.mimeTypes.length;++i){
+      s=navigator.mimeTypes[i].type;
+      var m=s.match(/^application\/x-java-applet\x3Bversion=(1\.8|1\.7|1\.6|1\.5|1\.4\.2)$/);
+      if(m!=null){
+        if(deployJava.compareVersions(m[1],version)){
+          return true;
+        }
+        }
+      }
+    return false;
+  },
+
+
+  testUsingPluginsArray:function(version){
+    if((!navigator.plugins)||(!navigator.plugins.length)){
+      return false;
+    }
+    var platform=navigator.platform.toLowerCase();
+    for(var i=0;i<navigator.plugins.length;++i){
+      s=navigator.plugins[i].description;
+
+      if(s.search(/^Java Switchable Plug-in (Cocoa)/)!=-1){
+        if(deployJava.compareVersions("1.5.0",version)){
+          return true;
+        }
+        }else if(s.search(/^Java/)!=-1){
+        if(platform.indexOf('win')!=-1){
+          if(deployJava.compareVersions("1.5.0",version)||deployJava.compareVersions("1.6.0",version)){
+            return true;
+          }
+          }
+        }
+      }
+    if(deployJava.compareVersions("1.5.0",version)){
+      return true;
+    }
+    return false;
+  },
+
+  IEInstall:function(){
+
+    location.href=deployJava.getJavaURL+
+    ((deployJava.returnPage!=null)?
+    ('&returnPage='+deployJava.returnPage):'')+
+    ((deployJava.locale!=null)?
+    ('&locale='+deployJava.locale):'')+
+    ((deployJava.brand!=null)?('&brand='+deployJava.brand):'')+
+    ((deployJava.installType!=null)?
+    ('&type='+deployJava.installType):'');
+  return false;
+  },
+
+  done:function(name,result){
+  },
+
+  FFInstall:function(){
+
+    location.href=deployJava.getJavaURL+
+    ((deployJava.returnPage!=null)?
+    ('&returnPage='+deployJava.returnPage):'')+
+    ((deployJava.locale!=null)?
+    ('&locale='+deployJava.locale):'')+
+    ((deployJava.brand!=null)?('&brand='+deployJava.brand):'')+
+    ((deployJava.installType!=null)?
+    ('&type='+deployJava.installType):'');
+  return false;
+  },
+
+  compareVersions:function(installed,required){
+
+    var a=installed.split('.');
+    var b=required.split('.');
+
+    for(var i=0;i<a.length;++i){
+      a[i]=Number(a[i]);
+    }
+    for(var i=0;i<b.length;++i){
+      b[i]=Number(b[i]);
+    }
+    if(a.length==2){
+      a[2]=0;
+    }
+
+    if(a[0]>b[0])return true;
+    if(a[0]<b[0])return false;
+
+    if(a[1]>b[1])return true;
+    if(a[1]<b[1])return false;
+
+    if(a[2]>b[2])return true;
+    if(a[2]<b[2])return false;
+
+    return true;
+  },
+
+
+  enableAlerts:function(){
+    deployJava.debug=true;
+  },
+
+  poll:function(){
+
+    deployJava.refresh();
+    var postInstallJREList=deployJava.getJREs();
+
+    if((deployJava.preInstallJREList.length==0)&&
+      (postInstallJREList.length!=0)){
+      clearInterval(deployJava.myInterval);
+      if(deployJava.returnPage!=null){
+        location.href=deployJava.returnPage;
+      };
+    }
+
+    if((deployJava.preInstallJREList.length!=0)&&
+      (postInstallJREList.length!=0)&&
+      (deployJava.preInstallJREList[0]!=postInstallJREList[0])){
+      clearInterval(deployJava.myInterval);
+      if(deployJava.returnPage!=null){
+        location.href=deployJava.returnPage;
+      }
+      }
+
+    },
+
+  writePluginTag:function(){
+    var browser=deployJava.getBrowser();
+    if(browser=='MSIE'){
+      document.write('<'+
+        'object classid="clsid:CAFEEFAC-DEC7-0000-0000-ABCDEFFEDCBA" '+
+        'id="deployJavaPlugin" width="0" height="0">'+
+        '<'+'/'+'object'+'>');
+    }else if(browser=='Netscape Family'){
+      deployJava.writeEmbedTag();
+    }
+    },
+
+  refresh:function(){
+    navigator.plugins.refresh(false);var browser=deployJava.getBrowser();if(browser=='Netscape Family'){
+      var plugin=document.getElementById('deployJavaPlugin');if(plugin==null){
+        deployJava.writeEmbedTag();
+      }
+      }
+    },
+
+  writeEmbedTag:function(){
+    var written=false;if(navigator.mimeTypes!=null){
+      for(var i=0;i<navigator.mimeTypes.length;i++){
+        if(navigator.mimeTypes[i].type==deployJava.mimeType){
+          if(navigator.mimeTypes[i].enabledPlugin){
+            document.write('<'+'embed id="deployJavaPlugin" type="'+
+              deployJava.mimeType+'" hidden="true" />');written=true;
+          }
+          }
+        }
+      if(!written)for(var i=0;i<navigator.mimeTypes.length;i++){
+        if(navigator.mimeTypes[i].type==deployJava.oldMimeType){
+          if(navigator.mimeTypes[i].enabledPlugin){
+            document.write('<'+'embed id="deployJavaPlugin" type="'+
+              deployJava.oldMimeType+'" hidden="true" />');
+          }
+          }
+        }
+      }
+    },
+    
+  do_initialize:function(){
+    deployJava.writePluginTag();
+    if(deployJava.locale==null){
+      var loc=null;
+
+      if(loc==null)try{
+        loc=navigator.userLanguage;
+      }catch(err){}
+
+      if(loc==null)try{
+        loc=navigator.systemLanguage;
+      }catch(err){}
+
+      if(loc==null)try{
+        loc=navigator.language;
+      }catch(err){}
+
+      if(loc!=null){
+        loc.replace("-","_")
+        deployJava.locale=loc;
+      }
+      }
+    }
+
+  };
+  deployJava.do_initialize();
+
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 24605880..579d12f0 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -39,13 +39,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+	 <dependency>
+	  <groupId>at.gv.egiz</groupId>
+	  <artifactId>BKUFonts</artifactId>
+	  <version>1.0</version>
+	 </dependency>
 	</dependencies>
-    <!--build>
-      <plugins>
-        <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId> <configuration>
-        <skip>true</skip> </configuration> </plugin>
-      </plugins>
-    </build-->
-</project>
\ No newline at end of file
+</project>
diff --git a/BKUViewer/src/main/java/at/gv/egiz/bku/text/TextValidator.java b/BKUViewer/src/main/java/at/gv/egiz/bku/text/TextValidator.java
index 485aa727..dee8ff2e 100644
--- a/BKUViewer/src/main/java/at/gv/egiz/bku/text/TextValidator.java
+++ b/BKUViewer/src/main/java/at/gv/egiz/bku/text/TextValidator.java
@@ -16,20 +16,21 @@
 */
 package at.gv.egiz.bku.text;
 
+import at.gv.egiz.bku.gui.viewer.FontProviderException;
+import at.gv.egiz.bku.viewer.ResourceFontLoader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
-import java.nio.charset.IllegalCharsetNameException;
-import java.nio.charset.UnsupportedCharsetException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import at.gv.egiz.bku.viewer.ValidationException;
 import at.gv.egiz.bku.viewer.Validator;
+import java.awt.Font;
 
 public class TextValidator implements Validator {
 
@@ -37,7 +38,13 @@ public class TextValidator implements Validator {
    * Logging facility.
    */
   protected static Log log = LogFactory.getLog(TextValidator.class);
-  
+
+  protected Font viewerFont;
+
+  public TextValidator() throws FontProviderException {
+    viewerFont = new ResourceFontLoader().getFont();
+  }
+
   private void invalid(char c) throws ValidationException {
     log.info("Invalid character (0x" + Integer.toHexString(c) + ") found.");
     // TODO: localize
@@ -68,30 +75,7 @@ public class TextValidator implements Validator {
         cb.flip();
         for (int i = 0; i < l; i++) {
           c = cb.get();
-          if (c < '\u0020') {
-            // C0 Controls and Basic Latin (0x000C-0x000D)
-            if (c > '\r') invalid(c); if (c >= '\u000C') continue;
-            // C0 Controls and Basic Latin (0x0009-0x000A)
-            if (c > '\n') invalid(c); if (c >= '\t') continue;
-            invalid(c);
-          } else {
-            // C0 Controls and Basic Latin (0x0020-0x007E)
-            if (c <= '\u007E') continue;
-            // C1 Controls and Latin-1 Supplement (0x00A1-0x00FF)
-            if (c < '\u00A1') invalid(c); if (c <= '\u00FF') continue;
-            // Latin Extended-A (0x0100-0x017F)
-            if (c < '\u0100') invalid(c); if (c <= '\u017F') continue;
-            // EURO Sign
-            if (c == '\u20AC') continue;
-            // Spacing Modifier Letters
-            if (c == '\u02C7') continue;
-            if (c == '\u02D8') continue;
-            if (c == '\u02D9') continue;
-            if (c == '\u02DB') continue;
-            if (c == '\u02DD') continue;
-            if (c == '\u2015') continue;
-            invalid(c);
-          }
+          if (!viewerFont.canDisplay(c)) invalid(c);
         }
       }
       cb.clear();
diff --git a/BKUViewer/src/test/java/at/gv/egiz/bku/text/TestTextValidator.java b/BKUViewer/src/test/java/at/gv/egiz/bku/text/TestTextValidator.java
index 7137911d..8db459e7 100644
--- a/BKUViewer/src/test/java/at/gv/egiz/bku/text/TestTextValidator.java
+++ b/BKUViewer/src/test/java/at/gv/egiz/bku/text/TestTextValidator.java
@@ -1,19 +1,19 @@
 /*
-* 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.
-*/
+ * 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.
+ */
 package at.gv.egiz.bku.text;
 
 import static org.junit.Assert.*;
@@ -35,7 +35,7 @@ import at.gv.egiz.bku.viewer.ValidatorFactory;
 public class TestTextValidator {
 
   public static byte[] generateText(String encoding) throws UnsupportedEncodingException {
-    
+
     ByteArrayOutputStream bos = new ByteArrayOutputStream();
     PrintWriter writer = new PrintWriter(new OutputStreamWriter(bos, encoding));
 
@@ -45,11 +45,15 @@ public class TestTextValidator {
       writer.write(c);
     }
     writer.write("\n");
-    writer.write("C0 Controls and Basic Latin  0x000C-0x000D");
+    // errata: don't include FORM FEED (0x000C)
+    writer.write("C0 Controls and Basic Latin 0x000D");
     writer.write("\n");
-    for (char c = '\f'; c <= '\r'; c++) {
-      writer.write(c);
-    }
+
+//    for (char c = '\f'; c <= '\r'; c++) {
+//      writer.write(c);
+//    }
+
+    writer.write("\r");
     writer.write("\n");
     writer.write("C0 Controls and Basic Latin  0x0020-0x007E");
     writer.write("\n");
@@ -97,23 +101,23 @@ public class TestTextValidator {
     writer.write("\n");
     writer.write("\u20AC");
     writer.flush();
-  
+
     return bos.toByteArray();
-    
+
   }
-  
+
   public void testTextValidation(String encoding) throws ValidationException, UnsupportedEncodingException {
-    
+
     Validator validator = ValidatorFactory.newValidator("text/plain");
-    
+
     assertNotNull(validator);
 
     InputStream is = new ByteArrayInputStream(generateText(encoding));
-    
+
     assertNotNull(is);
-    
+
     validator.validate(is, encoding);
-    
+
   }
 
   @Test
@@ -151,5 +155,64 @@ public class TestTextValidator {
   public void testISO8859_15() throws ValidationException, UnsupportedEncodingException {
     testTextValidation("ISO-8859-15");
   }
-  
+
+  @Test
+  public void testPerformance() throws UnsupportedEncodingException, ValidationException {
+    Validator validator = ValidatorFactory.newValidator("text/plain");
+
+    assertNotNull(validator);
+
+    //!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώϐϑϒϓϔϕϖϗϘϙϚϛϜϝϞϟϠϡЀЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяѐёђѓєѕіїјљњћќѝўџҐґҒғҔҕҖҗҘҙҚқҰұҲҳӀӁӂӃӄӐӑӒӓӔӕӖӗӘәӚӛӜӝӞӟӠӡӢӣӤӥӦӧӨөӪӫӬӭӮӯӰӱӲӳӴӵӶӷӸӹ
+
+    StringBuilder data = new StringBuilder();
+    //LATIN
+    for (int i = 0x0021; i <= 0x007e; i++) {
+      data.append((char) i);
+    }
+    //LATIN supplement
+    for (int i = 0x00A1; i <= 0x00FF; i++) {
+      data.append((char) i);
+    }
+    //GREEK
+    for (int i = 0x038e; i <= 0x03a1; i++) {
+      data.append((char) i);
+    }
+    for (int i = 0x03a3; i <= 0x03ce; i++) {
+      data.append((char) i);
+    }
+    for (int i = 0x03d0; i <= 0x03e1; i++) {
+      data.append((char) i);
+    }
+    //CYRILLIC
+    for (int i = 0x0400; i <= 0x045f; i++) {
+      data.append((char) i);
+    }
+    for (int i = 0x0490; i <= 0x049b; i++) {
+      data.append((char) i);
+    }
+    for (int i = 0x04b0; i <= 0x04b3; i++) {
+      data.append((char) i);
+    }
+    for (int i = 0x04c0; i <= 0x04c4; i++) {
+      data.append((char) i);
+    }
+    for (int i = 0x04d0; i <= 0x04f9; i++) {
+      data.append((char) i);
+    }
+
+    StringBuilder aLotOfData = new StringBuilder();
+    for (int i = 0; i < 1000; i++) {
+      aLotOfData.append('\n');
+      aLotOfData.append(data);
+    }
+    String aLotOfText = aLotOfData.toString();
+    System.out.println("validating " + aLotOfText.length() + " weird characters: " + aLotOfText);
+
+    InputStream is = new ByteArrayInputStream(aLotOfText.getBytes("UTF-8"));
+
+    assertNotNull(is);
+
+    validator.validate(is, "UTF-8");
+
+  }
 }
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index bb696fba..e878f155 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -49,13 +49,19 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>utils</artifactId>
-			<version>1.2.8-SNAPSHOT</version>
+			<version>${version}</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STALExt</artifactId>
-			<version>1.2.8-SNAPSHOT</version>
+			<version>${version}</version>
 		</dependency>
+    <!-- bkucommon implements default FontProvider (ResourceFontLoader) -->
+    <dependency>
+      <groupId>at.gv.egiz</groupId>
+      <artifactId>BKUCommonGUI</artifactId>
+      <version>${version}</version>
+    </dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ResourceFontLoader.java b/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ResourceFontLoader.java
new file mode 100644
index 00000000..8cab581d
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ResourceFontLoader.java
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.viewer;
+
+import at.gv.egiz.bku.gui.viewer.FontProviderException;
+import at.gv.egiz.bku.gui.viewer.FontProvider;
+import java.awt.Font;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Loads font(s) as classpath resource.
+ * Loaded fonts are shared within all instances in this VM (classloader)
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class ResourceFontLoader implements FontProvider {
+  
+  public static final String FONT_RESOURCE = "DejaVuLGCSansMono.ttf";
+
+  protected final static Log log = LogFactory.getLog(ResourceFontLoader.class);
+
+  /** TextValidator and (local) SecureViewerDialog (see LocalStalFactory) use ResourceFontLoader, load resource only once  */
+  protected static Font font;
+
+  /**
+   *
+   * @return
+   * @throws FontProviderException encapsulating FontFormatException (if resource doesn't contain the plain format) 
+   * or IOException (if resource cannot be retrieved)
+   */
+  @Override
+  public Font getFont() throws FontProviderException {
+    if (font == null) {
+      try {
+        if (log.isDebugEnabled()) {
+          log.debug("loading " + getClass().getClassLoader().getResource(FONT_RESOURCE));
+        }
+        font = Font.createFont(Font.PLAIN, getClass().getClassLoader().getResourceAsStream(FONT_RESOURCE));
+      } catch (Exception ex) {
+        log.error("failed to load font", ex);
+        throw new FontProviderException("failed to load font", ex);
+      }
+    }
+    log.trace("font resource loaded");
+    return font;
+  }
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ValidatorFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ValidatorFactory.java
index e16a261e..ad9bf6bb 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ValidatorFactory.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ValidatorFactory.java
@@ -17,6 +17,8 @@
 package at.gv.egiz.bku.viewer;
 
 import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -108,14 +110,25 @@ public class ValidatorFactory {
     return null;
     
   }
-  
+
+  /**
+   *
+   * @throws InvocationTargetException if className's (nullary) constructor throws exception
+   */
   private Validator createValidatorInstance(String className)
       throws ClassNotFoundException, InstantiationException,
-      IllegalAccessException {
-    
+      IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+
     try {
-      Class<?> implClass = classLoader.loadClass(className);
-      return (Validator) implClass.newInstance();
+      Constructor<?> implConstructor = classLoader.loadClass(className).getConstructor((Class[])null);
+      return (Validator) implConstructor.newInstance((Object[])null);
+    } catch (InvocationTargetException ex) {
+      //ex from constructor
+      log.error("Failed to initialize validator class '" + className + "': " + ex.getCause().getMessage(), ex.getCause());
+      throw ex;
+    } catch (NoSuchMethodException ex) {
+      log.error("Validator class '" + className + "' has no nullary constructor", ex);
+      throw ex;
     } catch (ClassNotFoundException e) {
       log.error("Validator class '" + className + "' not found.", e);
       throw e;
diff --git a/pom.xml b/pom.xml
index e1b6843b..34fcfaa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
     <module>BKUGuiExt</module>
     <module>smccSTALExt</module>
     <!--module>BKUWebStartPackage</module-->
+    <module>BKUFonts</module>
   </modules>
   <developers>
     <developer>
-- 
cgit v1.2.3


From 5bb4d11327fcfe0fdc4234eeb02f4b09d108109e Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 9 Nov 2009 17:05:57 +0000
Subject: applet version BKUFonts .project

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@536 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml                                  | 19 ++++++++++++
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    | 35 ++++++++++++++++-----
 BKUApplet/src/test/resources/appletTest.html       |  5 +--
 BKUApplet/src/test/resources/appletviewer.policy   |  3 ++
 .../at/gv/egiz/bku/gui/SecureViewerDialog.java     |  4 +--
 .../test/java/at/gv/egiz/bku/gui/BKUGUITest.java   |  1 -
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |  6 ++--
 .../java/at/gv/egiz/bku/gui/DummyFontLoader.java   |  6 ++++
 BKUFonts/.classpath                                |  8 +++++
 BKUFonts/.project                                  | 36 ++++++++++++++++++++++
 BKUFonts/.settings/org.eclipse.jdt.core.prefs      |  7 +++++
 .../.settings/org.eclipse.wst.common.component     |  6 ++++
 .../org.eclipse.wst.common.project.facet.core.xml  |  5 +++
 BKUFonts/.settings/org.maven.ide.eclipse.prefs     |  9 ++++++
 bkucommon/pom.xml                                  |  5 ---
 15 files changed, 134 insertions(+), 21 deletions(-)
 create mode 100644 BKUApplet/src/test/resources/appletviewer.policy
 create mode 100644 BKUFonts/.classpath
 create mode 100644 BKUFonts/.project
 create mode 100644 BKUFonts/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 BKUFonts/.settings/org.eclipse.wst.common.component
 create mode 100644 BKUFonts/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 BKUFonts/.settings/org.maven.ide.eclipse.prefs

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 4172517b..8f72b7d0 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -44,6 +44,22 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>maven-buildnumber-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>create</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <doCheck>false</doCheck>
+          <doUpdate>false</doUpdate>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <groupId>org.apache.maven.plugins</groupId>
@@ -62,6 +78,9 @@
               <addClasspath>false</addClasspath>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
+            <manifestEntries>
+              <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build>
+            </manifestEntries>
           </archive>
           <alias>test-applet signer</alias>
           <keystore>./keystore.ks</keystore>
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 7a15f7a5..2094e55c 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -22,12 +22,14 @@ import at.gv.egiz.bku.gui.DefaultHelpListener;
 import at.gv.egiz.bku.gui.AbstractHelpListener;
 import at.gv.egiz.bku.gui.SwitchFocusListener;
 import at.gv.egiz.stal.service.translator.STALTranslator;
+
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Locale;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
 import javax.net.ssl.HttpsURLConnection;
 import javax.swing.JApplet;
 import javax.swing.JPanel;
@@ -79,14 +81,30 @@ public class BKUApplet extends JApplet {
    */
   protected static final String TEST_SESSION_ID = "TestSession";
 
+  public static final String VERSION;
+  public static final String UNKNOWN_VERSION = "UNKNOWN";
+  
   static {
-    if (log.isTraceEnabled()) {
-      log.trace("enabling webservice communication dump");
-      System.setProperty(
-              "com.sun.xml.ws.transport.http.client.HttpTransportPipe.dump",
-              "true");
+    String tmp = UNKNOWN_VERSION;
+    try {
+      String BKUAppletJar = BKUApplet.class.getProtectionDomain().getCodeSource().getLocation().toString();
+      URL manifestURL = new URL("jar:" + BKUAppletJar + "!/META-INF/MANIFEST.MF");
+      if (log.isTraceEnabled()) {
+        log.trace("read version information from " + manifestURL);
+      }
+      Manifest manifest = new Manifest(manifestURL.openStream());
+      Attributes atts = manifest.getMainAttributes();
+      if (atts != null) {
+        tmp = atts.getValue("Implementation-Build");
+      }
+    } catch (IOException ex) {
+      log.error("failed to read version", ex);
+    } finally {
+      VERSION = tmp;
+      log.debug("BKU Applet " + VERSION);
     }
   }
+
   /**
    * STAL
    */
@@ -119,13 +137,14 @@ public class BKUApplet extends JApplet {
                 "URL for locating help files, e.g. '../help/' (no help provided if missing)"}};
   }
 
+  
   /**
    * Factory method to create and wire HelpListener, GUI and BKUWorker.
    * (Config via applet parameters, see BKUApplet.* constants)
    */
   @Override
   public void init() {
-    log.info("Welcome to MOCCA");
+    log.info("Welcome to MOCCA " + VERSION);
     log.trace("Called init()");
     showStatus("Initializing MOCCA applet");
 
diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
index d1a0f6e2..85834763 100644
--- a/BKUApplet/src/test/resources/appletTest.html
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -21,6 +21,7 @@
     <link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon">
   </head>
   <body>
+  	<p>Run applet test with appletviewer -J-Djava.security.policy=appletviewer.policy appletTest.html</p>
     <applet code="at.gv.egiz.bku.online.applet.BKUApplet.class"
             archive="../BKUApplet-1.2.8-SNAPSHOT.jar, commons-logging.jar , iaik_jce_me4se.jar"
             width=190 height=130 name="moccaapplet" id="moccaapplet">
@@ -29,10 +30,10 @@
       <!--param name="Background" value="jar:file:/home/clemens/workspace/mocca/BKUApplet/target/BKUApplet-1.0-SNAPSHOT.jar!/images/help.png"/-->
       <!--param name="Background" value="http://localhost:3495/img/BackgroundChipperling.png"/-->
       <param name="BackgroundColor" value="#ff0000"/>
-      <param name="WSDL_URL" value="https://danu.gv.at:3496/stal?wsdl"/>
+      <param name="WSDL_URL" value="https://localhost:8080/stal?wsdl"/>
       <param name="HelpURL" value="http://apps.egiz.gv.at/bkuonline/help/"/>
       <param name="SessionId" value="TestSession"/>
-      <param name="RedirectURL" value="http://localhost:3495/bkuResult"/>
+      <param name="RedirectURL" value="http://www.google.com/bkuResult"/>
       <param name="RedirectTarget" value="_parent"/>
     </applet>
   </body>
diff --git a/BKUApplet/src/test/resources/appletviewer.policy b/BKUApplet/src/test/resources/appletviewer.policy
new file mode 100644
index 00000000..c26e27b7
--- /dev/null
+++ b/BKUApplet/src/test/resources/appletviewer.policy
@@ -0,0 +1,3 @@
+grant {
+	permission java.security.AllPermission;
+};
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
index 1883fce5..c0b14a85 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
@@ -321,11 +321,11 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
   public void actionPerformed(ActionEvent e) {
     if ("close".equals(e.getActionCommand())) {
 //    SecureViewerDialog.dialog.setVisible(false);
-      log.trace("closing secure viewer");
+      log.trace(Thread.currentThread() + " closing secure viewer");
       setVisible(false);
       log.trace("secure viewer closed");
     } else if ("save".equals(e.getActionCommand())) {
-      log.trace("display secure viewer save dialog");
+      log.trace(Thread.currentThread() + " display secure viewer save dialog");
       showSaveDialog(content, null, null);
       log.trace("done secure viewer save");
     } else {
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index fdd58850..e2e8d104 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -32,7 +32,6 @@ import org.junit.Test;
  *
  * @author clemens
  */
-@Ignore
 public class BKUGUITest {
 
     @Test
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 5475a45b..20654141 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
@@ -108,9 +108,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);
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java
index 87d67adc..505c4247 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java
@@ -21,14 +21,20 @@ import at.gv.egiz.bku.gui.viewer.FontProviderException;
 import at.gv.egiz.bku.gui.viewer.FontProvider;
 import java.awt.Font;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  *
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class DummyFontLoader implements FontProvider {
 
+  protected final static Log log = LogFactory.getLog(DummyFontLoader.class);
+  
   @Override
   public Font getFont() throws FontProviderException {
+	log.debug("return font");  
     return new Font("monospaced", Font.PLAIN, 10);
   }
 
diff --git a/BKUFonts/.classpath b/BKUFonts/.classpath
new file mode 100644
index 00000000..d2236dff
--- /dev/null
+++ b/BKUFonts/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/fonts"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/BKUFonts/.project b/BKUFonts/.project
new file mode 100644
index 00000000..484ff825
--- /dev/null
+++ b/BKUFonts/.project
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>BKUFonts</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/BKUFonts/.settings/org.eclipse.jdt.core.prefs b/BKUFonts/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..9db35b19
--- /dev/null
+++ b/BKUFonts/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Nov 06 15:23:46 CET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/BKUFonts/.settings/org.eclipse.wst.common.component b/BKUFonts/.settings/org.eclipse.wst.common.component
new file mode 100644
index 00000000..d7d79bb4
--- /dev/null
+++ b/BKUFonts/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="BKUFonts">
+        <wb-resource deploy-path="/" source-path="/src/main/fonts"/>
+    </wb-module>
+</project-modules>
diff --git a/BKUFonts/.settings/org.eclipse.wst.common.project.facet.core.xml b/BKUFonts/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 00000000..f68988cf
--- /dev/null
+++ b/BKUFonts/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="jst.java" version="6.0"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/BKUFonts/.settings/org.maven.ide.eclipse.prefs b/BKUFonts/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 00000000..51d61132
--- /dev/null
+++ b/BKUFonts/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,9 @@
+#Fri Nov 06 15:23:22 CET 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index e878f155..972136c2 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -25,11 +25,6 @@
 				<sourceDestDir>${project.build.directory}/generated-sources/moaspss</sourceDestDir>
 				<staleFile>${project.build.directory}/generated-sources/moaspss/.staleFlag</staleFile>
 				<xnocompile>true</xnocompile> </configuration> </plugin -->
-			<!--
-				skip tests temporarily <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId> <configuration>
-				<skip>true</skip> </configuration> </plugin -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-- 
cgit v1.2.3


From 0af223f23f2178113147b3b1f0a755e9c5abbaee Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 9 Nov 2009 17:14:46 +0000
Subject: Ignore BKUGUITest

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@537 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
index e2e8d104..fdd58850 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java
@@ -32,6 +32,7 @@ import org.junit.Test;
  *
  * @author clemens
  */
+@Ignore
 public class BKUGUITest {
 
     @Test
-- 
cgit v1.2.3


From caca721368d8c24559b1cd5ea2018884b4874f6b Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 10 Nov 2009 15:30:16 +0000
Subject: Removed switchFocusListener due to problem with viewer/help dialogs
 on Firefox/Mac

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@539 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |  5 +----
 .../bku/online/applet/viewer/URLFontLoader.java    |  8 +++----
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 18 +++++++--------
 .../at/gv/egiz/bku/gui/SecureViewerDialog.java     | 15 ++++++-------
 .../at/gv/egiz/bku/gui/SwitchFocusListener.java    |  4 ++--
 BKUOnline/src/main/webapp/applet.jsp               | 26 +---------------------
 .../gv/egiz/bku/smccstal/AbstractPINProvider.java  |  4 ++--
 .../gv/egiz/bku/smccstal/PINProviderFactory.java   |  5 +++++
 8 files changed, 31 insertions(+), 54 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 2094e55c..895fdbb5 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -187,9 +187,6 @@ public class BKUApplet extends JApplet {
       log.warn("failed to load help URL: " + ex.getMessage() + ", disabling help");
     }
 
-    SwitchFocusListener switchFocusListener = new SwitchFocusListener(
-            getAppletContext(), "focusToBrowser()");
-
     // Note: We need a panel in order to be able to set the background
     // properly.
     // Setting the background without a panel has side effects with the
@@ -212,7 +209,7 @@ public class BKUApplet extends JApplet {
       URLFontLoader fontProvider = new URLFontLoader(getCodeBase());
       fontProvider.loadInBackground();
       BKUGUIFacade gui = createGUI(contentPanel, getLocale(), guiStyle,
-              backgroundImgURL, fontProvider, helpListener, switchFocusListener);
+              backgroundImgURL, fontProvider, helpListener, null); 
 
       worker = createBKUWorker(this, gui);
     } catch (MalformedURLException ex) {
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java
index f914aed7..49615887 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java
@@ -41,13 +41,13 @@ public class URLFontLoader extends SwingWorker<Font, Object> implements FontProv
   public URLFontLoader(URL codebase) throws MalformedURLException {
     this.fontURL = new URL(codebase, SANSMONO_FONT_RESOURCE);
     if (log.isDebugEnabled()) {
-      log.debug(Thread.currentThread() + " setting font load URL: " + fontURL);
+      log.debug("[" + Thread.currentThread().getName() + "] setting font load URL: " + fontURL);
     }
   }
 
   public void loadInBackground() {
     if (log.isDebugEnabled()) {
-      log.debug(Thread.currentThread() + " scheduling font loading in background: " + fontURL);
+      log.debug("[" + Thread.currentThread().getName() + "] scheduling font loading in background: " + fontURL);
     }
     this.execute();
   }
@@ -55,7 +55,7 @@ public class URLFontLoader extends SwingWorker<Font, Object> implements FontProv
   @Override
   protected Font doInBackground() throws MalformedURLException, FontFormatException, IOException {
     if (log.isDebugEnabled()) {
-      log.debug(Thread.currentThread() + " loading font in background...");
+      log.debug("[" + Thread.currentThread().getName() + "] loading font in background...");
     }
     return Font.createFont(Font.TRUETYPE_FONT, fontURL.openStream());
   }
@@ -67,7 +67,7 @@ public class URLFontLoader extends SwingWorker<Font, Object> implements FontProv
    */
   @Override
   public Font getFont() throws FontProviderException {
-    log.debug(Thread.currentThread() + " get font");
+    log.debug("[" + Thread.currentThread().getName() + "] get font (EDT?)");
     try {
       return get();
     } catch (InterruptedException ex) {
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 8df4bd72..34f278fb 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -159,7 +159,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 @Override
                 public void run() {
                   
-                  log.debug("initializing gui [" + Thread.currentThread().getName() + "]");
+                  log.debug("[" + Thread.currentThread().getName() + "] initializing gui");
 
                   if (renderIconPanel) {
                     initIconPanel(background);
@@ -565,7 +565,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
             @Override
             public void run() {
 
-              log.debug("show card-pin dialog [" + Thread.currentThread().getName() + "]");
+              log.debug("[" + Thread.currentThread().getName() + "] show card-pin dialog");
       
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
@@ -758,7 +758,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
             @Override
             public void run() {
 
-              log.debug("show pinpad signature-pin dialog [" + Thread.currentThread().getName() + "]");
+              log.debug("[" + Thread.currentThread().getName() + "] show pinpad signature-pin dialog");
 
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
@@ -927,7 +927,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
             @Override
             public void run() {
               
-              log.debug("show signature-pin dialog [" + Thread.currentThread().getName() + "]");
+              log.debug("[" + Thread.currentThread().getName() + "] show signature-pin dialog");
       
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
@@ -1215,7 +1215,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
           @Override
             public void run() {
 
-                log.debug("show message dialog [" + Thread.currentThread().getName() + "]");
+                log.debug("[" + Thread.currentThread().getName() + "] show message dialog");
 
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
@@ -1385,7 +1385,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 backListener, backCommand);
       } else if (dataToBeSigned.size() == 1) {
         try {
-          log.debug("scheduling secure viewer");
+          log.debug("[" + Thread.currentThread().getName() + "] scheduling secure viewer");
 
           SwingUtilities.invokeLater(new Runnable() {
 
@@ -1419,7 +1419,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
      */
     private void showSecureViewer(HashDataInput dataToBeSigned) throws FontProviderException {
       
-      log.debug("show secure viewer [" + Thread.currentThread().getName() + "]");
+      log.debug("[" + Thread.currentThread().getName() + "] show secure viewer");
       if (secureViewer == null) {
         secureViewer = new SecureViewerDialog(null, messages,
                 fontProvider, helpMouseListener.getActionListener());
@@ -1439,14 +1439,14 @@ public class BKUGUIImpl implements BKUGUIFacade {
     private void showSignedReferencesListDialog(final List<HashDataInput> signedReferences,
             final ActionListener backListener, final String backCommand) {
       
-      log.debug("scheduling signed references list dialog");
+      log.debug("[" + Thread.currentThread().getName() + "] scheduling signed references list dialog");
       
       SwingUtilities.invokeLater(new Runnable() {
 
         @Override
         public void run() {
           
-          log.debug("show signed references list dialog [" + Thread.currentThread().getName() + "]");
+          log.debug("[" + Thread.currentThread().getName() + "] show signed references list dialog");
           
           mainPanel.removeAll();
           buttonPanel.removeAll();
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
index c0b14a85..878a998b 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
@@ -54,8 +54,6 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.LayoutStyle;
 import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-import javax.swing.text.DefaultEditorKit;
 import javax.swing.text.Document;
 import javax.swing.text.EditorKit;
 import javax.swing.text.StyledEditorKit;
@@ -73,7 +71,6 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
    * BKUApplet includes BKUFonts as runtime dependency only, the jar is copied to the applet dir in BKUOnline with dependency-plugin
    * BKUViewer has compile dependency BKUFonts, transitive in BKUOnline and BKULocal
    */
-  public static final String PLAINTEXT_FONT_RESOURCE = "DejaVuSansMono.ttf";
   public static final Dimension VIEWER_DIMENSION = new Dimension(600, 400);
   protected static final Log log = LogFactory.getLog(SecureViewerDialog.class);
 //  private static SecureViewerDialog dialog;
@@ -227,6 +224,8 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
    */
   public void setContent(HashDataInput hashDataInput) { //throws FontProviderException {
 
+    log.debug("[" + Thread.currentThread().getName() + "] set viewer content");
+    
     this.content = null;
     viewer.setText(null);
 
@@ -285,6 +284,7 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
       viewerLabel.setText("");
     }
 
+    log.debug("VIEWER FONT: " + viewer.getFont());
     setVisible(true);
     toFront();
   }
@@ -320,12 +320,11 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
   @Override
   public void actionPerformed(ActionEvent e) {
     if ("close".equals(e.getActionCommand())) {
-//    SecureViewerDialog.dialog.setVisible(false);
-      log.trace(Thread.currentThread() + " closing secure viewer");
+      log.trace("[" + Thread.currentThread().getName() + "] closing secure viewer");
       setVisible(false);
       log.trace("secure viewer closed");
     } else if ("save".equals(e.getActionCommand())) {
-      log.trace(Thread.currentThread() + " display secure viewer save dialog");
+      log.trace("[" + Thread.currentThread().getName() + "] display secure viewer save dialog");
       showSaveDialog(content, null, null);
       log.trace("done secure viewer save");
     } else {
@@ -336,14 +335,14 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
   private void showSaveDialog(final HashDataInput hashDataInput,
           final ActionListener okListener, final String okCommand) {
 
-    log.debug("scheduling save dialog [" + Thread.currentThread().getName() + "]");
+    log.debug("[" + Thread.currentThread().getName() + "] scheduling save dialog");
 
     SwingUtilities.invokeLater(new Runnable() {
 
       @Override
       public void run() {
 
-        log.debug("show save dialog [" + Thread.currentThread().getName() + "]");
+        log.debug("[" + Thread.currentThread().getName() + "] show save dialog");
 
         String userHome = System.getProperty("user.home");
 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusListener.java
index 1e3fabbd..48b641e2 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusListener.java
@@ -33,8 +33,8 @@ public class SwitchFocusListener implements ActionListener {
 	        ctx.showDocument
 	          (new URL("javascript:" + javascriptFunction));
 	        }
-	      catch (MalformedURLException me) { 
-	    	  
+	      catch (MalformedURLException me) {
+
 	    	  log.warn("Unable to call external javascript function.", me);
 	      }
 		
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
index df0b3ca5..423b349e 100644
--- a/BKUOnline/src/main/webapp/applet.jsp
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -71,7 +71,7 @@
         }
 
     %>
-    <body id="appletpage" style="width:<%=width%>px" onFocus="focusToApplet()">
+    <body id="appletpage" style="width:<%=width%>px">
       <script type="text/javascript">
 
             	// avoid selection of applet before it is completely loaded
@@ -109,28 +109,4 @@
             </script>
 			
     </body>
-    
-    <script>
-
-		function focusToApplet() {
-	
-			//alert('try to set focus to applet');
-			if (document != null && document.moccaapplet != null && allowSelectionByJS) {
-	
-				//alert('set focus to applet.');
-				document.moccaapplet.getFocusFromBrowser();						
-				return true;					
-			}
-			allowSelectionByJS = true;
-		}
-	
-		function focusToBrowser() {
-
-			// put focus to window
-			// focus can be assigned to any focusable field on the embedding website
-			self.focus();
-	
-		}		
-    
-    </script>
 </html>
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java
index e2499023..bc52c955 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java
@@ -47,7 +47,7 @@ public abstract class AbstractPINProvider implements PINProvider, ActionListener
         this.wait();
       }
     } catch (InterruptedException e) {
-      log.error("interrupt in waitForAction");
+      log.error("[" + Thread.currentThread().getName() + "] interrupt in waitForAction");
       throw e;
     }
     actionPerformed = false;
@@ -60,7 +60,7 @@ public abstract class AbstractPINProvider implements PINProvider, ActionListener
 
   @Override
   public void actionPerformed(ActionEvent e) {
-    log.debug("command " + e.getActionCommand());
+    log.debug("[" + Thread.currentThread().getName() + "] action performed - " + e.getActionCommand());
     action = e.getActionCommand();
     actionPerformed();
   }
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java
index 543fbb3a..e5afe0ae 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java
@@ -116,7 +116,9 @@ public class PINProviderFactory {
               this, "secureViewer");
 
       do {
+        log.debug("[" + Thread.currentThread().getName() + "] wait for action");
         waitForAction();
+        log.debug("[" + Thread.currentThread().getName() + "] received action");
 
         if ("secureViewer".equals(action)) {
           try {
@@ -169,6 +171,7 @@ public class PINProviderFactory {
               this, "ok",
               this, "cancel");
 
+      log.debug("[" + Thread.currentThread().getName() + "] wait for action");
       waitForAction();
 
       gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
@@ -216,7 +219,9 @@ public class PINProviderFactory {
               PinpadSignaturePinProvider.this, "secureViewer");
 
           while (true) {
+            log.debug("[" + Thread.currentThread().getName() + "] wait for action");
             waitForAction();
+            log.debug("[" + Thread.currentThread().getName() + "] received action");
 
             if ("secureViewer".equals(action)) {
               viewer.displayDataToBeSigned(signedInfo,
-- 
cgit v1.2.3


From 68651bf67987905980734f5c2199f337a232f427 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 12 Nov 2009 20:48:57 +0000
Subject: Added support for enforcing a PIN length in a CHANGE REFERENCE DATA
 to match the recommended PIN length via Applet parameter.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@541 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../at/gv/egiz/bku/online/applet/BKUApplet.java    |   7 +
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   |   4 +-
 .../main/java/at/gv/egiz/bku/gui/PinDocument.java  |  94 ++++---
 .../at/gv/egiz/bku/gui/Messages_en.properties      |   2 +-
 .../java/at/gv/egiz/bku/gui/PINManagementGUI.java  |  21 +-
 .../egiz/bku/binding/SSLDataUrlConnectionTest.java |   4 +-
 smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java   |  16 +-
 smcc/src/main/java/at/gv/egiz/smcc/PINSpec.java    | 302 ++++++++++++++-------
 .../src/main/java/at/gv/egiz/smcc/STARCOSCard.java |   9 +-
 .../java/at/gv/egiz/smcc/SignatureCardFactory.java |   2 +
 10 files changed, 302 insertions(+), 159 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 895fdbb5..85612d6e 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -21,6 +21,7 @@ import at.gv.egiz.bku.gui.BKUGUIFacade.Style;
 import at.gv.egiz.bku.gui.DefaultHelpListener;
 import at.gv.egiz.bku.gui.AbstractHelpListener;
 import at.gv.egiz.bku.gui.SwitchFocusListener;
+import at.gv.egiz.smcc.SignatureCardFactory;
 import at.gv.egiz.stal.service.translator.STALTranslator;
 
 import java.io.IOException;
@@ -71,6 +72,7 @@ public class BKUApplet extends JApplet {
   public static final String REDIRECT_URL = "RedirectURL";
   public static final String REDIRECT_TARGET = "RedirectTarget";
   public static final String HASHDATA_DISPLAY_FRAME = "frame";
+  public static final String ENFORCE_RECOMMENDED_PIN_LENGTH = "EnforceRecommendedPINLength";
   /**
    * STAL WSDL namespace and service name
    */
@@ -157,6 +159,11 @@ public class BKUApplet extends JApplet {
     log.trace("default locale: " + Locale.getDefault());
     log.debug("setting locale: " + getLocale());
 
+    if (Boolean.parseBoolean(getParameter(ENFORCE_RECOMMENDED_PIN_LENGTH))) {
+      SignatureCardFactory.ENFORCE_RECOMMENDED_PIN_LENGTH = true;
+      log.debug("enforce recommended pin length = " + SignatureCardFactory.ENFORCE_RECOMMENDED_PIN_LENGTH);
+    }
+    
     BKUGUIFacade.Style guiStyle;
     String guiStyleParam = getParameter(GUI_STYLE);
     if ("advanced".equals(guiStyleParam)) {
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 34f278fb..20fe4f56 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -593,7 +593,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
 
                 pinField = new JPasswordField();
                 pinField.setText("");
-                pinField.setDocument(new PINDocument(pinSpec, okButton));
+                pinField.setDocument(new PINDocument(pinSpec.getMinLength(), pinSpec.getMaxLength(), pinSpec.getRexepPattern(), okButton));
                 pinField.setActionCommand(okCommand);
                 pinField.addActionListener(new ActionListener() {
 
@@ -1031,7 +1031,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
 
                 pinField = new JPasswordField();
                 pinField.setText("");
-                pinField.setDocument(new PINDocument(pinSpec, signButton));
+                pinField.setDocument(new PINDocument(pinSpec.getMinLength(), pinSpec.getMaxLength(), pinSpec.getRexepPattern(), signButton));
                 pinField.setActionCommand(signCommand);
                 pinField.addActionListener(new ActionListener() {
 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
index 13aaf870..96032dc1 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
@@ -16,7 +16,6 @@
 */
 package at.gv.egiz.bku.gui;
 
-import at.gv.egiz.smcc.PINSpec;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.swing.JButton;
@@ -31,49 +30,60 @@ import javax.swing.text.PlainDocument;
  */
 class PINDocument extends PlainDocument {
 
-        protected PINSpec pinSpec;
-        protected Pattern pinPattern;
-        protected JButton enterButton;
-        protected Document compareTo;
-        protected Document oldPin;
+  private static final long serialVersionUID = 1L;
+  
+  protected Pattern pinPattern;
+  protected int minLength;
+  protected int maxLength;
 
-        public PINDocument(PINSpec pinSpec, JButton enterButton) {
-            this.pinSpec = pinSpec;
-            if (pinSpec.getRexepPattern() != null) {
-                pinPattern = Pattern.compile(pinSpec.getRexepPattern());
-            } else {
-                pinPattern = Pattern.compile(".");
-            }
-            this.enterButton = enterButton;
-        }
+  protected JButton enterButton;
+  protected Document compareTo;
+  protected Document oldPin;        
 
-        /**
-         *
-         * @param pinSpec
-         * @param enterButton 
-         * @param compareTo enable enterButton iff this pinDocument's pin equals to compareTo's pin. may be null
-         */
-        public PINDocument(PINSpec pinSpec, JButton enterButton, Document compareTo) {
-          this(pinSpec, enterButton);
-          this.compareTo = compareTo;
-        }
+  public PINDocument(int minLength, int maxLength, String pattern, JButton enterButton) {
+    if (pattern != null) {
+      pinPattern = Pattern.compile(pattern);
+    } else {
+      pinPattern = Pattern.compile(".");
+    }
+    this.minLength = minLength;
+    this.maxLength = maxLength;
+    this.enterButton = enterButton;
+  }
 
-        /**
-         *
-         * @param pinSpec
-         * @param enterButton may be null
-         * @param compareTo enable enterButton iff this pinDocument's pin equals to compareTo's pin. may be null
-         * @param oldPin enable enterButton iff oldPin meets the pinSpec pin length requirements, may be null
-         */
-        public PINDocument(PINSpec pinSpec, JButton enterButton, Document compareTo, Document oldPin) {
-          this(pinSpec, enterButton);
-          this.compareTo = compareTo;
-          this.oldPin = oldPin;
-        }
+  /**
+   * @param pinSpec
+   * @param enterButton
+   * @param compareTo
+   *          enable enterButton if this pinDocument's pin equals to
+   *          compareTo's pin. may be null
+   */
+  public PINDocument(int minLength, int maxLength, String pattern, JButton enterButton, Document compareTo) {
+    this(minLength, maxLength, pattern, enterButton);
+    this.compareTo = compareTo;
+  }
+
+  /**
+   * @param pinSpec
+   * @param enterButton
+   *          may be null
+   * @param compareTo
+   *          enable enterButton if this pinDocument's pin equals to
+   *          compareTo's pin. may be null
+   * @param oldPin
+   *          enable enterButton if oldPin meets the pinSpec pin length
+   *          requirements, may be null
+   */
+  public PINDocument(int minLength, int maxLength, String pattern,
+      JButton enterButton, Document compareTo, Document oldPin) {
+    this(minLength, maxLength, pattern, enterButton);
+    this.compareTo = compareTo;
+    this.oldPin = oldPin;
+  }
 
         @Override
         public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
-            if (pinSpec.getMaxLength() < 0 || pinSpec.getMaxLength() >= (getLength() + str.length())) {
+            if (maxLength < 0 || maxLength >= (getLength() + str.length())) {
                 boolean matches = true;
                 for (int i = 0; i < str.length(); i++) {
                     Matcher m = pinPattern.matcher(str.substring(i, i + 1));
@@ -87,8 +97,8 @@ class PINDocument extends PlainDocument {
             }
             if (enterButton != null) {
               enterButton.setEnabled(
-                      (oldPin == null || oldPin.getLength() >= pinSpec.getMinLength()) &&
-                      getLength() >= pinSpec.getMinLength() &&
+                      (oldPin == null || oldPin.getLength() >= minLength) &&
+                      getLength() >= minLength &&
                       compare());
             }
         }
@@ -98,8 +108,8 @@ class PINDocument extends PlainDocument {
             super.remove(offs, len);
             if (enterButton != null) {
               enterButton.setEnabled(
-                      (oldPin == null || oldPin.getLength() >= pinSpec.getMinLength()) &&
-                      getLength() >= pinSpec.getMinLength() &&
+                      (oldPin == null || oldPin.getLength() >= minLength) &&
+                      getLength() >= minLength &&
                       compare());
             }
         }
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index 22b9095c..ef643bfd 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -51,7 +51,7 @@ retries.pinpad=<html>Re-enter pin, {0} tries left</html>
 overwrite=<html>Overwrite {0}?</html>
 help=<html>Help topic {0}</html>
 
-warning.xhtml=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
+warning.xhtml=<html>Remark: This is a preview of the data to-be signed. For standards complaint display see help.</html>
 label.pin=<html>{0}:</html>
 label.pinsize=<html>({0} digits)</html>
 button.ok=OK
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
index 6699554e..5bbed096 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
@@ -436,14 +436,14 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                 });
 
                 if (type != DIALOG.VERIFY) {
-                  pinField.setDocument(new PINDocument(pinSpec, null));
+                  pinField.setDocument(
+                      new PINDocument(pinSpec.getRecMinLength(), pinSpec.getRecMaxLength(), pinSpec.getRexepPattern(), null));
                   repeatPinLabel = new JLabel();
                   repeatPinLabel.setFont(pinLabel.getFont());
                   String repeatPinLabelPattern = getMessage(LABEL_REPEAT_PIN);
                   repeatPinLabel.setText(MessageFormat.format(repeatPinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
 
                   repeatPinField.setText("");
-//                  repeatPinField.setDocument(new PINDocument(pinSpec, okButton, pinField.getDocument()));
                   repeatPinField.setActionCommand(okCommand);
                   repeatPinField.addActionListener(new ActionListener() {
 
@@ -463,7 +463,8 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
 
                     oldPinField = new JPasswordField();
                     oldPinField.setText("");
-                    oldPinField.setDocument(new PINDocument(pinSpec, null));
+                    oldPinField.setDocument(
+                        new PINDocument(pinSpec.getMinLength(), pinSpec.getMaxLength(), pinSpec.getRexepPattern(), null));
                     oldPinField.setActionCommand(okCommand);
                     oldPinField.addActionListener(new ActionListener() {
 
@@ -475,16 +476,18 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                         }
                     });
 
-                    repeatPinField.setDocument(new PINDocument(
-                            pinSpec, okButton,
-                            pinField.getDocument(), oldPinField.getDocument()));
+                    repeatPinField.setDocument(
+                        new PINDocument(pinSpec.getRecMinLength(), pinSpec.getRecMaxLength(), pinSpec.getRexepPattern(), 
+                            okButton, pinField.getDocument(), oldPinField.getDocument()));
                   } else {
                     // else -> ACTIVATE (not verify, not change)
-                    repeatPinField.setDocument(new PINDocument(
-                            pinSpec, okButton, pinField.getDocument()));
+                    repeatPinField.setDocument(
+                        new PINDocument(pinSpec.getRecMinLength(), pinSpec.getRecMaxLength(), pinSpec.getRexepPattern(), 
+                            okButton, pinField.getDocument()));
                   }
                 } else {
-                  pinField.setDocument(new PINDocument(pinSpec, okButton));
+                  pinField.setDocument(
+                      new PINDocument(pinSpec.getMinLength(), pinSpec.getMaxLength(), pinSpec.getRexepPattern(), okButton));
                 }
 
                 JLabel pinsizeLabel = new JLabel();
diff --git a/bkucommon/src/test/java/at/gv/egiz/bku/binding/SSLDataUrlConnectionTest.java b/bkucommon/src/test/java/at/gv/egiz/bku/binding/SSLDataUrlConnectionTest.java
index 407a556a..6cf0c9e7 100644
--- a/bkucommon/src/test/java/at/gv/egiz/bku/binding/SSLDataUrlConnectionTest.java
+++ b/bkucommon/src/test/java/at/gv/egiz/bku/binding/SSLDataUrlConnectionTest.java
@@ -21,12 +21,14 @@ import static org.junit.Assert.assertNotNull;
 import java.io.IOException;
 import java.net.URL;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 
 public class SSLDataUrlConnectionTest {
   
-  @Test
+  @Test
+  @Ignore
   public void testVerisign() throws IOException {
     URL url = new URL("https://www.verisign.com:443");
     DataUrlConnectionImpl uc = new DataUrlConnectionImpl();
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
index a63d4076..1ed5a177 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
@@ -116,6 +116,14 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
   private static final PINSpec INF_PIN_SPEC = new PINSpec(0, 8, "[0-9]",
       "at/gv/egiz/smcc/ACOSCard", "inf.pin", KID_PIN_INF, AID_DEC);
   
+  static {
+    if (SignatureCardFactory.ENFORCE_RECOMMENDED_PIN_LENGTH) {
+      DEC_PIN_SPEC.setRecLength(4);
+      SIG_PIN_SPEC.setRecLength(6);
+      INF_PIN_SPEC.setRecLength(4);
+    }
+  }
+  
   /**
    * The version of the card's digital signature application.
    */
@@ -390,10 +398,12 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
     
     MessageDigest md;
     try {
-      if ("http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1".equals(alg)) {
+      if (KeyboxName.SECURE_SIGNATURE_KEYPAIR.equals(keyboxName)
+          && (alg == null || "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1".equals(alg))) {
         dst.write((byte) 0x14); // SHA-1/ECC
         md = MessageDigest.getInstance("SHA-1");
-      } else if ("http://www.w3.org/2000/09/xmldsig#rsa-sha1".equals(alg)) {
+      } else if (KeyboxName.CERITIFIED_KEYPAIR.equals(keyboxName)
+          && (alg == null || "http://www.w3.org/2000/09/xmldsig#rsa-sha1".equals(alg))) {
         dst.write((byte) 0x12); // SHA-1 with padding according to PKCS#1 block type 01
         md = MessageDigest.getInstance("SHA-1");
       } else if (KeyboxName.SECURE_SIGNATURE_KEYPAIR.equals(keyboxName)
@@ -401,7 +411,7 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
           && "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256".equals(alg)) {
         dst.write((byte) 0x44); // SHA-256/ECC
         md = MessageDigest.getInstance("SHA256");
-      } else if (KeyboxName.SECURE_SIGNATURE_KEYPAIR.equals(keyboxName)
+      } else if (KeyboxName.CERITIFIED_KEYPAIR.equals(keyboxName)
           && appVersion >= 2
           && "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256".equals(alg)) {
         dst.write((byte) 0x41); // SHA-256 with padding according to PKCS#1
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/PINSpec.java b/smcc/src/main/java/at/gv/egiz/smcc/PINSpec.java
index 1812049c..f68edbed 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/PINSpec.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/PINSpec.java
@@ -17,6 +17,7 @@
 package at.gv.egiz.smcc;
 
 import java.util.Locale;
+import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 /**
@@ -25,113 +26,214 @@ import java.util.ResourceBundle;
  */
 public class PINSpec {
 
-    int minLength_ = 0;
+  /**
+   * The minimum PIN length.
+   */
+  protected int minLength = 0;
     
-    int maxLength_ = -1;
+  /**
+   * The maximum PIN length or -1 if not specified.
+   */
+  protected int maxLength = -1;
     
-    String rexepPattern_;
-    
-    String resourceBundleName_;
-    
-    String nameKey_;
-
-    /** the localized, i.e. configurable length */
-    String lengthKey_;
-
-    byte kid_;
-
-    byte[] context_aid_;
-
-    /**
-     *
-     * @param minLenght
-     * @param maxLength
-     * @param rexepPattern
-     * @param resourceBundle
-     * @param name
-     * @param kid the keyId for this pin
-     */
-    public PINSpec(int minLenght, int maxLength, String rexepPattern, 
-        String resourceBundleName, String resourceKey, byte kid, byte[] contextAID) {
-        
-        minLength_ = minLenght;
-        maxLength_ = maxLength;
-        rexepPattern_ = rexepPattern;
-        resourceBundleName_ = resourceBundleName;
-        nameKey_ = resourceKey + ".name";
-        lengthKey_ = resourceKey + ".length";
-        kid_ = kid;
-        context_aid_ = contextAID;
-    }
-
-    public PINSpec(int minLenght, int maxLength, String rexepPattern, 
-        String name, byte kid, byte[] contextAID) {
-        
-        minLength_ = minLenght;
-        maxLength_ = maxLength;
-        rexepPattern_ = rexepPattern;
-        nameKey_ = name + ".name";
-        lengthKey_ = name + ".length";
-        kid_ = kid;
-        context_aid_ = contextAID;
-    }
-    
-    public String getLocalizedName() {
-      
-      if (resourceBundleName_ != null) {
-        ResourceBundle resourceBundle = ResourceBundle.getBundle(resourceBundleName_);
-        return resourceBundle.getString(nameKey_);
-      } else {
-        return nameKey_;
+  /**
+   * The recommended PIN length or -1 if not specified.
+   */
+  protected int recLength = -1;
+  
+  /**
+   * The regular expression pattern of a single PIN digit or character.
+   */
+  protected String rexepPattern;
+  
+  /**
+   * The name of the corresponding resource bundle.
+   */
+  protected String resourceBundleName;
+   
+  /**
+   * The key of the PIN name in the resource bundle.
+   */
+  protected String nameKey;
+
+  /**
+   * The name of the PIN.
+   */
+  protected String name;
+  
+  /**
+   * The key id to be used in VERIFY or CHANGE REFERENCE DATA APDUs.
+   */
+  protected byte kid;
+
+  /**
+   * The context AID of the key id.
+   */
+  protected byte[] context_aid;
+
+  /**
+   * Creates a new instance of this PINSpec with the given lengths, regular
+   * expression pattern, the ResourceBundle name and key to lookup the PIN name
+   * and the KID and AID.
+   * 
+   * @param minLenght the minimum length of the PIN
+   * @param maxLength the maximum length of the PIN, or -1 if there is no maximum length
+   * @param rexepPattern the regular expression pattern of a single PIN digit or character
+   * @param resourceBundleName the name of a ResourceBundle for this PIN
+   * @param resourceKey the key to look up the (localized) name of this PIN
+   * @param kid the key id of the PIN
+   * @param contextAID the AID the KID is valid in
+   */
+  public PINSpec(int minLenght, int maxLength, String rexepPattern,
+      String resourceBundleName, String resourceKey, byte kid, byte[] contextAID) {
+
+    this.minLength = minLenght;
+    this.maxLength = maxLength;
+    this.rexepPattern = rexepPattern;
+    this.resourceBundleName = resourceBundleName;
+    this.nameKey = resourceKey + ".name";
+    this.kid = kid;
+    this.context_aid = contextAID;
+  }
+
+  /**
+   * Creates a new instance of this PINSpec with the given lengths, regular 
+   * expression pattern, the name of the PIN and the KID and AID.
+   * 
+   * @param minLenght the minimum length of the PIN
+   * @param maxLength the maximum length of the PIN, or -1 if there is no maximum length
+   * @param rexepPattern the regular expression pattern of a single PIN digit or character
+   * @param name the name of the PIN
+   * @param kid the key id of the PIN
+   * @param contextAID the AID the KID is valid in
+   */
+  public PINSpec(int minLenght, int maxLength, String rexepPattern,
+      String name, byte kid, byte[] contextAID) {
+
+    this.minLength = minLenght;
+    this.maxLength = maxLength;
+    this.rexepPattern = rexepPattern;
+    this.name = name;
+    this.kid = kid;
+    this.context_aid = contextAID;
+  }
+
+  /**
+   * This method sets the recommended PIN length.
+   * 
+   * @param recLength the recommended PIN length
+   */
+  public void setRecLength(int recLength) {
+    this.recLength = recLength;
+  }
+
+  /**
+   * @return the localized (using the default locale) name of the PIN, or the
+   *         name set by
+   *         {@link #PINSpec(int, int, String, String, byte, byte[])}.
+   */
+  public String getLocalizedName() {
+    if (name != null) {
+      return name;
+    } else if (resourceBundleName != null){
+      try {
+        return ResourceBundle.getBundle(resourceBundleName).getString(nameKey);
+      } catch (MissingResourceException e) {
       }
-        
     }
-    
-    public String getLocalizedName(Locale locale) {
-      
-      if (resourceBundleName_ != null) {
-        ResourceBundle resourceBundle = ResourceBundle.getBundle(resourceBundleName_, locale);
-        return resourceBundle.getString(nameKey_);
-      } else {
-        return nameKey_;
+    return nameKey;
+  }
+
+  /**
+   * @param locale the locale for which the name should be returned
+   * @return the localized name of the PIN, or the name set by
+   *         {@link #PINSpec(int, int, String, String, byte, byte[])}
+   */
+  public String getLocalizedName(Locale locale) {
+    if (name != null) {
+      return name;
+    } else if (resourceBundleName != null) {
+      try {
+        return ResourceBundle.getBundle(resourceBundleName, locale).getString(nameKey);
+      } catch (MissingResourceException e) {
       }
-      
-    }
-
-    public String getLocalizedLength() {
-
-      if (resourceBundleName_ != null) {
-        ResourceBundle resourceBundle = ResourceBundle.getBundle(resourceBundleName_);
-        return resourceBundle.getString(lengthKey_);
-      } else {
-        if (maxLength_ > minLength_) {
-          return minLength_ + "-" + maxLength_;
-        } else {
-          return String.valueOf(minLength_);
-        }
-      }
-
     }
-
-    public int getMaxLength() {
-        return maxLength_;
-    }
-
-    public int getMinLength() {
-        return minLength_;
-    }
-
-    public String getRexepPattern() {
-        return rexepPattern_;
-    }
-
-    public byte getKID() {
-      return kid_;
+    return nameKey;
+  }
+
+  /**
+   * @return the recommended PIN length if specified and
+   *         <code>recommended</code> is <code>true</code>, or
+   *         <code>minLength</code>-<code>maxLength</code>
+   */
+  public String getLocalizedLength() {
+    
+    if (recLength > 0) {
+      return "" + recLength;
+    } else if (maxLength == minLength) {
+      return "" + minLength;
+    } else if (maxLength > minLength) {
+      return minLength + "-" + maxLength;
+    } else {
+      return minLength + "+";
     }
 
-    public byte[] getContextAID() {
-      return context_aid_;
-    }
-    
+  }
+
+  /**
+   * @return the minimum length of the PIN
+   */
+  public int getMinLength() {
+    return minLength;
+  }
+
+  /**
+   * @return the maximum length of the PIN, or -1 if not specified.
+   */
+  public int getMaxLength() {
+    return maxLength;
+  }
+
+  /**
+   * @return the minimum length of the PIN
+   */
+  public int getRecMinLength() {
+    return (recLength >= minLength) ? recLength : minLength;
+  }
+
+  /**
+   * @return the maximum length of the PIN
+   */
+  public int getRecMaxLength() {
+    return (recLength >= minLength) ? recLength : maxLength;
+  }
+  
+  /**
+   * @return the recommended length of the PIN, or -1 if not specified
+   */
+  public int getRecLength() {
+    return recLength;
+  }
+
+  /**
+   * @return the regular expression pattern of one single digit or character
+   */
+  public String getRexepPattern() {
+    return rexepPattern;
+  }
+
+  /**
+   * @return the key id of the PIN
+   */
+  public byte getKID() {
+    return kid;
+  }
+
+  /**
+   * @return the AID the KID is valid in, or <code>null</code> if KID is global
+   */
+  public byte[] getContextAID() {
+    return context_aid;
+  }
     
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
index 01de8a77..880cab4b 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
@@ -137,6 +137,13 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
     new PINSpec(6, 12, "[0-9]", 
         "at/gv/egiz/smcc/STARCOSCard", "sig.pin", KID_PIN_SS, AID_DF_SS);
   
+  static {
+    if (SignatureCardFactory.ENFORCE_RECOMMENDED_PIN_LENGTH) {
+      CARD_PIN_SPEC.setRecLength(4);
+      SS_PIN_SPEC.setRecLength(6);
+    }
+  }
+  
   protected double version = 1.1;
 
   /**
@@ -301,7 +308,7 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
     
     MessageDigest md = null;
     try {
-      if (version < 1.2 && "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1".equals(alg)) {
+      if (version < 1.2 && (alg == null || "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1".equals(alg))) {
         // local key ID '02' version '00'
         dst.write(new byte[] {(byte) 0x84, (byte) 0x03, (byte) 0x80, (byte) 0x02, (byte) 0x00});
         // algorithm ID ECDSA with SHA-1
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java
index 47053f98..405da7c0 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCardFactory.java
@@ -32,6 +32,8 @@ import org.apache.commons.logging.LogFactory;
  * A factory for creating {@link SignatureCard}s from {@link Card}s. 
  */
 public class SignatureCardFactory {
+
+  public static boolean ENFORCE_RECOMMENDED_PIN_LENGTH = false;
   
   /**
    * This class represents a supported smart card. 
-- 
cgit v1.2.3


From 1b6da29d3871b51daa2a6dff9bb85c84cb8d3093 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 13 Nov 2009 14:49:40 +0000
Subject: standards-compliant

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@545 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index ef643bfd..109b4faa 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -20,6 +20,7 @@ title.cardnotsupported=<html>This card is not supported</html>
 title.cardpin=<html>Reading card</html>
 title.sign=<html>Create signature</html>
 title.error=<html>Error</html>
+title.warning=<html>Warning
 title.entry.timeout=<html>Timeout</html>
 title.retry=<html>Wrong PIN</html>
 title.wait=<html>Please wait</html>
@@ -44,6 +45,8 @@ hashdatalink.focus=<html><a href=\"anzeige\">[Display signature data]</a></html>
 hashdatalink.tiny.focus=<html><a href=\"anzeige\">[signature data]</a></html>
 #message.hashdata=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
 hashdatalist=<html>{0} signature data objects:</html>
+hashdata.viewer=<html>Signature data is being displayed in viewer
+unsupported.mimetype=<html>Signature data cannot be displayed
 retries.last=<html>Last try!</html>
 retries=<html>{0} tries left</html>
 retries.pinpad.last=<html>Re-enter pin, last try!</html>
@@ -51,7 +54,7 @@ retries.pinpad=<html>Re-enter pin, {0} tries left</html>
 overwrite=<html>Overwrite {0}?</html>
 help=<html>Help topic {0}</html>
 
-warning.xhtml=<html>Remark: This is a preview of the data to-be signed. For standards complaint display see help.</html>
+warning.xhtml=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
 label.pin=<html>{0}:</html>
 label.pinsize=<html>({0} digits)</html>
 button.ok=OK
@@ -66,6 +69,7 @@ mimetype.desc.xhtml=XHTML-files (.xhtml)
 mimetype.desc.txt=Textfiles (.txt)
 mimetype.desc.pdf=Adobe PDF-files (.pdf)
 mimetype.desc.bin=Binary files (.bin)
+mimetype.desc.unknown=All files (.*)
 save.hashdatainput.prefix=signaturedata
 alt.help=help
 
-- 
cgit v1.2.3


From b7dd29046e232e4d42623655efc28965cce942b8 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 13 Nov 2009 15:13:21 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@546
 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

---
 .../egiz/bku/online/applet/AppletSecureViewer.java |   4 +-
 BKUApplet/src/test/resources/DejaVuLGCSansMono.ttf | Bin 0 -> 282704 bytes
 BKUApplet/src/test/resources/appletTest.html       |   6 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |   5 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 318 +++++++++++----------
 .../main/java/at/gv/egiz/bku/gui/MimeFilter.java   | 110 -------
 .../at/gv/egiz/bku/gui/SecureViewerDialog.java     | 146 ++++------
 .../java/at/gv/egiz/bku/gui/viewer/MimeFilter.java | 115 ++++++++
 .../bku/gui/viewer/SecureViewerSaveDialog.java     | 120 ++++++++
 .../at/gv/egiz/bku/gui/Messages.properties         |   4 +
 .../at/gv/egiz/bku/gui/Messages_en.properties      |   2 +-
 .../at/gv/egiz/bku/gui/SecureViewerDialogTest.java |   4 +-
 .../webapp/help/de/help.unsupported.mimetype.html  |  41 +++
 .../gv/egiz/stal/service/impl/STALServiceImpl.java | 258 +++++++++--------
 .../egiz/stal/service/impl/TestSignatureData.java  |  47 +++
 .../egiz/bku/slcommands/impl/xsect/DataObject.java |   3 +-
 16 files changed, 694 insertions(+), 489 deletions(-)
 create mode 100644 BKUApplet/src/test/resources/DejaVuLGCSansMono.ttf
 delete mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/MimeFilter.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeFilter.java
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/SecureViewerSaveDialog.java
 create mode 100644 BKUHelp/src/main/webapp/help/de/help.unsupported.mimetype.html
 create mode 100644 BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/TestSignatureData.java

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java
index 929cecb1..2e0cb331 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java
@@ -185,13 +185,13 @@ public class AppletSecureViewer implements SecureViewer {
           throw new Exception("No hashdata input for reference " + signedRefId + " provided by service");
         }
         if (log.isDebugEnabled()) {
-          log.debug("Got HashDataInput " + signedRefId + " (" + mimeType + ";" + encoding + ")");
+          log.debug("Digesting reference " + signedRefId + " (" + mimeType + ";" + encoding + ")");
         }
 
         byte[] hashDataInputDigest = digest(hdi, signedDigestAlg);
 
         if (log.isDebugEnabled()) {
-          log.debug("Comparing digest values... ");
+          log.debug("Comparing digest to claimed digest value for reference " + signedRefId);
         }
 //        log.warn("***************** DISABLED HASHDATA VERIFICATION");
         if (!Arrays.equals(hashDataInputDigest, signedDigest)) {
diff --git a/BKUApplet/src/test/resources/DejaVuLGCSansMono.ttf b/BKUApplet/src/test/resources/DejaVuLGCSansMono.ttf
new file mode 100644
index 00000000..21647753
Binary files /dev/null and b/BKUApplet/src/test/resources/DejaVuLGCSansMono.ttf differ
diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html
index 85834763..22495a32 100644
--- a/BKUApplet/src/test/resources/appletTest.html
+++ b/BKUApplet/src/test/resources/appletTest.html
@@ -21,7 +21,7 @@
     <link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon">
   </head>
   <body>
-  	<p>Run applet test with appletviewer -J-Djava.security.policy=appletviewer.policy appletTest.html</p>
+  	<p>Run applet test with appletviewer (-J-d32) -J-Djava.security.policy=appletviewer.policy appletTest.html</p>
     <applet code="at.gv.egiz.bku.online.applet.BKUApplet.class"
             archive="../BKUApplet-1.2.8-SNAPSHOT.jar, commons-logging.jar , iaik_jce_me4se.jar"
             width=190 height=130 name="moccaapplet" id="moccaapplet">
@@ -30,8 +30,8 @@
       <!--param name="Background" value="jar:file:/home/clemens/workspace/mocca/BKUApplet/target/BKUApplet-1.0-SNAPSHOT.jar!/images/help.png"/-->
       <!--param name="Background" value="http://localhost:3495/img/BackgroundChipperling.png"/-->
       <param name="BackgroundColor" value="#ff0000"/>
-      <param name="WSDL_URL" value="https://localhost:8080/stal?wsdl"/>
-      <param name="HelpURL" value="http://apps.egiz.gv.at/bkuonline/help/"/>
+      <param name="WSDL_URL" value="http://localhost:8080/BKUOnline/stal?wsdl"/>
+      <param name="HelpURL" value="http://localhost:8080/BKUOnline/help/"/>
       <param name="SessionId" value="TestSession"/>
       <param name="RedirectURL" value="http://www.google.com/bkuResult"/>
       <param name="RedirectTarget" value="_parent"/>
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index e4af6443..91c91dcb 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -46,7 +46,7 @@ public interface BKUGUIFacade {
   public static final String DEFAULT_BACKGROUND = "/at/gv/egiz/bku/gui/chip32.png";
   public static final String DEFAULT_ICON = "/at/gv/egiz/bku/gui/chiperling105.png";
   public static final String HELP_IMG = "/at/gv/egiz/bku/gui/help.png";
-  public static final String HELP_IMG_FOCUS = "/at/gv/egiz/bku/gui/help_focus.png";
+  public static final String HELP_IMG_FOCUS = "/at/gv/egiz/bku/gui/help.png"; //help_focus.png";
   public static final String HASHDATA_FONT = "Monospaced";
   public static final Color ERROR_COLOR = Color.RED;
   public static final Color HYPERLINK_COLOR = Color.BLUE;
@@ -56,6 +56,7 @@ public interface BKUGUIFacade {
   public static final String TITLE_CARDPIN = "title.cardpin";
   public static final String TITLE_SIGN = "title.sign";
   public static final String TITLE_ERROR = "title.error";
+  public static final String TITLE_WARNING = "title.warning";
   public static final String TITLE_ENTRY_TIMEOUT = "title.entry.timeout";
   public static final String TITLE_RETRY = "title.retry";
   public static final String TITLE_WAIT = "title.wait";
@@ -79,6 +80,8 @@ public interface BKUGUIFacade {
   public static final String MESSAGE_HASHDATALINK_FOCUS = "hashdatalink.focus";
   public static final String MESSAGE_HASHDATALINK_TINY_FOCUS = "hashdatalink.tiny.focus";
   public static final String MESSAGE_HASHDATALIST = "hashdatalist";
+  public static final String MESSAGE_HASHDATA_VIEWER = "hashdata.viewer";
+  public static final String MESSAGE_UNSUPPORTED_MIMETYPE = "unsupported.mimetype";
   public static final String MESSAGE_RETRIES = "retries";
   public static final String MESSAGE_LAST_RETRY = "retries.last";
   public static final String MESSAGE_RETRIES_PINPAD = "retries.pinpad";
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 20fe4f56..baffb3fd 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -19,6 +19,7 @@ package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.bku.gui.viewer.FontProviderException;
 import at.gv.egiz.bku.gui.viewer.FontProvider;
+import at.gv.egiz.bku.gui.viewer.SecureViewerSaveDialog;
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.stal.HashDataInput;
 import java.awt.Color;
@@ -1384,26 +1385,34 @@ public class BKUGUIImpl implements BKUGUIFacade {
                 new Object[] {"no signature data provided"},
                 backListener, backCommand);
       } else if (dataToBeSigned.size() == 1) {
-        try {
-          log.debug("[" + Thread.currentThread().getName() + "] scheduling secure viewer");
-
-          SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-              try {
-                showSecureViewer(dataToBeSigned.get(0));
-              } catch (FontProviderException ex) {
-                log.error("failed to display secure viewer", ex);
-                showErrorDialog(ERR_VIEWER, new Object[] {ex.getMessage()}, backListener, backCommand);
+        //TODO pull out (see also SignedReferencesSelectionListener)
+        if (SecureViewerDialog.SUPPORTED_MIME_TYPES.contains(dataToBeSigned.get(0).getMimeType())) {
+          try {
+            log.debug("[" + Thread.currentThread().getName() + "] scheduling secure viewer");
+  
+            SwingUtilities.invokeLater(new Runnable() {
+  
+              @Override
+              public void run() {
+                try {
+                  showMessageDialog(TITLE_HASHDATA, MESSAGE_HASHDATA_VIEWER);
+                  showSecureViewer(dataToBeSigned.get(0), backListener, backCommand);
+                } catch (FontProviderException ex) {
+                  log.error("failed to display secure viewer", ex);
+                  showErrorDialog(ERR_VIEWER, new Object[] {ex.getMessage()}, backListener, backCommand);
+                }
               }
-            }
-          });
-       
-        } catch (Exception ex) { //InterruptedException InvocationTargetException
-          log.error("Failed to display secure viewer: " + ex.getMessage());
-          log.trace(ex);
-          showErrorDialog(ERR_UNKNOWN, null, backListener, backCommand);
+            });
+         
+          } catch (Exception ex) { //InterruptedException InvocationTargetException
+            log.error("Failed to display secure viewer: " + ex.getMessage());
+            log.trace(ex);
+            showErrorDialog(ERR_UNKNOWN, null, backListener, backCommand);
+          }
+        } else {
+          log.debug("[" + Thread.currentThread().getName() + "] mime-type not supported by secure viewer, scheduling save dialog");
+          showMessageDialog(TITLE_HASHDATA, MESSAGE_UNSUPPORTED_MIMETYPE);
+          SecureViewerSaveDialog.showSaveDialog(dataToBeSigned.get(0), messages, backListener, backCommand); 
         }
       } else {
         showSignedReferencesListDialog(dataToBeSigned, backListener, backCommand);
@@ -1412,30 +1421,48 @@ public class BKUGUIImpl implements BKUGUIFacade {
     
     /**
      * has to be called from event dispatcher thread
-     * This method blocks until the dialog's close button is pressed.
      * @param hashDataText
      * @param saveListener
      * @param saveCommand
      */
-    private void showSecureViewer(HashDataInput dataToBeSigned) throws FontProviderException {
+//    private void showSecureViewer(HashDataInput dataToBeSigned) throws FontProviderException {
+//      
+//      log.debug("[" + Thread.currentThread().getName() + "] show secure viewer");
+//      if (secureViewer == null) {
+//        secureViewer = new SecureViewerDialog(null, messages,
+//                fontProvider, helpMouseListener.getActionListener());
+//
+//        // workaround for [#439]
+//        // avoid AlwaysOnTop at least in applet, otherwise make secureViewer AlwaysOnTop since MOCCA Dialog (JFrame created in LocalSTALFactory) is always on top.
+//        Window window = SwingUtilities.getWindowAncestor(contentPane);
+//        if (window != null && window.isAlwaysOnTop()) {
+//          log.debug("make secureViewer alwaysOnTop");
+//          secureViewer.setAlwaysOnTop(true);
+//        }
+//      }
+//      secureViewer.setContent(dataToBeSigned);
+//      log.trace("show secure viewer returned");
+//    }
+    private void showSecureViewer(HashDataInput dataToBeSigned, ActionListener closeListener, String closeCommand) throws FontProviderException {
       
       log.debug("[" + Thread.currentThread().getName() + "] show secure viewer");
-      if (secureViewer == null) {
-        secureViewer = new SecureViewerDialog(null, messages,
-                fontProvider, helpMouseListener.getActionListener());
-
-        // workaround for [#439]
-        // avoid AlwaysOnTop at least in applet, otherwise make secureViewer AlwaysOnTop since MOCCA Dialog (JFrame created in LocalSTALFactory) is always on top.
-        Window window = SwingUtilities.getWindowAncestor(contentPane);
-        if (window != null && window.isAlwaysOnTop()) {
-          log.debug("make secureViewer alwaysOnTop");
-          secureViewer.setAlwaysOnTop(true);
-        }
+      SecureViewerDialog secureViewer = new SecureViewerDialog(null, messages,
+          closeListener, closeCommand,
+            fontProvider, helpMouseListener.getActionListener());
+        
+      // workaround for [#439]
+      // avoid AlwaysOnTop at least in applet, otherwise make secureViewer AlwaysOnTop since MOCCA Dialog (JFrame created in LocalSTALFactory) is always on top.
+      Window window = SwingUtilities.getWindowAncestor(contentPane);
+      if (window != null && window.isAlwaysOnTop()) {
+        log.debug("make secureViewer alwaysOnTop");
+        secureViewer.setAlwaysOnTop(true);
       }
       secureViewer.setContent(dataToBeSigned);
-      log.trace("show secure viewer returned");
+      log.trace("viewer setContent returned");
     }
     
+    
+    
     private void showSignedReferencesListDialog(final List<HashDataInput> signedReferences,
             final ActionListener backListener, final String backCommand) {
       
@@ -1468,44 +1495,10 @@ public class BKUGUIImpl implements BKUGUIFacade {
           hashDataTable.setDefaultRenderer(HashDataInput.class, new HyperlinkRenderer(renderRefId));
           hashDataTable.setTableHeader(null);
           
-          // not possible to add mouse listener to TableCellRenderer
-          hashDataTable.addMouseMotionListener(new MouseMotionAdapter() {
-
-            @Override
-            public void mouseMoved(MouseEvent e) {
-              if (hashDataTable.columnAtPoint(e.getPoint()) == 0) {
-                hashDataTable.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-              } else {
-                hashDataTable.setCursor(Cursor.getDefaultCursor());
-              }
-            }
-          });
+          hashDataTable.addMouseMotionListener(new SignedReferencesMouseMotionListener(hashDataTable));
           
           hashDataTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-          hashDataTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-
-            @Override
-            public void valueChanged(final ListSelectionEvent e) {
-              //invoke later to allow thread to paint selection background
-              SwingUtilities.invokeLater(new Runnable() {
-
-                @Override
-                public void run() {
-                  ListSelectionModel lsm = (ListSelectionModel) e.getSource();
-                  int selectionIdx = lsm.getMinSelectionIndex();
-                  if (selectionIdx >= 0) {
-                    final HashDataInput selection = signedReferences.get(selectionIdx);
-                    try {
-                      showSecureViewer(selection);
-                    } catch (FontProviderException ex) {
-                      log.error("failed to display secure viewer", ex);
-                      showErrorDialog(ERR_VIEWER, new Object[] {ex.getMessage()}, backListener, backCommand);
-                    }
-                  }
-                }
-              });
-            }
-          });
+          hashDataTable.getSelectionModel().addListSelectionListener(new SignedReferencesSelectionListener(signedReferences, backListener, backCommand));
           
           JScrollPane hashDataScrollPane = new JScrollPane(hashDataTable);
 
@@ -1560,97 +1553,106 @@ public class BKUGUIImpl implements BKUGUIFacade {
       });
     }
     
+   
+    
     /**
-     * @param okListener may be null
+     * not possible to add mouse listener to TableCellRenderer
+     * to change cursor on specific columns only, use table.columnAtPoint(e.getPoint()) 
+     *
      */
-//    private void showSaveDialog(final List<HashDataInput> signedRefs,
-//            final ActionListener okListener, final String okCommand) {
-//
-//      log.debug("scheduling save dialog");
-//
-//      SwingUtilities.invokeLater(new Runnable() {
-//
-//        @Override
-//        public void run() {
-//
-//          log.debug("show save dialog");
-//
-//          String userHome = System.getProperty("user.home");
-//
-//          JFileChooser fileDialog = new JFileChooser(userHome);
-//          fileDialog.setMultiSelectionEnabled(false);
-//          fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
-//          fileDialog.setFileHidingEnabled(true);
-//          if (signedRefs.size() == 1) {
-//            fileDialog.setDialogTitle(getMessage(WINDOWTITLE_SAVE));
-//            fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
-//            String mimeType = signedRefs.get(0).getMimeType();
-//            MimeFilter mimeFilter = new MimeFilter(mimeType, messages);
-//            fileDialog.setFileFilter(mimeFilter);
-//            String filename = getMessage(SAVE_HASHDATAINPUT_PREFIX) + MimeFilter.getExtension(mimeType);
-//            fileDialog.setSelectedFile(new File(userHome, filename));
-//          } else {
-//            fileDialog.setDialogTitle(getMessage(WINDOWTITLE_SAVEDIR));
-//            fileDialog.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-//          }
-//
-//          //parent contentPane -> placed over applet
-//          switch (fileDialog.showSaveDialog(fileDialog)) {
-//            case JFileChooser.APPROVE_OPTION:
-//              File f = fileDialog.getSelectedFile();
-//              for (HashDataInput hashDataInput : signedRefs) {
-//                String mimeType = hashDataInput.getMimeType();
-//                String id = hashDataInput.getReferenceId();
-//                File file;
-//                if (f.isDirectory()) {
-//                  String filename = getMessage(SAVE_HASHDATAINPUT_PREFIX) + '_' + id + MimeFilter.getExtension(mimeType);
-//                  file = new File(f, filename);
-//                } else {
-//                  file = f;
-//                }
-//                if (file.exists()) {
-//                  String ovrwrt = getMessage(MESSAGE_OVERWRITE);
-//                  int overwrite = JOptionPane.showConfirmDialog(fileDialog, MessageFormat.format(ovrwrt, file), getMessage(WINDOWTITLE_OVERWRITE), JOptionPane.OK_CANCEL_OPTION);
-//                  if (overwrite != JOptionPane.OK_OPTION) {
-//                    continue;
-//                  }
-//                }
-//                if (log.isDebugEnabled()) {
-//                    log.debug("writing hashdata input " + id + " (" + mimeType + ") to file " + file);
-//                }
-//                FileOutputStream fos = null;
-//                try {
-//                    fos = new FileOutputStream(file);
-//                    BufferedOutputStream bos = new BufferedOutputStream(fos);
-//                    InputStream hdi = hashDataInput.getHashDataInput();
-//                    int b;
-//                    while ((b = hdi.read()) != -1) {
-//                        bos.write(b);
-//                    }
-//                    bos.flush();
-//                    bos.close();
-//                } catch (IOException ex) {
-//                    log.error("Failed to write " + file + ": " + ex.getMessage());
-//                    showErrorDialog(ERR_WRITE_HASHDATA, new Object[] {ex.getMessage()}, null, null);
-//                    ex.printStackTrace();
-//                } finally {
-//                    try {
-//                        fos.close();
-//                    } catch (IOException ex) {
-//                    }
-//                }
-//              }
-//              break;
-//            case JFileChooser.CANCEL_OPTION :
-//              log.debug("cancelled save dialog");
-//              break;
-//          }
-//          if (okListener != null) {
-//            okListener.actionPerformed(new ActionEvent(fileDialog, ActionEvent.ACTION_PERFORMED, okCommand));
-//          }
-//        }
-//      });
-//    }
+    private class SignedReferencesMouseMotionListener extends MouseMotionAdapter {
+
+      JTable hashDataTable;
+      
+      public SignedReferencesMouseMotionListener(JTable table) {
+        this.hashDataTable = table;
+      }
+      
+      @Override
+      public void mouseMoved(MouseEvent e) {
+//        if (hashDataTable.columnAtPoint(e.getPoint()) == 0) {
+          hashDataTable.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+      }
+    }
+    
+    ///////////
+    // SignedReferencesList (TODO pull out)
+    
+    public class SignedReferencesSelectionListener implements ListSelectionListener {
+      
+      List<HashDataInput> signedReferences;
+      ActionListener backListener;
+      String backCommand;
+      
+      public SignedReferencesSelectionListener(List<HashDataInput> signedReferences, ActionListener backListener, String backCommand) {
+        this.signedReferences = signedReferences;
+        this.backListener = backListener;
+        this.backCommand = backCommand;
+      }
+      
+      @Override
+      public void valueChanged(ListSelectionEvent event) {
+        
+        if (event.getValueIsAdjusting()) {
+          return;
+        }
+        
+        ListSelectionModel lsm = (ListSelectionModel) event.getSource();
+        int selectionIdx = lsm.getMinSelectionIndex();
+
+        log.debug("[" + Thread.currentThread().getName() + "] reference " + selectionIdx + " selected");
+        
+        if (selectionIdx >= 0) {
+          final HashDataInput selection = signedReferences.get(selectionIdx);
+          final SignedReferencesListDisplayer backToListListener = new SignedReferencesListDisplayer(signedReferences, backListener, backCommand);
+          
+          if (SecureViewerDialog.SUPPORTED_MIME_TYPES.contains(selection.getMimeType())) {
+            log.debug("[" + Thread.currentThread().getName() + "] scheduling secure viewer dialog");
+            SwingUtilities.invokeLater(new Runnable() {
+              
+              @Override
+              public void run() {
+                try {
+                  showMessageDialog(TITLE_HASHDATA, MESSAGE_HASHDATA_VIEWER);
+                  showSecureViewer(selection, backToListListener, null);
+//                  SecureViewerDialog.showSecureViewer(selection, messages, fontProvider, helpMouseListener.getActionListener(), false);
+                } catch (FontProviderException ex) {
+                  log.error("failed to display secure viewer", ex);
+                  showErrorDialog(BKUGUIFacade.ERR_VIEWER, new Object[] {ex.getMessage()}, backToListListener, null);
+                }
+                
+              }
+            });
+          } else {
+            log.debug("[" + Thread.currentThread().getName() + "] mime-type not supported by secure viewer, scheduling save dialog");
+            showMessageDialog(BKUGUIFacade.TITLE_HASHDATA, BKUGUIFacade.MESSAGE_UNSUPPORTED_MIMETYPE);
+            SecureViewerSaveDialog.showSaveDialog(selection, messages, backToListListener, null);
+          }
+        }
+      }
+      
+      /**
+       * ActionListener that returns to signed references list 
+       */
+      private class SignedReferencesListDisplayer implements ActionListener {
+        List<HashDataInput> sr;
+        ActionListener bl;
+        String bc;
+        
+        public SignedReferencesListDisplayer(List<HashDataInput> signedReferences, ActionListener backListener, String backCommand) {
+          sr = signedReferences;
+          bl = backListener;
+          bc = backCommand;
+        }
+        
+        @Override
+        public void actionPerformed(ActionEvent e) {
+//          log.debug("[" + Thread.currentThread().getName() + "] displaying signed references list");
+          showSignedReferencesListDialog(sr, bl, bc); 
+        }
+      }
+    }
+
 
     ////////////////////////////////////////////////////////////////////////////
     // UTILITY METHODS
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/MimeFilter.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/MimeFilter.java
deleted file mode 100644
index 4b48081a..00000000
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/MimeFilter.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-* 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.
-*/
-package at.gv.egiz.bku.gui;
-
-import java.io.File;
-import java.util.ResourceBundle;
-import javax.swing.filechooser.FileFilter;
-
-/**
- *
- * @author clemens
- */
-class MimeFilter extends FileFilter {
-
-  private static final String MIMETYPE_DESC_XML = "mimetype.desc.xml";
-  private static final String MIMETYPE_DESC_HTML = "mimetype.desc.html";
-  private static final String MIMETYPE_DESC_XHTML = "mimetype.desc.xhtml";
-  private static final String MIMETYPE_DESC_TXT = "mimetype.desc.txt";
-  private static final String MIMETYPE_DESC_PDF = "mimetype.desc.pdf";
-  private static final String MIMETYPE_DESC_BIN = "mimetype.desc.bin";
-
-  protected String mimeType;
-  protected ResourceBundle messages;
-
-  public MimeFilter(String mimeType, ResourceBundle messages) {
-    this.mimeType = mimeType;
-    this.messages = messages;
-  }
-
-  @Override
-  public boolean accept(File f) {
-
-    if (f.isDirectory()) {
-      return true;
-    }
-
-    String ext = getExtension(f);
-    if ("text/xml".equals(mimeType)) {
-      return "xml".equalsIgnoreCase(ext);
-    } else if ("text/html".equals(mimeType)) {
-      return "html".equalsIgnoreCase(ext) || "htm".equalsIgnoreCase(ext);
-    } else if ("application/xhtml+xml".equals(mimeType)) {
-      return "xhtml".equalsIgnoreCase(ext);
-    } else if ("text/plain".equals(mimeType)) {
-      return "txt".equalsIgnoreCase(ext);
-    } else if ("application/pdf".equals(mimeType)) {
-      return "pdf".equalsIgnoreCase(ext);
-    } else {
-      return true;
-    }
-  }
-
-  private String getExtension(File f) {
-    String ext = null;
-    String s = f.getName();
-    int i = s.lastIndexOf('.');
-
-    if (i > 0 && i < s.length() - 1) {
-      ext = s.substring(i + 1).toLowerCase();
-    }
-    return ext;
-  }
-
-  @Override
-  public String getDescription() {
-    if ("text/xml".equals(mimeType)) {
-      return messages.getString(MIMETYPE_DESC_XML);
-    } else if ("text/html".equals(mimeType)) {
-      return messages.getString(MIMETYPE_DESC_HTML);
-    } else if ("application/xhtml+xml".equals(mimeType)) {
-      return messages.getString(MIMETYPE_DESC_XHTML);
-    } else if ("text/plain".equals(mimeType)) {
-      return messages.getString(MIMETYPE_DESC_TXT);
-    } else if ("application/pdf".equals(mimeType)) {
-      return messages.getString(MIMETYPE_DESC_PDF);
-    } else {
-      return messages.getString(MIMETYPE_DESC_BIN);
-    }
-  }
-
-  public static String getExtension(String mimeType) {
-    if ("text/xml".equals(mimeType)) {
-      return ".xml";
-    } else if ("text/html".equals(mimeType)) {
-      return ".html";
-    } else if ("application/xhtml+xml".equals(mimeType)) {
-      return ".xhtml";
-    } else if ("text/plain".equals(mimeType)) {
-      return ".txt";
-    } else if ("application/pdf".equals(mimeType)) {
-      return ".pdf";
-    } else {
-      return ".bin";
-    }
-  }
-}
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
index 878a998b..7bae4673 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
@@ -17,12 +17,15 @@
 package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.bku.gui.viewer.FontProvider;
+import at.gv.egiz.bku.gui.viewer.FontProviderException;
+import at.gv.egiz.bku.gui.viewer.SecureViewerSaveDialog;
 import at.gv.egiz.stal.HashDataInput;
 import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Frame;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusAdapter;
@@ -41,6 +44,9 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.Charset;
 import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
 import java.util.ResourceBundle;
 import javax.swing.GroupLayout;
 import javax.swing.ImageIcon;
@@ -72,6 +78,12 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
    * BKUViewer has compile dependency BKUFonts, transitive in BKUOnline and BKULocal
    */
   public static final Dimension VIEWER_DIMENSION = new Dimension(600, 400);
+  
+  public static final List<String> SUPPORTED_MIME_TYPES = new ArrayList<String>();
+  static {
+    SUPPORTED_MIME_TYPES.add("text/plain");
+    SUPPORTED_MIME_TYPES.add("application/xhtml+xml");
+  }
   protected static final Log log = LogFactory.getLog(SecureViewerDialog.class);
 //  private static SecureViewerDialog dialog;
   protected ResourceBundle messages;
@@ -102,7 +114,7 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
 //    dialog.setVisible(true);
 //  }
   public SecureViewerDialog(Frame owner, ResourceBundle messages,
-          //          ActionListener saveListener, String saveCommand,
+          ActionListener closeListener, String closeCommand,
           FontProvider fontProvider, ActionListener helpListener) {
     super(owner, messages.getString(BKUGUIFacade.WINDOWTITLE_VIEWER), true);
     this.setIconImages(BKUIcons.icons);
@@ -111,7 +123,7 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
 
     initContentPane(VIEWER_DIMENSION,
             createViewerPanel(helpListener),
-            createButtonPanel()); //saveListener, saveCommand));
+            createButtonPanel(closeListener, closeCommand));
 
     pack();
     if (owner != null) {
@@ -289,15 +301,22 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
     toFront();
   }
 
-  private JPanel createButtonPanel() { //ActionListener saveListener, String saveCommand) {
+  private JPanel createButtonPanel(ActionListener closeListener, String closeCommand) {
     JButton closeButton = new JButton();
     closeButton.setText(messages.getString(BKUGUIFacade.BUTTON_CLOSE));
-    closeButton.setActionCommand("close");
-    closeButton.addActionListener(this);
+    closeButton.setActionCommand(closeCommand);
+    closeButton.addActionListener(closeListener);
+    closeButton.addActionListener(new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        log.trace("[" + Thread.currentThread().getName() + "] closing secure viewer");
+        setVisible(false);
+      }
+    });
 
     JButton saveButton = new JButton();
     saveButton.setText(messages.getString(BKUGUIFacade.BUTTON_SAVE));
-    saveButton.setActionCommand("save");
+    saveButton.setActionCommand("save"); //TODO ensure unequal to closeCommand 
     saveButton.addActionListener(this);
 
     int buttonSize = closeButton.getPreferredSize().width;
@@ -319,100 +338,37 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
 
   @Override
   public void actionPerformed(ActionEvent e) {
-    if ("close".equals(e.getActionCommand())) {
-      log.trace("[" + Thread.currentThread().getName() + "] closing secure viewer");
-      setVisible(false);
-      log.trace("secure viewer closed");
-    } else if ("save".equals(e.getActionCommand())) {
+    if ("save".equals(e.getActionCommand())) {
       log.trace("[" + Thread.currentThread().getName() + "] display secure viewer save dialog");
-      showSaveDialog(content, null, null);
+      SecureViewerSaveDialog.showSaveDialog(content, messages, null, null);
       log.trace("done secure viewer save");
     } else {
       log.warn("unknown action command " + e.getActionCommand());
     }
   }
+  
+  
+//  //TEST
+//  private static SecureViewerDialog secureViewer;
+//  public static void showSecureViewerXXX(HashDataInput dataToBeSigned, ResourceBundle messages, FontProvider fontProvider, ActionListener helpListener, boolean alwaysOnTop) throws FontProviderException {
+//    
+////    ResourceBundle messages = ResourceBundle.getBundle(BKUGUIFacade.MESSAGES_BUNDLE, locale);
+//    
+//    log.debug("[" + Thread.currentThread().getName() + "] show secure viewer");
+//    if (secureViewer == null) {
+//      secureViewer = new SecureViewerDialog(null, messages,
+//              fontProvider, helpListener); 
+//
+//      // workaround for [#439]
+//      // avoid AlwaysOnTop at least in applet, otherwise make secureViewer AlwaysOnTop since MOCCA Dialog (JFrame created in LocalSTALFactory) is always on top.
+////      Window window = SwingUtilities.getWindowAncestor(contentPane);
+////      if (window != null && window.isAlwaysOnTop()) {
+////        log.debug("make secureViewer alwaysOnTop");
+//        secureViewer.setAlwaysOnTop(alwaysOnTop);
+////      }
+//    }
+//    secureViewer.setContent(dataToBeSigned);
+//    log.trace("show secure viewer returned");
+//  }
 
-  private void showSaveDialog(final HashDataInput hashDataInput,
-          final ActionListener okListener, final String okCommand) {
-
-    log.debug("[" + Thread.currentThread().getName() + "] scheduling save dialog");
-
-    SwingUtilities.invokeLater(new Runnable() {
-
-      @Override
-      public void run() {
-
-        log.debug("[" + Thread.currentThread().getName() + "] show save dialog");
-
-        String userHome = System.getProperty("user.home");
-
-        JFileChooser fileDialog = new JFileChooser(userHome);
-        fileDialog.setMultiSelectionEnabled(false);
-        fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
-        fileDialog.setFileHidingEnabled(true);
-        fileDialog.setDialogTitle(messages.getString(BKUGUIFacade.WINDOWTITLE_SAVE));
-        fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
-        String mimeType = hashDataInput.getMimeType();
-        MimeFilter mimeFilter = new MimeFilter(mimeType, messages);
-        fileDialog.setFileFilter(mimeFilter);
-        String filename = messages.getString(BKUGUIFacade.SAVE_HASHDATAINPUT_PREFIX) +
-                MimeFilter.getExtension(mimeType);
-        fileDialog.setSelectedFile(new File(userHome, filename));
-
-        //parent contentPane -> placed over applet
-        switch (fileDialog.showSaveDialog(fileDialog)) {
-          case JFileChooser.APPROVE_OPTION:
-            File file = fileDialog.getSelectedFile();
-            String id = hashDataInput.getReferenceId();
-            if (file.exists()) {
-              String msgPattern = messages.getString(BKUGUIFacade.MESSAGE_OVERWRITE);
-              int overwrite = JOptionPane.showConfirmDialog(fileDialog,
-                      MessageFormat.format(msgPattern, file),
-                      messages.getString(BKUGUIFacade.WINDOWTITLE_OVERWRITE),
-                      JOptionPane.OK_CANCEL_OPTION);
-              if (overwrite != JOptionPane.OK_OPTION) {
-                return;
-              }
-            }
-            if (log.isDebugEnabled()) {
-              log.debug("writing hashdata input " + id + " (" + mimeType + ") to file " + file);
-            }
-            FileOutputStream fos = null;
-            try {
-              fos = new FileOutputStream(file);
-              BufferedOutputStream bos = new BufferedOutputStream(fos);
-              InputStream hdi = hashDataInput.getHashDataInput();
-              int b;
-              while ((b = hdi.read()) != -1) {
-                bos.write(b);
-              }
-              bos.flush();
-              bos.close();
-            } catch (IOException ex) {
-              log.error("Failed to write " + file + ": " + ex.getMessage());
-              log.debug(ex);
-              String errPattern = messages.getString(BKUGUIFacade.ERR_WRITE_HASHDATA);
-              JOptionPane.showMessageDialog(fileDialog,
-                      MessageFormat.format(errPattern, ex.getMessage()),
-                      messages.getString(BKUGUIFacade.WINDOWTITLE_ERROR),
-                      JOptionPane.ERROR_MESSAGE);
-            } finally {
-              try {
-                if (fos != null) {
-                  fos.close();
-                }
-              } catch (IOException ex) {
-              }
-            }
-            break;
-          case JFileChooser.CANCEL_OPTION:
-            log.debug("cancelled save dialog");
-            break;
-        }
-        if (okListener != null) {
-          okListener.actionPerformed(new ActionEvent(fileDialog, ActionEvent.ACTION_PERFORMED, okCommand));
-        }
-      }
-    });
-  }
 }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeFilter.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeFilter.java
new file mode 100644
index 00000000..c0385dce
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeFilter.java
@@ -0,0 +1,115 @@
+/*
+* 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.
+*/
+package at.gv.egiz.bku.gui.viewer;
+
+import java.io.File;
+import java.util.ResourceBundle;
+import javax.swing.filechooser.FileFilter;
+
+/**
+ *
+ * @author clemens
+ */
+class MimeFilter extends FileFilter {
+
+  private static final String MIMETYPE_DESC_XML = "mimetype.desc.xml";
+  private static final String MIMETYPE_DESC_HTML = "mimetype.desc.html";
+  private static final String MIMETYPE_DESC_XHTML = "mimetype.desc.xhtml";
+  private static final String MIMETYPE_DESC_TXT = "mimetype.desc.txt";
+  private static final String MIMETYPE_DESC_PDF = "mimetype.desc.pdf";
+  private static final String MIMETYPE_DESC_BIN = "mimetype.desc.bin";
+  private static final String MIMETYPE_DESC_UNKNOWN = "mimetype.desc.unknown";
+
+  protected String mimeType;
+  protected ResourceBundle messages;
+
+  public MimeFilter(String mimeType, ResourceBundle messages) {
+    this.mimeType = mimeType;
+    this.messages = messages;
+  }
+
+  @Override
+  public boolean accept(File f) {
+
+    if (f.isDirectory()) {
+      return true;
+    }
+
+    String ext = getExtension(f);
+    if ("text/xml".equals(mimeType)) {
+      return "xml".equalsIgnoreCase(ext);
+    } else if ("text/html".equals(mimeType)) {
+      return "html".equalsIgnoreCase(ext) || "htm".equalsIgnoreCase(ext);
+    } else if ("application/xhtml+xml".equals(mimeType)) {
+      return "xhtml".equalsIgnoreCase(ext);
+    } else if ("text/plain".equals(mimeType)) {
+      return "txt".equalsIgnoreCase(ext);
+    } else if ("application/pdf".equals(mimeType)) {
+      return "pdf".equalsIgnoreCase(ext);
+    } else {
+      return true;
+    }
+  }
+
+  private String getExtension(File f) {
+    String ext = null;
+    String s = f.getName();
+    int i = s.lastIndexOf('.');
+
+    if (i > 0 && i < s.length() - 1) {
+      ext = s.substring(i + 1).toLowerCase();
+    }
+    return ext;
+  }
+
+  @Override
+  public String getDescription() {
+    if ("text/xml".equals(mimeType)) {
+      return messages.getString(MIMETYPE_DESC_XML);
+    } else if ("text/html".equals(mimeType)) {
+      return messages.getString(MIMETYPE_DESC_HTML);
+    } else if ("application/xhtml+xml".equals(mimeType)) {
+      return messages.getString(MIMETYPE_DESC_XHTML);
+    } else if ("text/plain".equals(mimeType)) {
+      return messages.getString(MIMETYPE_DESC_TXT);
+    } else if ("application/pdf".equals(mimeType)) {
+      return messages.getString(MIMETYPE_DESC_PDF);
+    } else if ("application/octet-stream".equals(mimeType)) {
+      return messages.getString(MIMETYPE_DESC_BIN);
+    } else {
+      return messages.getString(MIMETYPE_DESC_UNKNOWN);
+    }
+  }
+
+  public static String getExtension(String mimeType) {
+    if ("text/xml".equals(mimeType)) {
+      return ".xml";
+    } else if ("text/html".equals(mimeType)) {
+      return ".html";
+    } else if ("application/xhtml+xml".equals(mimeType)) {
+      return ".xhtml";
+    } else if ("text/plain".equals(mimeType)) {
+      return ".txt";
+    } else if ("application/pdf".equals(mimeType)) {
+      return ".pdf";
+    } else if ("application/octet-stream".equals(mimeType)) {
+      return ".bin";
+    } else {
+      return "";
+    }
+  }
+}
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/SecureViewerSaveDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/SecureViewerSaveDialog.java
new file mode 100644
index 00000000..40133f95
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/SecureViewerSaveDialog.java
@@ -0,0 +1,120 @@
+package at.gv.egiz.bku.gui.viewer;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.stal.HashDataInput;
+
+public class SecureViewerSaveDialog {
+
+  protected static final Log log = LogFactory.getLog(SecureViewerSaveDialog.class);
+    
+  public static void showSaveDialog(final HashDataInput hashDataInput, final ResourceBundle messages,
+      final ActionListener okListener, final String okCommand) {
+
+    log.debug("[" + Thread.currentThread().getName()
+        + "] scheduling save dialog");
+
+    SwingUtilities.invokeLater(new Runnable() {
+
+      @Override
+      public void run() {
+
+        log
+            .debug("[" + Thread.currentThread().getName()
+                + "] show save dialog");
+
+        String userHome = System.getProperty("user.home");
+
+        JFileChooser fileDialog = new JFileChooser(userHome);
+        fileDialog.setMultiSelectionEnabled(false);
+        fileDialog.setDialogType(JFileChooser.SAVE_DIALOG);
+        fileDialog.setFileHidingEnabled(true);
+        fileDialog.setDialogTitle(messages
+            .getString(BKUGUIFacade.WINDOWTITLE_SAVE));
+        fileDialog.setFileSelectionMode(JFileChooser.FILES_ONLY);
+        String mimeType = hashDataInput.getMimeType();
+        MimeFilter mimeFilter = new MimeFilter(mimeType, messages);
+        fileDialog.setFileFilter(mimeFilter);
+        String filename = messages
+            .getString(BKUGUIFacade.SAVE_HASHDATAINPUT_PREFIX)
+            + MimeFilter.getExtension(mimeType);
+        fileDialog.setSelectedFile(new File(userHome, filename));
+
+        // parent contentPane -> placed over applet
+        switch (fileDialog.showSaveDialog(fileDialog)) {
+        case JFileChooser.APPROVE_OPTION:
+          File file = fileDialog.getSelectedFile();
+          String id = hashDataInput.getReferenceId();
+          if (file.exists()) {
+            String msgPattern = messages
+                .getString(BKUGUIFacade.MESSAGE_OVERWRITE);
+            int overwrite = JOptionPane.showConfirmDialog(fileDialog,
+                MessageFormat.format(msgPattern, file), messages
+                    .getString(BKUGUIFacade.WINDOWTITLE_OVERWRITE),
+                JOptionPane.OK_CANCEL_OPTION);
+            if (overwrite != JOptionPane.OK_OPTION) {
+              break;
+            }
+          }
+          if (log.isDebugEnabled()) {
+            log.debug("writing hashdata input " + id + " (" + mimeType
+                + ") to file " + file);
+          }
+          FileOutputStream fos = null;
+          try {
+            fos = new FileOutputStream(file);
+            BufferedOutputStream bos = new BufferedOutputStream(fos);
+            InputStream hdi = hashDataInput.getHashDataInput();
+            int b;
+            while ((b = hdi.read()) != -1) {
+              bos.write(b);
+            }
+            bos.flush();
+            bos.close();
+          } catch (IOException ex) {
+            log.error("Failed to write " + file + ": " + ex.getMessage());
+            log.debug(ex);
+            String errPattern = messages
+                .getString(BKUGUIFacade.ERR_WRITE_HASHDATA);
+            JOptionPane.showMessageDialog(fileDialog, MessageFormat.format(
+                errPattern, ex.getMessage()), messages
+                .getString(BKUGUIFacade.WINDOWTITLE_ERROR),
+                JOptionPane.ERROR_MESSAGE);
+          } finally {
+            try {
+              if (fos != null) {
+                fos.close();
+              }
+            } catch (IOException ex) {
+            }
+          }
+          break;
+        case JFileChooser.CANCEL_OPTION:
+          log.debug("cancelled save dialog");
+          break;
+        }
+        if (okListener != null) {
+          okListener.actionPerformed(new ActionEvent(fileDialog,
+              ActionEvent.ACTION_PERFORMED, okCommand));
+        }
+      }
+    });
+  }
+}
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index b458a214..7135b561 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -20,6 +20,7 @@ title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
 title.cardpin=<html>Karte wird gelesen</html>
 title.sign=<html>Signatur erstellen</html>
 title.error=<html>Fehler</html>
+title.warning=<html>Achtung
 title.entry.timeout=<html>Zeit\u00FCberschreitung</html>
 title.retry=<html>Falsche PIN</html>
 title.wait=<html>Bitte warten</html>
@@ -46,6 +47,8 @@ hashdatalink.tiny.focus=<html><a href=\"anzeige\">[Signaturdaten]</a></html>
 #message.hashdata=<html>Dies ist eine Voransicht des zu signierenden Inhaltes. F\u00FCr Details siehe Hilfe (i).</html> 
 #verwenden sie bitte die von ihrem System zur Verf\u00FCgung gestellte {0} Anwendung. 
 hashdatalist=<html>{0} Signaturdaten:</html>
+hashdata.viewer=<html>Signaturdaten werden im Betrachter angezeigt
+unsupported.mimetype=<html>Signaturdaten k�nnen nicht angezeigt werden
 retries.last=<html>Letzter Versuch!</html>
 retries=<html>Noch {0} Versuche</html>
 retries.pinpad.last=<html>Eingabe wiederholen, letzter Versuch!</html>
@@ -68,6 +71,7 @@ mimetype.desc.xhtml=XHTML-Dateien (.xhtml)
 mimetype.desc.txt=Textdateien (.txt)
 mimetype.desc.pdf=Adobe PDF-Dateien (.pdf)
 mimetype.desc.bin=Bin\u00E4rdateien (.bin)
+mimetype.desc.unknown=Alle Dateien (.*)
 save.hashdatainput.prefix=Signaturdaten
 alt.help=Hilfe
 
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index 109b4faa..6e89510e 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -54,7 +54,7 @@ retries.pinpad=<html>Re-enter pin, {0} tries left</html>
 overwrite=<html>Overwrite {0}?</html>
 help=<html>Help topic {0}</html>
 
-warning.xhtml=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
+warning.xhtml=<html>Remark: This is a preview of the data to-be signed. For standard-compliant display see help.</html>
 label.pin=<html>{0}:</html>
 label.pinsize=<html>({0} digits)</html>
 button.ok=OK
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
index fc8dcd96..131a344f 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
@@ -7,6 +7,8 @@ package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.stal.impl.ByteArrayHashDataInput;
 import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -33,7 +35,7 @@ public class SecureViewerDialogTest {
   @BeforeClass
   public static void setUpClass() throws Exception {
     messages = ResourceBundle.getBundle("at/gv/egiz/bku/gui/Messages");
-    secureViewer = new SecureViewerDialog(null, messages, new DummyFontLoader(), null);
+    secureViewer = new SecureViewerDialog(null, messages,null, null, new DummyFontLoader(), null);
   }
 
   @AfterClass
diff --git a/BKUHelp/src/main/webapp/help/de/help.unsupported.mimetype.html b/BKUHelp/src/main/webapp/help/de/help.unsupported.mimetype.html
new file mode 100644
index 00000000..09440dc2
--- /dev/null
+++ b/BKUHelp/src/main/webapp/help/de/help.unsupported.mimetype.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Bürgerkarte - Hilfe</title>
+<link href="../help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="../chip16.ico" type="image/x-icon"/>
+<!--[if IE]>
+<style type="text/css"> 
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+  <div id="header">
+    <h1>Online-Hilfe</h1>
+    <!-- end #header --></div>
+  <div id="sidebar1">
+    <p><img src="help.unsupported.mimetype.png" alt="Bildschirmfoto des Applets" height="130" width="150"/></p>
+    <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+    <!-- end #sidebar1 --></div>
+  <div id="mainContent">
+    <h1>Signaturdaten können nicht dargestellt werden</h1>
+    <p>Die Signaturdatenanzeige unterstützt reine Textdaten sowie XHTML, andere MIME-Typen k&ouml;nnen nicht angezeigt werden.
+    Um die Daten standardkonform darzustellen, m&uuml;ssen diese abgespeichert und mit einem geeigneten externen Betrachter ge&ouml;ffnen werden.</p>
+     <p><br class="clearfloat" /></p>
+  </div>
+  <div id="footer">
+  	<p>
+    	<a href="http://www.buergerkarte.at">Österreichische Bürgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">Bürgerkartensoftware MOCCA</a>
+    </p>
+  </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
index 08b4d7de..2ca108e0 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
@@ -37,12 +37,16 @@ import at.gv.egiz.stal.service.types.QuitRequestType;
 import at.gv.egiz.stal.service.types.RequestType;
 import at.gv.egiz.stal.service.types.ResponseType;
 import at.gv.egiz.stal.service.types.SignRequestType;
+import at.gv.egiz.stal.service.types.GetHashDataInputType.Reference;
+//import at.gv.egiz.stal.service.types.GetHashDataInputResponseType.Reference;
+
 import com.sun.xml.ws.developer.UsesJAXBContext;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
@@ -204,113 +208,97 @@ public class STALServiceImpl implements STALPortType {
       log.debug("Received GetHashDataInputRequest for session " + sessionId + " containing " + request.getReference().size() + " reference(s)");
     }
 
+    if (TEST_SESSION_ID.equals(sessionId)) {
+      return getTestSessionHashDataInputResponse(request.getReference());
+    }
+    
     GetHashDataInputResponseType response = new GetHashDataInputResponseType();
     response.setSessionId(sessionId.toString());
 
-    if (TEST_SESSION_ID.equals(sessionId)) {
-      log.debug("Received GetHashDataInput for session " + TEST_SESSION_ID + ", return DummyHashDataInput");
-      GetHashDataInputResponseType.Reference ref = new GetHashDataInputResponseType.Reference();
-      ref.setID("signed-data-reference-0-1214921968-27971781-24309"); //Reference-" + TEST_SESSION_ID + "-001");
-      ref.setMimeType("text/plain");
-
-      Charset charset;
-      try {
-        charset = Charset.forName("iso-8859-15");
-        ref.setEncoding("iso-8859-15");
-      } catch (Exception ex) {
-        log.warn(ex.getMessage());
-        charset = Charset.defaultCharset();
-        ref.setEncoding(charset.toString());
-      }
-      ref.setValue("hashdatainput-öäüß@€-00000000001".getBytes(charset));
-      response.getReference().add(ref);
-      return response;
-    } else {
-      STALRequestBroker stal = getStal(sessionId);
+    STALRequestBroker stal = getStal(sessionId);
 
-      if (stal != null) {
-        List<HashDataInput> hashDataInputs = stal.getHashDataInput();
+    if (stal != null) {
+      List<HashDataInput> hashDataInputs = stal.getHashDataInput();
 
-        if (hashDataInputs != null) {
+      if (hashDataInputs != null) {
 
-          Map<String, HashDataInput> hashDataIdMap = new HashMap<String, HashDataInput>();
-          for (HashDataInput hdi : hashDataInputs) {
-            if (log.isTraceEnabled()) {
-              log.trace("Provided HashDataInput for reference " + hdi.getReferenceId());
-            }
-            hashDataIdMap.put(hdi.getReferenceId(), hdi);
+        Map<String, HashDataInput> hashDataIdMap = new HashMap<String, HashDataInput>();
+        for (HashDataInput hdi : hashDataInputs) {
+          if (log.isTraceEnabled()) {
+            log.trace("Provided HashDataInput for reference " + hdi.getReferenceId());
           }
+          hashDataIdMap.put(hdi.getReferenceId(), hdi);
+        }
 
-          List<GetHashDataInputType.Reference> reqRefs = request.getReference();
-          for (GetHashDataInputType.Reference reqRef : reqRefs) {
-            String reqRefId = reqRef.getID();
-            HashDataInput reqHdi = hashDataIdMap.get(reqRefId);
-            if (reqHdi == null) {
-              String msg = "Failed to resolve HashDataInput for reference " + reqRefId;
-              log.error(msg);
-              GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
-              faultInfo.setErrorCode(1);
-              faultInfo.setErrorMessage(msg);
-              throw new GetHashDataInputFault(msg, faultInfo);
-            }
+        List<GetHashDataInputType.Reference> reqRefs = request.getReference();
+        for (GetHashDataInputType.Reference reqRef : reqRefs) {
+          String reqRefId = reqRef.getID();
+          HashDataInput reqHdi = hashDataIdMap.get(reqRefId);
+          if (reqHdi == null) {
+            String msg = "Failed to resolve HashDataInput for reference " + reqRefId;
+            log.error(msg);
+            GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
+            faultInfo.setErrorCode(1);
+            faultInfo.setErrorMessage(msg);
+            throw new GetHashDataInputFault(msg, faultInfo);
+          }
 
-            InputStream hashDataIS = reqHdi.getHashDataInput();
-            if (hashDataIS == null) {
-              //HashDataInput not cached?
-              String msg = "Failed to obtain HashDataInput for reference " + reqRefId + ", reference not cached";
-              log.error(msg);
-              GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
-              faultInfo.setErrorCode(1);
-              faultInfo.setErrorMessage(msg);
-              throw new GetHashDataInputFault(msg, faultInfo);
+          InputStream hashDataIS = reqHdi.getHashDataInput();
+          if (hashDataIS == null) {
+            //HashDataInput not cached?
+            String msg = "Failed to obtain HashDataInput for reference " + reqRefId + ", reference not cached";
+            log.error(msg);
+            GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
+            faultInfo.setErrorCode(1);
+            faultInfo.setErrorMessage(msg);
+            throw new GetHashDataInputFault(msg, faultInfo);
+          }
+          ByteArrayOutputStream baos = null;
+          try {
+            if (log.isDebugEnabled()) {
+              log.debug("Resolved HashDataInput " + reqRefId + " (" + reqHdi.getMimeType() + ";charset=" + reqHdi.getEncoding() + ")");
+            }
+            baos = new ByteArrayOutputStream(hashDataIS.available());
+            int c;
+            while ((c = hashDataIS.read()) != -1) {
+              baos.write(c);
             }
-            ByteArrayOutputStream baos = null;
+            GetHashDataInputResponseType.Reference ref = new GetHashDataInputResponseType.Reference();
+            ref.setID(reqRefId);
+            ref.setMimeType(reqHdi.getMimeType());
+            ref.setEncoding(reqHdi.getEncoding());
+            ref.setValue(baos.toByteArray());
+            response.getReference().add(ref);
+          } catch (IOException ex) {
+            String msg = "Failed to get HashDataInput for reference " + reqRefId;
+            log.error(msg, ex);
+            GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
+            faultInfo.setErrorCode(1);
+            faultInfo.setErrorMessage(msg);
+            throw new GetHashDataInputFault(msg, faultInfo, ex);
+          } finally {
             try {
-              if (log.isDebugEnabled()) {
-                log.debug("Resolved HashDataInput " + reqRefId + " (" + reqHdi.getMimeType() + ";charset=" + reqHdi.getEncoding() + ")");
-              }
-              baos = new ByteArrayOutputStream(hashDataIS.available());
-              int c;
-              while ((c = hashDataIS.read()) != -1) {
-                baos.write(c);
-              }
-              GetHashDataInputResponseType.Reference ref = new GetHashDataInputResponseType.Reference();
-              ref.setID(reqRefId);
-              ref.setMimeType(reqHdi.getMimeType());
-              ref.setEncoding(reqHdi.getEncoding());
-              ref.setValue(baos.toByteArray());
-              response.getReference().add(ref);
+              baos.close();
             } catch (IOException ex) {
-              String msg = "Failed to get HashDataInput for reference " + reqRefId;
-              log.error(msg, ex);
-              GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
-              faultInfo.setErrorCode(1);
-              faultInfo.setErrorMessage(msg);
-              throw new GetHashDataInputFault(msg, faultInfo, ex);
-            } finally {
-              try {
-                baos.close();
-              } catch (IOException ex) {
-              }
             }
           }
-          return response;
-        } else {
-          String msg = "Failed to resolve any HashDataInputs for session " + sessionId;
-          log.error(msg);
-          GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
-          faultInfo.setErrorCode(1);
-          faultInfo.setErrorMessage(msg);
-          throw new GetHashDataInputFault(msg, faultInfo);
         }
+        return response;
       } else {
-        String msg = "Session timeout"; //Failed to get STAL for session " + sessionId;
-        log.error(msg + " " + sessionId);
+        String msg = "Failed to resolve any HashDataInputs for session " + sessionId;
+        log.error(msg);
         GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
         faultInfo.setErrorCode(1);
         faultInfo.setErrorMessage(msg);
         throw new GetHashDataInputFault(msg, faultInfo);
       }
+    } else {
+      String msg = "Session timeout"; //Failed to get STAL for session " + sessionId;
+      log.error(msg + " " + sessionId);
+      GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
+      faultInfo.setErrorCode(1);
+      faultInfo.setErrorMessage(msg);
+      throw new GetHashDataInputFault(msg, faultInfo);
     }
   }
 
@@ -332,45 +320,83 @@ public class STALServiceImpl implements STALPortType {
     List<JAXBElement<? extends RequestType>> reqs = response.getInfoboxReadRequestOrSignRequestOrQuitRequest();
 
     if (responsesIn == null) {
-      log.info("[TestSession] received CONNECT, return dummy requests ");
-//      addDummyRequests(reqs);
-      ScriptType scriptT = ccObjFactory.createScriptType();
-      CommandAPDUType cmd = ccObjFactory.createCommandAPDUType();
-      cmd.setValue("TestSession CardChannelCMD 1234".getBytes());
-      scriptT.getResetOrCommandAPDUOrVerifyAPDU().add(cmd);
-      reqs.add(ccObjFactory.createScript(scriptT));
+      log.info("[TestSession] CONNECT");
+//      addTestCardChannelRequest(reqs);
+//      addTestInfoboxReadRequest("IdentityLink", reqs);
+//      addTestInfoboxReadRequest("SecureSignatureKeypair", reqs);
+//      addTestInfoboxReadRequest("CertifiedKeypair", reqs);
+      addTestSignatureRequests("SecureSignatureKeypair", reqs);
     } else if (responsesIn != null && responsesIn.size() > 0 && responsesIn.get(0).getValue() instanceof ErrorResponseType) {
       log.info("[TestSession] received ErrorResponse, return QUIT request");
       QuitRequestType quitT = stalObjFactory.createQuitRequestType();
       reqs.add(stalObjFactory.createGetNextRequestResponseTypeQuitRequest(quitT));
     } else {
-      log.info("[TestSession] received " + responsesIn.size() + " response(s), return dummy requests" );
-      addDummyRequests(reqs);
+      log.info("[TestSession] received " + responsesIn.size() + " response(s), return QUIT" );
+      QuitRequestType quitT = stalObjFactory.createQuitRequestType();
+      reqs.add(stalObjFactory.createGetNextRequestResponseTypeQuitRequest(quitT));
+    }
+    return response;
+  }
+  
+  
+  private GetHashDataInputResponseType getTestSessionHashDataInputResponse(List<Reference> references) {
+    log.debug("[TestSession] received GET_HASHDATAINPUT");
+    
+    GetHashDataInputResponseType response = new GetHashDataInputResponseType();
+    response.setSessionId(TEST_SESSION_ID.toString());
+    
+    for (Reference reference : references) {
+      String refId = reference.getID();
+      log.debug("[TestSession] adding hashdata input for " + refId);
+      GetHashDataInputResponseType.Reference ref = new GetHashDataInputResponseType.Reference();
+      ref.setID(refId);
+      ref.setMimeType(TestSignatureData.HASHDATA_MIMETYPES.get(refId)); //todo resolve from TestSignatureData
+      ref.setValue(TestSignatureData.HASHDATA_INPUT.get(refId));
+      ref.setEncoding(TestSignatureData.ENCODING);
+      response.getReference().add(ref);
     }
+//    GetHashDataInputResponseType.Reference ref = new GetHashDataInputResponseType.Reference();
+//    ref.setID("signed-data-reference-0-1214921968-27971781-24309"); //Reference-" + TEST_SESSION_ID + "-001");
+//    ref.setMimeType("text/plain");
+
+//    Charset charset;
+//    try {
+//      charset = Charset.forName("iso-8859-15");
+//      ref.setEncoding("iso-8859-15");
+//    } catch (Exception ex) {
+//      log.warn(ex.getMessage());
+//      charset = Charset.defaultCharset();
+//      ref.setEncoding(charset.toString());
+//    }
+//    ref.setValue("hashdatainput-öäüß@€-00000000001".getBytes(charset));
+    
+//    ref.setValue("Ich bin ein einfacher Text. ll�����".getBytes());
+//    response.getReference().add(ref);
     return response;
   }
+  
+  private void addTestCardChannelRequest(List<JAXBElement<? extends RequestType>> requestList) {
+    log.info("[TestSession] add CARDCHANNEL request");
+    ScriptType scriptT = ccObjFactory.createScriptType();
+    CommandAPDUType cmd = ccObjFactory.createCommandAPDUType();
+    cmd.setValue("TestSession CardChannelCMD 1234".getBytes());
+    scriptT.getResetOrCommandAPDUOrVerifyAPDU().add(cmd);
+    requestList.add(ccObjFactory.createScript(scriptT));
+  }
 
-  private void addDummyRequests(List<JAXBElement<? extends RequestType>> reqs) {
-//    log.info("[TestSession] add READ request for Infobox IdentityLink");
-//    InfoboxReadRequestType ibrT1 = stalObjFactory.createInfoboxReadRequestType();
-//    ibrT1.setInfoboxIdentifier("IdentityLink");
-//    reqs.add(stalObjFactory.createGetNextRequestResponseTypeInfoboxReadRequest(ibrT1));
-
-    log.info("[TestSession] add READ request for Infobox CertifiedKeypair");
-    InfoboxReadRequestType ibrT2 = stalObjFactory.createInfoboxReadRequestType();
-    ibrT2.setInfoboxIdentifier("CertifiedKeypair");
-    reqs.add(stalObjFactory.createGetNextRequestResponseTypeInfoboxReadRequest(ibrT2));
-
-    log.info("[TestSession] add READ request for Infobox SecureSignatureKeypair");
-    InfoboxReadRequestType ibrT3 = stalObjFactory.createInfoboxReadRequestType();
-    ibrT3.setInfoboxIdentifier("SecureSignatureKeypair");
-    reqs.add(stalObjFactory.createGetNextRequestResponseTypeInfoboxReadRequest(ibrT3));
-
-    log.info("[TestSession] add SIGN request");
-    SignRequestType sigT1 = stalObjFactory.createSignRequestType();
-    sigT1.setKeyIdentifier("SecureSignatureKeypair");
-    sigT1.setSignedInfo("<dsig:SignedInfo  xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\"><dsig:CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\" /> <dsig:SignatureMethod Algorithm=\"http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1\" /> <dsig:Reference Id=\"signed-data-reference-0-1214921968-27971781-24309\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-0-1214921968-27971781-13578')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"etsi-data-reference-0-1214921968-27971781-25439\" Type=\"http://uri.etsi.org/01903/v1.1.1#SignedProperties\" URI=\"#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-data-object-0-1214921968-27971781-3095')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)\"><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /><dsig:DigestValue>yV6Q+I60buqR4mMaxA7fi+CV35A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>".getBytes());
-    reqs.add(stalObjFactory.createGetNextRequestResponseTypeSignRequest(sigT1));
+  private void addTestInfoboxReadRequest(String infoboxIdentifier, List<JAXBElement<? extends RequestType>> requestList) {
+    log.info("[TestSession] add READ "+ infoboxIdentifier + " request");
+    InfoboxReadRequestType ibrT = stalObjFactory.createInfoboxReadRequestType();
+    ibrT.setInfoboxIdentifier(infoboxIdentifier);
+    requestList.add(stalObjFactory.createGetNextRequestResponseTypeInfoboxReadRequest(ibrT));
+  }
+  
+  private void addTestSignatureRequests(String keyIdentifier, List<JAXBElement<? extends RequestType>> reqs) {
+    log.info("[TestSession] add SIGN " + keyIdentifier + " request");
+    SignRequestType sigT = stalObjFactory.createSignRequestType();
+    sigT.setKeyIdentifier(keyIdentifier);
+    sigT.setSignedInfo(TestSignatureData.SIGNED_INFO.get(1)); //select! 
+    reqs.add(stalObjFactory.createGetNextRequestResponseTypeSignRequest(sigT));
   }
 
 }
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/TestSignatureData.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/TestSignatureData.java
new file mode 100644
index 00000000..24771d8f
--- /dev/null
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/TestSignatureData.java
@@ -0,0 +1,47 @@
+package at.gv.egiz.stal.service.impl;
+
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public final class TestSignatureData {
+  
+  protected final static Log log = LogFactory.getLog(TestSignatureData.class);
+  
+  public static final String[] ID = new String[] {"signed-data-reference-0-1214921968-27971781-24309", "signed-data-reference-1"};
+  public static final String ENCODING = "UTF-8";
+  
+  public static final Map<String, byte[]> HASHDATA_INPUT = new HashMap<String, byte[]>();
+  static {
+    try {
+      HASHDATA_INPUT.put(ID[0], "Ich bin ein einfacher Text. ll�����".getBytes(ENCODING));
+      HASHDATA_INPUT.put(ID[1], "2te referenz".getBytes(ENCODING));
+    } catch (UnsupportedEncodingException ex) {
+      log.error("failed to init signature test data", ex);
+    }
+  }
+  public static final Map<String, String> HASHDATA_MIMETYPES = new HashMap<String, String>();
+  static {
+      HASHDATA_MIMETYPES.put(ID[0], "text/plain");
+      HASHDATA_MIMETYPES.put(ID[1], "any/mime-type");
+  }
+  
+//  private static final byte[] signedInfo = "<dsig:SignedInfo  xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\"><dsig:CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\" /> <dsig:SignatureMethod Algorithm=\"http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1\" /> <dsig:Reference Id=\"signed-data-reference-0-1214921968-27971781-24309\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-0-1214921968-27971781-13578')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"etsi-data-reference-0-1214921968-27971781-25439\" Type=\"http://uri.etsi.org/01903/v1.1.1#SignedProperties\" URI=\"#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-data-object-0-1214921968-27971781-3095')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)\"><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /><dsig:DigestValue>yV6Q+I60buqR4mMaxA7fi+CV35A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>".getBytes();
+//  private static final byte[] signedInfo2Ref = "<dsig:SignedInfo  xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\"><dsig:CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\" /> <dsig:SignatureMethod Algorithm=\"http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1\" /> <dsig:Reference Id=\"signed-data-reference-0-1214921968-27971781-24309\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-0-1214921968-27971781-13578')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"signed-data-reference-1\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-1')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"etsi-data-reference-0-1214921968-27971781-25439\" Type=\"http://uri.etsi.org/01903/v1.1.1#SignedProperties\" URI=\"#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-data-object-0-1214921968-27971781-3095')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)\"><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /><dsig:DigestValue>yV6Q+I60buqR4mMaxA7fi+CV35A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>".getBytes();
+//  private static final String signedInfo2Ref = "<dsig:Reference Id=\"signed-data-reference-1\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-1')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference>";
+  /**
+   * SIGNED_INFO[0] contains reference ID[0]
+   * SIGNED_INFO[1] contains reference ID[0] and ID[1]
+   */
+  public static final List<byte[]> SIGNED_INFO = new ArrayList<byte[]>(); 
+  static {
+    SIGNED_INFO.add("<dsig:SignedInfo  xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\"><dsig:CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\" /> <dsig:SignatureMethod Algorithm=\"http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1\" /> <dsig:Reference Id=\"signed-data-reference-0-1214921968-27971781-24309\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-0-1214921968-27971781-13578')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"etsi-data-reference-0-1214921968-27971781-25439\" Type=\"http://uri.etsi.org/01903/v1.1.1#SignedProperties\" URI=\"#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-data-object-0-1214921968-27971781-3095')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)\"><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /><dsig:DigestValue>yV6Q+I60buqR4mMaxA7fi+CV35A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>".getBytes());
+    SIGNED_INFO.add("<dsig:SignedInfo  xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\"><dsig:CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\" /> <dsig:SignatureMethod Algorithm=\"http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1\" /> <dsig:Reference Id=\"signed-data-reference-0-1214921968-27971781-24309\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-0-1214921968-27971781-13578')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"signed-data-reference-1\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-1')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"etsi-data-reference-0-1214921968-27971781-25439\" Type=\"http://uri.etsi.org/01903/v1.1.1#SignedProperties\" URI=\"#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-data-object-0-1214921968-27971781-3095')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)\"><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /><dsig:DigestValue>yV6Q+I60buqR4mMaxA7fi+CV35A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>".getBytes());
+  }
+  
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
index 2088a684..89124d16 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
@@ -293,8 +293,7 @@ public class DataObject {
         }
         
       } else {
-        log.info("MIME media type '" + mediaType + "' is not a valid digest input.");
-        throw new SLViewerException(5001); 
+        log.debug("MIME media type '" + mediaType + "' is not a s/valid/SUPPORTED digest input, omitting validation.");
       }
     }
     
-- 
cgit v1.2.3


From 04f0881563fdbecd8223627a7752e27690cc99c2 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 13 Nov 2009 16:18:32 +0000
Subject: [maven-release-plugin] prepare release mocca-1.2.8

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@549 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 14 +++++++-------
 BKUAppletExt/pom.xml    | 16 ++++++++--------
 BKUCertificates/pom.xml |  2 +-
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUFonts/pom.xml        |  8 +++-----
 BKUGuiExt/pom.xml       |  8 ++++----
 BKUHelp/pom.xml         |  4 ++--
 BKULocal/pom.xml        | 26 +++++++++++++-------------
 BKUOnline/pom.xml       | 26 +++++++++++++-------------
 BKUViewer/pom.xml       |  6 +++---
 BKUWebStart/pom.xml     |  4 ++--
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  4 ++--
 pom.xml                 | 10 +++++-----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 smccSTALExt/pom.xml     |  4 ++--
 utils/pom.xml           |  4 ++--
 21 files changed, 90 insertions(+), 92 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 8f72b7d0..e8806dae 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.8-SNAPSHOT</version>
+  <version>1.2.8</version>
   <build>
     <plugins>
       <plugin>
@@ -118,27 +118,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 488d0808..d4ba7363 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.8-SNAPSHOT</version>
+        <version>1.2.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.8-SNAPSHOT</version>
+            <version>1.2.8</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.8-SNAPSHOT</version>
+            <version>1.2.8</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.8-SNAPSHOT</version>
+            <version>1.2.8</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.8-SNAPSHOT</version>
+            <version>1.2.8</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.8-SNAPSHOT</version>
+            <version>1.2.8</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.8-SNAPSHOT</version>
+            <version>1.2.8</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index dd4f355d..80c18a89 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index feefa18b..047895c1 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.8-SNAPSHOT</version>
+        <version>1.2.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.8-SNAPSHOT</version>
+            <version>1.2.8</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.8-SNAPSHOT</version>
+            <version>1.2.8</version>
             <scope>compile</scope>
         </dependency>
         <!-- see BKUFonts.pom
diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml
index 5df06967..21c7958f 100644
--- a/BKUFonts/pom.xml
+++ b/BKUFonts/pom.xml
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUFonts</artifactId>
@@ -40,4 +38,4 @@
       </resource>
     </resources>
   </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 2291d7d6..3735e870 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.8-SNAPSHOT</version>
+  <version>1.2.8</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 07b31ddb..a480dcef 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.2.8-SNAPSHOT</version>
+  <version>1.2.8</version>
   <name>BKU Help</name>
   <build>
     <resources>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 73ed5cf3..c2b1a0f4 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.8-SNAPSHOT</version>
+		<version>1.2.8</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.8-SNAPSHOT</version>
+	<version>1.2.8</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -72,42 +72,42 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.8-SNAPSHOT</version>
+			<version>1.2.8</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.8-SNAPSHOT</version>
+			<version>1.2.8</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.8-SNAPSHOT</version>
+			<version>1.2.8</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.8-SNAPSHOT</version>
+			<version>1.2.8</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 3d504a8d..5fa6e1bf 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.8-SNAPSHOT</version>
+  <version>1.2.8</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -28,12 +28,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -43,7 +43,7 @@
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -67,13 +67,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -119,13 +119,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
       <scope>provided</scope>
     </dependency>
     <!--
@@ -145,9 +145,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 579d12f0..c058678f 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.8-SNAPSHOT</version>
+		<version>1.2.8</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.8-SNAPSHOT</version>
+	<version>1.2.8</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.8-SNAPSHOT</version>
+			<version>1.2.8</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 117864b5..a61015e4 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.8-SNAPSHOT</version>
+  <version>1.2.8</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 4435a483..f5bdae43 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.8-SNAPSHOT</version>
+        <version>1.2.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 6b94e071..401e2279 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.8-SNAPSHOT</version>
+  <version>1.2.8</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index b86f20cf..609763a2 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.8-SNAPSHOT</version>
+        <version>1.2.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.8-SNAPSHOT</version>
+            <version>1.2.8</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 334c6e0a..f2931c60 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.8-SNAPSHOT</version>
+  <version>1.2.8</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.8-SNAPSHOT</version>
+      <version>1.2.8</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 972136c2..9db1a81d 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.8-SNAPSHOT</version>
+		<version>1.2.8</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.8-SNAPSHOT</version>
+	<version>1.2.8</version>
 
 	<build>
 		<plugins>
diff --git a/pom.xml b/pom.xml
index 34fcfaa1..aae4202c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.8-SNAPSHOT</version>
+  <version>1.2.8</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -48,9 +48,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -245,7 +245,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.8-SNAPSHOT</version>
+        <version>1.2.8</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 16d7635a..6d364e59 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.8-SNAPSHOT</version>
+  <version>1.2.8</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index f11aa550..972b624d 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.8-SNAPSHOT</version>
+        <version>1.2.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.8-SNAPSHOT</version>
+            <version>1.2.8</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.8-SNAPSHOT</version>
+            <version>1.2.8</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.8-SNAPSHOT</version>
+            <version>1.2.8</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index e2bf28d2..75cfa0d0 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8-SNAPSHOT</version>
+    <version>1.2.8</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.8-SNAPSHOT</version>
+  <version>1.2.8</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index b372a616..1ddd3c9a 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.8-SNAPSHOT</version>
+		<version>1.2.8</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.8-SNAPSHOT</version>
+	<version>1.2.8</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 8814f7675055585933d8dae365cf3a95906fac05 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 18 Nov 2009 17:04:48 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@551 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 14 +++++++-------
 BKUAppletExt/pom.xml    | 16 ++++++++--------
 BKUCertificates/pom.xml |  4 ++--
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUFonts/pom.xml        |  4 ++--
 BKUGuiExt/pom.xml       |  8 ++++----
 BKUHelp/pom.xml         |  4 ++--
 BKULocal/pom.xml        | 26 +++++++++++++-------------
 BKUOnline/pom.xml       | 28 ++++++++++++++--------------
 BKUViewer/pom.xml       |  8 ++++----
 BKUWebStart/pom.xml     |  6 +++---
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  4 ++--
 pom.xml                 | 10 +++++-----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 smccSTALExt/pom.xml     |  4 ++--
 utils/pom.xml           |  4 ++--
 21 files changed, 93 insertions(+), 93 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index e8806dae..0c6768aa 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.8</version>
+  <version>1.2.9-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -118,27 +118,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index d4ba7363..84c4844c 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.8</version>
+        <version>1.2.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.9-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 80c18a89..14cd84bf 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
-  <version>1.0</version>
+  <version>1.1-SNAPSHOT</version>
   <name>BKU Certificates</name>
 
   <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 047895c1..e077401f 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.8</version>
+        <version>1.2.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.9-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <!-- see BKUFonts.pom
diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml
index 21c7958f..8a9a5ec0 100644
--- a/BKUFonts/pom.xml
+++ b/BKUFonts/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUFonts</artifactId>
-  <version>1.0</version>
+  <version>1.1-SNAPSHOT</version>
   <name>BKU Fonts</name>
   <description>
     This module is used in validator(s) and viewer and is a direct dependency of
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 3735e870..29e01aed 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.8</version>
+  <version>1.2.9-SNAPSHOT</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index a480dcef..791909a6 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.2.8</version>
+  <version>1.2.9-SNAPSHOT</version>
   <name>BKU Help</name>
   <build>
     <resources>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index c2b1a0f4..7f7002fe 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.8</version>
+		<version>1.2.9-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.8</version>
+	<version>1.2.9-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -72,42 +72,42 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.8</version>
+			<version>1.2.9-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.8</version>
+			<version>1.2.9-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.8</version>
+			<version>1.2.9-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.8</version>
+			<version>1.2.9-SNAPSHOT</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 5fa6e1bf..ed7f228c 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.8</version>
+  <version>1.2.9-SNAPSHOT</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -28,22 +28,22 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.0</version>
+      <version>1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -67,13 +67,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -119,13 +119,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <!--
@@ -145,9 +145,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index c058678f..c582767e 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.8</version>
+		<version>1.2.9-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.8</version>
+	<version>1.2.9-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.8</version>
+			<version>1.2.9-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -42,7 +42,7 @@
 	 <dependency>
 	  <groupId>at.gv.egiz</groupId>
 	  <artifactId>BKUFonts</artifactId>
-	  <version>1.0</version>
+	  <version>1.1-SNAPSHOT</version>
 	 </dependency>
 	</dependencies>
 </project>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index a61015e4..1c5c3935 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.8</version>
+  <version>1.2.9-SNAPSHOT</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -230,7 +230,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCertificates</artifactId>
-      <version>1.0</version>
+      <version>1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index f5bdae43..8fe1c263 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.8</version>
+        <version>1.2.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 401e2279..300a6865 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.8</version>
+  <version>1.2.9-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 609763a2..8133df51 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.8</version>
+        <version>1.2.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.9-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index f2931c60..c5799274 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.8</version>
+  <version>1.2.9-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.8</version>
+      <version>1.2.9-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 9db1a81d..7a5c5167 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.8</version>
+		<version>1.2.9-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.8</version>
+	<version>1.2.9-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/pom.xml b/pom.xml
index aae4202c..73fa5d5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.8</version>
+  <version>1.2.9-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -48,9 +48,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.8</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -245,7 +245,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9-SNAPSHOT</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 6d364e59..a47b2f7c 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.8</version>
+  <version>1.2.9-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 972b624d..441c4dcd 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.8</version>
+        <version>1.2.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index 75cfa0d0..6224eeee 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.8</version>
+    <version>1.2.9-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.8</version>
+  <version>1.2.9-SNAPSHOT</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 1ddd3c9a..353c7fc2 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.8</version>
+		<version>1.2.9-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.8</version>
+	<version>1.2.9-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 5af9b75dccc1b52d1382fe0f2df30affd509f5b9 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 24 Nov 2009 18:48:00 +0000
Subject: Filenames derived from reference URI

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@553 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../egiz/bku/online/applet/AppletSecureViewer.java |  3 +-
 .../java/at/gv/egiz/bku/gui/HyperlinkRenderer.java | 10 ++-
 .../java/at/gv/egiz/bku/gui/viewer/MimeFilter.java | 56 +-------------
 .../java/at/gv/egiz/bku/gui/viewer/MimeTypes.java  | 53 +++++++++++++
 .../bku/gui/viewer/SecureViewerSaveDialog.java     |  5 +-
 .../gv/egiz/stal/impl/ByteArrayHashDataInput.java  |  9 ++-
 .../at/gv/egiz/bku/gui/Messages.properties         |  3 +-
 .../at/gv/egiz/bku/gui/Messages_en.properties      |  1 +
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java | 12 ++-
 .../at/gv/egiz/bku/gui/SecureViewerDialogTest.java |  6 +-
 BKUOnline/pom.xml                                  |  2 +-
 .../gv/egiz/stal/service/impl/STALServiceImpl.java |  1 +
 BKUOnline/src/main/webapp/META-INF/context.xml     |  2 +-
 BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd    |  1 +
 BKUOnline/src/main/wsdl/stal-service.xsd           |  1 +
 .../egiz/stal/service/STALRequestBrokerTest.java   | 21 ++++++
 .../main/java/at/gv/egiz/stal/HashDataInput.java   |  2 +
 .../types/GetHashDataInputResponseType.java        | 28 +++++++
 .../gv/egiz/bku/binding/HTTPBindingProcessor.java  |  1 +
 .../slcommands/impl/DataObjectHashDataInput.java   |  6 ++
 .../egiz/bku/slcommands/impl/xsect/DataObject.java | 88 ++++++++++++++++++++--
 .../bku/slcommands/impl/xsect/SignatureTest.java   | 50 +++++++++++-
 .../impl/DataObjectInfo_Detached_LocRefContent.xml | 13 ++++
 .../impl/DataObjectInfo_LocRefContent_2.xml        |  2 +-
 .../at/gv/egiz/slbinding/RedirectEventFilter.java  |  3 -
 .../gv/egiz/slbinding/impl/TransformsInfoType.java |  8 ++
 .../at/gv/egiz/slbinding/impl/XMLContentType.java  |  9 +++
 27 files changed, 313 insertions(+), 83 deletions(-)
 create mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeTypes.java
 create mode 100644 bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/DataObjectInfo_Detached_LocRefContent.xml

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java
index 2e0cb331..c67699af 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java
@@ -180,6 +180,7 @@ public class AppletSecureViewer implements SecureViewer {
         byte[] hdi = hashDataInput.getValue();
         String mimeType = hashDataInput.getMimeType();
         String encoding = hashDataInput.getEncoding();
+        String filename = hashDataInput.getFilename();
 
         if (hdi == null) {
           throw new Exception("No hashdata input for reference " + signedRefId + " provided by service");
@@ -199,7 +200,7 @@ public class AppletSecureViewer implements SecureViewer {
           throw new DigestException("Bad digest value for reference " + signedRefId);
         }
 
-        verifiedHashDataInputs.add(new ByteArrayHashDataInput(hdi, signedRefId, mimeType, encoding));
+        verifiedHashDataInputs.add(new ByteArrayHashDataInput(hdi, signedRefId, mimeType, encoding, filename));
       }
     }
 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java
index 16024fcc..6af22815 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java
@@ -39,10 +39,14 @@ public class HyperlinkRenderer extends DefaultTableCellRenderer {
   @Override
   protected void setValue(Object value) {
     String hrefText;
-    if (renderReferenceId) {
-      hrefText = ((HashDataInput) value).getReferenceId();
+    if (((HashDataInput) value).getFilename() != null) {
+      hrefText = ((HashDataInput) value).getFilename();
     } else {
-      hrefText = ((HashDataInput) value).getMimeType();
+      if (renderReferenceId) {
+        hrefText = ((HashDataInput) value).getReferenceId();
+      } else {
+        hrefText = ((HashDataInput) value).getMimeType();
+      }
     }
     super.setText("<html><u>" + hrefText + "</u></html>");
     setForeground(BKUGUIFacade.HYPERLINK_COLOR);
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeFilter.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeFilter.java
index c0385dce..5d64eb4f 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeFilter.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeFilter.java
@@ -26,14 +26,6 @@ import javax.swing.filechooser.FileFilter;
  */
 class MimeFilter extends FileFilter {
 
-  private static final String MIMETYPE_DESC_XML = "mimetype.desc.xml";
-  private static final String MIMETYPE_DESC_HTML = "mimetype.desc.html";
-  private static final String MIMETYPE_DESC_XHTML = "mimetype.desc.xhtml";
-  private static final String MIMETYPE_DESC_TXT = "mimetype.desc.txt";
-  private static final String MIMETYPE_DESC_PDF = "mimetype.desc.pdf";
-  private static final String MIMETYPE_DESC_BIN = "mimetype.desc.bin";
-  private static final String MIMETYPE_DESC_UNKNOWN = "mimetype.desc.unknown";
-
   protected String mimeType;
   protected ResourceBundle messages;
 
@@ -48,21 +40,7 @@ class MimeFilter extends FileFilter {
     if (f.isDirectory()) {
       return true;
     }
-
-    String ext = getExtension(f);
-    if ("text/xml".equals(mimeType)) {
-      return "xml".equalsIgnoreCase(ext);
-    } else if ("text/html".equals(mimeType)) {
-      return "html".equalsIgnoreCase(ext) || "htm".equalsIgnoreCase(ext);
-    } else if ("application/xhtml+xml".equals(mimeType)) {
-      return "xhtml".equalsIgnoreCase(ext);
-    } else if ("text/plain".equals(mimeType)) {
-      return "txt".equalsIgnoreCase(ext);
-    } else if ("application/pdf".equals(mimeType)) {
-      return "pdf".equalsIgnoreCase(ext);
-    } else {
-      return true;
-    }
+    return MimeTypes.getExtension(mimeType).equalsIgnoreCase(getExtension(f));
   }
 
   private String getExtension(File f) {
@@ -78,38 +56,10 @@ class MimeFilter extends FileFilter {
 
   @Override
   public String getDescription() {
-    if ("text/xml".equals(mimeType)) {
-      return messages.getString(MIMETYPE_DESC_XML);
-    } else if ("text/html".equals(mimeType)) {
-      return messages.getString(MIMETYPE_DESC_HTML);
-    } else if ("application/xhtml+xml".equals(mimeType)) {
-      return messages.getString(MIMETYPE_DESC_XHTML);
-    } else if ("text/plain".equals(mimeType)) {
-      return messages.getString(MIMETYPE_DESC_TXT);
-    } else if ("application/pdf".equals(mimeType)) {
-      return messages.getString(MIMETYPE_DESC_PDF);
-    } else if ("application/octet-stream".equals(mimeType)) {
-      return messages.getString(MIMETYPE_DESC_BIN);
-    } else {
-      return messages.getString(MIMETYPE_DESC_UNKNOWN);
-    }
+    return messages.getString(MimeTypes.getDescriptionKey(mimeType));
   }
 
   public static String getExtension(String mimeType) {
-    if ("text/xml".equals(mimeType)) {
-      return ".xml";
-    } else if ("text/html".equals(mimeType)) {
-      return ".html";
-    } else if ("application/xhtml+xml".equals(mimeType)) {
-      return ".xhtml";
-    } else if ("text/plain".equals(mimeType)) {
-      return ".txt";
-    } else if ("application/pdf".equals(mimeType)) {
-      return ".pdf";
-    } else if ("application/octet-stream".equals(mimeType)) {
-      return ".bin";
-    } else {
-      return "";
-    }
+    return MimeTypes.getExtension(mimeType);
   }
 }
\ No newline at end of file
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeTypes.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeTypes.java
new file mode 100644
index 00000000..4500fa71
--- /dev/null
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/MimeTypes.java
@@ -0,0 +1,53 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package at.gv.egiz.bku.gui.viewer;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author clemens
+ */
+public class MimeTypes {
+
+  private static final Map<String , String> FILE_EXTENSIONS = new HashMap<String, String>() {{
+    put("application/msword", ".doc");
+    put("application/octet-stream", ".bin");
+    put("application/pdf", ".pdf");
+    put("application/xhtml+xml", ".xhtml");
+    put("text/html", ".html");
+    put("text/plain", ".txt");
+    put("text/xml", ".xml");
+  }};
+
+  private static final Map<String , String> DESCRIPTIONS = new HashMap<String, String>() {{
+    put("application/msword", "mimetype.desc.doc");
+    put("application/octet-stream", "mimetype.desc.bin");
+    put("application/pdf", "mimetype.desc.pdf");
+    put("application/xhtml+xml", "mimetype.desc.xhtml");
+    put("text/html", "mimetype.desc.html");
+    put("text/plain", "mimetype.desc.txt");
+    put("text/xml", "mimetype.desc.xml");
+  }};
+
+  public static String getExtension(String mimetype) {
+    if (FILE_EXTENSIONS.containsKey(mimetype)) {
+      return FILE_EXTENSIONS.get(mimetype);
+    }
+    return "";
+  }
+
+  /**
+   * @return bundle key to be resolved in message resource bundle
+   */
+  public static String getDescriptionKey(String mimetype) {
+    if (DESCRIPTIONS.containsKey(mimetype)) {
+      return DESCRIPTIONS.get(mimetype);
+    }
+    return "mimetype.desc.unknown";
+  }
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/SecureViewerSaveDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/SecureViewerSaveDialog.java
index 40133f95..3303d4ef 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/SecureViewerSaveDialog.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/SecureViewerSaveDialog.java
@@ -52,8 +52,9 @@ public class SecureViewerSaveDialog {
         String mimeType = hashDataInput.getMimeType();
         MimeFilter mimeFilter = new MimeFilter(mimeType, messages);
         fileDialog.setFileFilter(mimeFilter);
-        String filename = messages
-            .getString(BKUGUIFacade.SAVE_HASHDATAINPUT_PREFIX)
+        String filename = (hashDataInput.getFilename() != null) ?
+          hashDataInput.getFilename() :
+          messages.getString(BKUGUIFacade.SAVE_HASHDATAINPUT_PREFIX)
             + MimeFilter.getExtension(mimeType);
         fileDialog.setSelectedFile(new File(userHome, filename));
 
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java b/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
index 6ca9a0b2..b9416845 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/stal/impl/ByteArrayHashDataInput.java
@@ -36,8 +36,9 @@ public class ByteArrayHashDataInput implements HashDataInput {
     protected String id;
     protected String mimeType;
     protected String encoding;
+    protected String filename;
 
-    public ByteArrayHashDataInput(byte[] hashData, String id, String mimeType, String encoding) {
+    public ByteArrayHashDataInput(byte[] hashData, String id, String mimeType, String encoding, String filename) {
         if (hashData == null) {
             throw new NullPointerException("HashDataInput not provided.");
         }
@@ -45,6 +46,7 @@ public class ByteArrayHashDataInput implements HashDataInput {
         this.id = id;
         this.mimeType = mimeType;
         this.encoding = encoding;
+        this.filename = filename;
     }
     
     /**
@@ -96,5 +98,10 @@ public class ByteArrayHashDataInput implements HashDataInput {
     return encoding;
   }
 
+  @Override
+  public String getFilename() {
+    return filename;
+  }
+
     
 }
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 7135b561..3e483fc8 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -48,7 +48,7 @@ hashdatalink.tiny.focus=<html><a href=\"anzeige\">[Signaturdaten]</a></html>
 #verwenden sie bitte die von ihrem System zur Verf\u00FCgung gestellte {0} Anwendung. 
 hashdatalist=<html>{0} Signaturdaten:</html>
 hashdata.viewer=<html>Signaturdaten werden im Betrachter angezeigt
-unsupported.mimetype=<html>Signaturdaten k�nnen nicht angezeigt werden
+unsupported.mimetype=<html>Signaturdaten k\u00F6nnen nicht angezeigt werden
 retries.last=<html>Letzter Versuch!</html>
 retries=<html>Noch {0} Versuche</html>
 retries.pinpad.last=<html>Eingabe wiederholen, letzter Versuch!</html>
@@ -71,6 +71,7 @@ mimetype.desc.xhtml=XHTML-Dateien (.xhtml)
 mimetype.desc.txt=Textdateien (.txt)
 mimetype.desc.pdf=Adobe PDF-Dateien (.pdf)
 mimetype.desc.bin=Bin\u00E4rdateien (.bin)
+mimetype.desc.doc=Microsoft Word-Dateien (.doc)
 mimetype.desc.unknown=Alle Dateien (.*)
 save.hashdatainput.prefix=Signaturdaten
 alt.help=Hilfe
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index 6e89510e..c553bcb5 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -69,6 +69,7 @@ mimetype.desc.xhtml=XHTML-files (.xhtml)
 mimetype.desc.txt=Textfiles (.txt)
 mimetype.desc.pdf=Adobe PDF-files (.pdf)
 mimetype.desc.bin=Binary files (.bin)
+mimetype.desc.doc=Microsoft Word-files (.doc)
 mimetype.desc.unknown=All files (.*)
 save.hashdatainput.prefix=signaturedata
 alt.help=help
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 20654141..6e345ee3 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
@@ -85,25 +85,29 @@ public class BKUGUIWorker implements Runnable {
                 "Ich bin ein einfacher Text mit Umlauten: öäüßéç@€\n123\n456\n\tHello, world!\n\nlkjsd\nnksdjf".getBytes(), 
                 "ref-id-0000000000000000000000001", 
                 "text/plain", 
-                "UTF-8");
+                "UTF-8",
+                "file.txt");
         
         HashDataInput signedRef2 = new ByteArrayHashDataInput(
                 "<xml>HashDataInput_002</xml>".getBytes(), 
                 "ref-id-000000002", 
                 "application/xhtml+xml", 
-                "UTF-8");
+                "UTF-8",
+                "file.xhtml");
         
         HashDataInput signedRef3 = new ByteArrayHashDataInput(
                 "<xml>HashDataInput_003</xml>".getBytes(), 
                 "ref-id-000000003", 
                 "application/xhtml+xml", 
-                "UTF-8");
+                "UTF-8",
+                "file2.xhtml");
 
         HashDataInput signedRef4 = new ByteArrayHashDataInput(
                 "<xml>HashDataInput_004</xml>".getBytes(), 
                 "ref-id-000000004", 
                 "text/xml", 
-                "UTF-8");
+                "UTF-8",
+                "file.xml");
 
         //
         List<HashDataInput> signedRefs = new ArrayList();
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
index 131a344f..9bbc1b1a 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
@@ -66,7 +66,7 @@ public class SecureViewerDialogTest {
       String s = new String(bytes, "iso-8859-1");
       System.out.println("read iso-8859-1 bytes " + s);
 
-      secureViewer.setContent(new ByteArrayHashDataInput(s.getBytes("UTF-8"), "id-1", "text/plain", "iso-8859-1"));
+      secureViewer.setContent(new ByteArrayHashDataInput(s.getBytes("UTF-8"), "id-1", "text/plain", "iso-8859-1", "file.txt"));
 
     }
 
@@ -87,7 +87,7 @@ public class SecureViewerDialogTest {
       }
 
       System.out.println(data.toString());
-      secureViewer.setContent(new ByteArrayHashDataInput(data.toString().getBytes("UTF-8"), "id-1", "text/plain", "UTF-8"));
+      secureViewer.setContent(new ByteArrayHashDataInput(data.toString().getBytes("UTF-8"), "id-1", "text/plain", "UTF-8", "file.txt"));
 
     }
 
@@ -146,7 +146,7 @@ public class SecureViewerDialogTest {
 //    byte[] bytes2 = data.getBytes("cp1252");
 //    System.out.println(data + "\t" +  SMCCHelper.toString(bytes2));
 
-    secureViewer.setContent(new ByteArrayHashDataInput(data.toString().getBytes("UTF-8"), "id-1", "text/plain", "UTF-8"));
+    secureViewer.setContent(new ByteArrayHashDataInput(data.toString().getBytes("UTF-8"), "id-1", "text/plain", "UTF-8", "file.txt"));
 
     System.out.println("\n\n=============================\n");
 //
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index ed7f228c..c7c40982 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -263,7 +263,7 @@
                 <bindingFile>staltypes-custom.xml</bindingFile>
                 <bindingFile>cardchannel-custom.xml</bindingFile>
               </bindingFiles>
-              <wsdlDirectory>${basedir}/src/main/webapp/WEB-INF/wsdl</wsdlDirectory>
+              <!-- wsdlDirectory>${basedir}/src/main/webapp/WEB-INF/wsdl</wsdlDirectory-->
               <wsdlDirectory>${basedir}/src/main/wsdl</wsdlDirectory>
               <wsdlFiles>
                 <wsdlFile>stal-service.wsdl</wsdlFile>
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
index eab9bed5..c8ab280f 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
@@ -267,6 +267,7 @@ public class STALServiceImpl implements STALPortType {
             ref.setID(reqRefId);
             ref.setMimeType(reqHdi.getMimeType());
             ref.setEncoding(reqHdi.getEncoding());
+            ref.setFilename(reqHdi.getFilename());
             ref.setValue(baos.toByteArray());
             response.getReference().add(ref);
           } catch (IOException ex) {
diff --git a/BKUOnline/src/main/webapp/META-INF/context.xml b/BKUOnline/src/main/webapp/META-INF/context.xml
index f38215a1..2a2da79e 100644
--- a/BKUOnline/src/main/webapp/META-INF/context.xml
+++ b/BKUOnline/src/main/webapp/META-INF/context.xml
@@ -16,4 +16,4 @@
   limitations under the License.
 -->
 <!--Context path="/bkuonline"/-->
-<Context path=""/>
+<Context path="/bkuonline"/>
diff --git a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
index 2389e043..a420035f 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
+++ b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
@@ -151,6 +151,7 @@
               <attribute name="ID" type="string"/>
               <attribute name="MimeType" type="string" use="optional"/>
               <attribute name="Encoding" type="string" use="optional"/>
+              <attribute name="Filename" type="string" use="optional"/>
             </extension>
           </simpleContent>
         </complexType>
diff --git a/BKUOnline/src/main/wsdl/stal-service.xsd b/BKUOnline/src/main/wsdl/stal-service.xsd
index 870e2db6..177b9e7f 100644
--- a/BKUOnline/src/main/wsdl/stal-service.xsd
+++ b/BKUOnline/src/main/wsdl/stal-service.xsd
@@ -166,6 +166,7 @@
               <attribute name="ID" type="string"/>
               <attribute name="MimeType" type="string" use="optional"/>
               <attribute name="Encoding" type="string" use="optional"/>
+              <attribute name="Filename" type="string" use="optional"/>
             </extension>
           </simpleContent>
         </complexType>
diff --git a/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java b/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
index a1f3864e..741974eb 100644
--- a/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
+++ b/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
@@ -126,6 +126,12 @@ public class STALRequestBrokerTest {
             public String getEncoding() {
               return "UTF-8";
             }
+
+
+            @Override
+            public String getFilename() {
+                return "file.txt";
+            }
         };
         r1.setHashDataInput(Collections.singletonList(hdi));
         requests.add(r1);
@@ -172,6 +178,11 @@ public class STALRequestBrokerTest {
             public String getEncoding() {
               return "UTF-8";
             }
+
+            @Override
+            public String getFilename() {
+                return "file.txt";
+            }
         };
         r1.setHashDataInput(Collections.singletonList(hdi));
         requests.add(r1);
@@ -231,6 +242,11 @@ public class STALRequestBrokerTest {
             public String getEncoding() {
               return "UTF-8";
             }
+
+            @Override
+            public String getFilename() {
+                return "file.txt";
+            }
         };
         r1.setHashDataInput(Collections.singletonList(hdi));
         requests.add(r1);
@@ -259,6 +275,11 @@ public class STALRequestBrokerTest {
             public String getEncoding() {
               return "UTF-8";
             }
+
+            @Override
+            public String getFilename() {
+                return "file.xml";
+            }
         };
         r2.setHashDataInput(Collections.singletonList(hdi2));
         requests2.add(r2);
diff --git a/STAL/src/main/java/at/gv/egiz/stal/HashDataInput.java b/STAL/src/main/java/at/gv/egiz/stal/HashDataInput.java
index 62c25fc4..7092470c 100644
--- a/STAL/src/main/java/at/gv/egiz/stal/HashDataInput.java
+++ b/STAL/src/main/java/at/gv/egiz/stal/HashDataInput.java
@@ -31,6 +31,8 @@ public interface HashDataInput {
     
     public String getEncoding();
     
+    public String getFilename();
+    
     public InputStream getHashDataInput();
 
 }
diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputResponseType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputResponseType.java
index 7536d936..ad029757 100644
--- a/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputResponseType.java
+++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputResponseType.java
@@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlValue;
  *                 &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}string" />
  *                 &lt;attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
  *                 &lt;attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 &lt;attribute name="Filename" type="{http://www.w3.org/2001/XMLSchema}string" />
  *               &lt;/extension>
  *             &lt;/simpleContent>
  *           &lt;/complexType>
@@ -118,6 +119,7 @@ public class GetHashDataInputResponseType {
      *       &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}string" />
      *       &lt;attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
      *       &lt;attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       &lt;attribute name="Filename" type="{http://www.w3.org/2001/XMLSchema}string" />
      *     &lt;/extension>
      *   &lt;/simpleContent>
      * &lt;/complexType>
@@ -139,6 +141,8 @@ public class GetHashDataInputResponseType {
         protected String mimeType;
         @XmlAttribute(name = "Encoding")
         protected String encoding;
+        @XmlAttribute(name = "Filename")
+        protected String filename;
 
         /**
          * Gets the value of the value property.
@@ -234,6 +238,30 @@ public class GetHashDataInputResponseType {
             this.encoding = value;
         }
 
+        /**
+         * Gets the value of the filename property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link String }
+         *     
+         */
+        public String getFilename() {
+            return filename;
+        }
+
+        /**
+         * Sets the value of the filename property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link String }
+         *     
+         */
+        public void setFilename(String value) {
+            this.filename = value;
+        }
+
     }
 
 }
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java
index b1906666..e39addb5 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java
@@ -339,6 +339,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
 						// process headers and request
 						setHTTPHeaders(dataUrlResponse.getResponseHeaders());
 						consumeRequestStream(dataUrlResponse.getStream());
+						//TODO check for bindingProcessorError
 						closeDataUrlConnection();
 						srcContex.setSourceCertificate(conn.getServerCertificate());
 						srcContex.setSourceIsDataURL(true);
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/DataObjectHashDataInput.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/DataObjectHashDataInput.java
index 1a9b56fb..57358ba0 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/DataObjectHashDataInput.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/DataObjectHashDataInput.java
@@ -50,4 +50,10 @@ public class DataObjectHashDataInput implements HashDataInput {
       return HttpUtil.getCharset(dataObject.getMimeType(), false);
     }
 
+    @Override
+    public String getFilename() {
+      //TODO obtain filename from dataObject, if not set return null or get filename (extension!) from mimetype
+      return dataObject.getFilename();
+    }
+
 }
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
index 89124d16..6e84081e 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
@@ -49,8 +49,6 @@ import javax.xml.crypto.dsig.spec.XPathType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.w3._2000._09.xmldsig_.TransformType;
-import org.w3._2000._09.xmldsig_.TransformsType;
 import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
@@ -71,6 +69,7 @@ import at.buergerkarte.namespaces.securitylayer._1.DataObjectInfoType;
 import at.buergerkarte.namespaces.securitylayer._1.MetaInfoType;
 import at.buergerkarte.namespaces.securitylayer._1.TransformsInfoType;
 import at.gv.egiz.bku.binding.HttpUtil;
+import at.gv.egiz.bku.gui.viewer.MimeTypes;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
 import at.gv.egiz.bku.slexceptions.SLRequestException;
 import at.gv.egiz.bku.slexceptions.SLRuntimeException;
@@ -81,11 +80,11 @@ import at.gv.egiz.bku.viewer.ValidationException;
 import at.gv.egiz.bku.viewer.Validator;
 import at.gv.egiz.bku.viewer.ValidatorFactory;
 import at.gv.egiz.dom.DOMUtils;
-import at.gv.egiz.marshal.NamespacePrefixMapperImpl;
 import at.gv.egiz.slbinding.impl.XMLContentType;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
 
 /**
  * This class represents a <code>DataObject</code> of an XML-Signature
@@ -184,7 +183,9 @@ public class DataObject {
    * An optional description of the digest input.
    */
   private String description;
-  
+
+  private String filename;
+
   /**
    * Creates a new instance.
    * 
@@ -230,6 +231,10 @@ public class DataObject {
     return mimeType;
   }
 
+  public String getFilename() {
+    return filename;
+  }
+
   /**
    * @return the description
    */
@@ -336,7 +341,74 @@ public class DataObject {
       
     } 
     // other values are not allowed by the schema and are therefore ignored
-    
+
+    this.filename = deriveFilename();
+  }
+
+  /**
+   * Extract filename from reference URI
+   * or propose reference Id with an apropriate (mime-type) file extension
+   *
+   * @return if neither reference nor id can be extracted return null (or data.extension?)
+   */
+  private String deriveFilename() {
+      
+    String filename = null;
+
+    if (reference != null) {
+      if (reference.getURI() != null && !"".equals(reference.getURI())) {
+        try {
+          log.info("deriving filename from reference URI " + reference.getURI());
+          URI refURI = new URI(reference.getURI());
+
+          if (refURI.isOpaque()) {
+            // could check scheme component, but also allow other schemes (e.g. testlocal)
+            log.trace("opaque reference URI, use scheme-specific part as filename");
+            filename = refURI.getSchemeSpecificPart();
+            if (!hasExtension(filename)) {
+              filename += MimeTypes.getExtension(mimeType);
+            }
+          // else hierarchical URI:
+          // for shorthand xpointer use fragment as filename,
+          // for any other xpointer use reference Id and
+          // for any other hierarchical (absolute or relative) use filename (ignore fragment, see xmldsig section 4.3.3.2: fragments not recommendet)
+          } else if ("".equals(refURI.getPath()) && 
+                  refURI.getFragment() != null &&
+                  refURI.getFragment().indexOf('(') < 0) { // exclude (schemebased) xpointer expressions
+            log.trace("fragment (shorthand xpointer) URI, use fragment as filename");
+            filename = refURI.getFragment();
+            if(!hasExtension(filename)) {
+              filename += MimeTypes.getExtension(mimeType);
+            }
+          } else if (!"".equals(refURI.getPath())) {
+            log.trace("hierarchical URI with path component, use path as filename");
+            File refFile = new File(refURI.getPath());
+            filename = refFile.getName();
+            if(!hasExtension(filename)) {
+              filename += MimeTypes.getExtension(mimeType);
+            }
+          } else {
+            log.info("failed to derive filename from URI '" + refURI + "', derive filename from reference ID");
+            filename = reference.getId() + MimeTypes.getExtension(mimeType);
+          }
+        } catch (URISyntaxException ex) {
+          log.error("failed to derive filename from invalid URI " + ex.getMessage());
+          filename = reference.getId() + MimeTypes.getExtension(mimeType);
+        }
+      } else {
+        log.info("same-document URI, derive filename from reference ID");
+        filename = reference.getId() + MimeTypes.getExtension(mimeType);
+      }
+    } else {
+      log.error("failed to derive filename, no reference created");
+    }
+    log.debug("derived filename for reference " + reference.getId() + ": " + filename);
+    return filename;
+  }
+
+  private static boolean hasExtension(String filename) {
+    int extDelimiterInd = filename.lastIndexOf('.');
+    return extDelimiterInd >= 0 && extDelimiterInd >= filename.length() - 4;
   }
 
   private byte[] getTransformsBytes(at.gv.egiz.slbinding.impl.TransformsInfoType ti) {
diff --git a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
index 7ce7b42d..ccd29e85 100644
--- a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
+++ b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
@@ -443,8 +443,11 @@ public class SignatureTest {
 
   @SuppressWarnings("unchecked")
   @Test
+
   public void testDataObject_XMLContent_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
+    System.out.println("\n ****************** testDataObject_XMLContent_1 \n");
+
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_XMLContent_1.xml");
     
     Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
@@ -485,6 +488,8 @@ public class SignatureTest {
   @Test
   public void testDataObject_XMLContent_2() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
+    System.out.println("\n ****************** testDataObject_XMLContent_2 \n");
+
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_XMLContent_2.xml");
     
     Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
@@ -526,6 +531,8 @@ public class SignatureTest {
   @Test
   public void testDataObject_LocRefContent_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
+    System.out.println("\n ****************** testDataObject_LocRefContent_1 \n");
+
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_LocRefContent_1.xml");
     
     Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
@@ -535,7 +542,7 @@ public class SignatureTest {
     }
     
     signature.buildXMLSignature();
-    
+
     signAndMarshalSignature(signature);
 
     List<Reference> references = signature.getReferences();
@@ -564,6 +571,8 @@ public class SignatureTest {
   @Test
   public void testDataObject_LocRefContent_2() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
+    System.out.println("\n ****************** testDataObject_LocRefContent_2 \n");
+
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_LocRefContent_2.xml");
     
     Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
@@ -602,6 +611,8 @@ public class SignatureTest {
   @Test
   public void testDataObject_Reference_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
+    System.out.println("\n ****************** testDataObject_Reference_1 \n");
+
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Reference_1.xml");
     
     Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
@@ -640,6 +651,8 @@ public class SignatureTest {
   @Test
   public void testDataObject_Detached_1() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
+    System.out.println("\n ****************** testDataObject_Detached_1 \n");
+
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Detached_1.xml");
     
     Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
@@ -671,6 +684,8 @@ public class SignatureTest {
   @Test
   public void testDataObject_Detached_Base64Content() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
 
+    System.out.println("\n ****************** testDataObject_Detached_Base64Content \n");
+
     List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Detached_Base64Content.xml");
     
     Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
@@ -698,6 +713,39 @@ public class SignatureTest {
     
   }
   
+  @SuppressWarnings("unchecked")
+  @Test
+  public void testDataObject_Detached_LocRefContent() throws JAXBException, SLCommandException, XMLStreamException, SLRequestException, MarshalException, XMLSignatureException, SLViewerException {
+
+    System.out.println("\n ****************** testDataObject_Detached_LocRefContent \n");
+
+    List<DataObjectInfoType> dataObjectInfos = unmarshalDataObjectInfo("DataObjectInfo_Detached_LocRefContent.xml");
+
+    Signature signature = new Signature(null, new IdValueFactoryImpl(), new AlgorithmMethodFactoryImpl());
+
+    for (DataObjectInfoType dataObjectInfo : dataObjectInfos) {
+      signature.addDataObject(dataObjectInfo);
+    }
+
+    signature.buildXMLSignature();
+
+    signAndMarshalSignature(signature);
+
+    List<Reference> references = signature.getReferences();
+    assertTrue(references.size() == 2);
+
+    Reference reference = references.get(0);
+    assertNotNull(reference.getId());
+
+    List<Transform> transforms = reference.getTransforms();
+    assertTrue(transforms.size() == 0);
+
+    List<XMLObject> objects = signature.getXMLObjects();
+    assertNotNull(objects);
+    assertTrue(objects.size() == 1);
+
+  }
+
   //
   //
   // TransformsInfo
diff --git a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/DataObjectInfo_Detached_LocRefContent.xml b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/DataObjectInfo_Detached_LocRefContent.xml
new file mode 100644
index 00000000..75f45ff0
--- /dev/null
+++ b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/DataObjectInfo_Detached_LocRefContent.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sl:CreateXMLSignatureRequest xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+  <sl:DataObjectInfo Structure="detached">
+    <sl:DataObject Reference="http://example.com/path/filenameNoExt#fragmentNoExt">
+    	<sl:LocRefContent>testlocal:DataObject1.bin</sl:LocRefContent>
+    </sl:DataObject>
+    <sl:TransformsInfo>
+      <sl:FinalDataMetaInfo>
+      	<sl:MimeType>application/octet-stream</sl:MimeType>
+      </sl:FinalDataMetaInfo>
+    </sl:TransformsInfo>
+  </sl:DataObjectInfo>
+</sl:CreateXMLSignatureRequest>
\ No newline at end of file
diff --git a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/DataObjectInfo_LocRefContent_2.xml b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/DataObjectInfo_LocRefContent_2.xml
index 852c115f..a94f51b6 100644
--- a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/DataObjectInfo_LocRefContent_2.xml
+++ b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/DataObjectInfo_LocRefContent_2.xml
@@ -6,7 +6,7 @@
     </sl:DataObject>
     <sl:TransformsInfo>
       <sl:FinalDataMetaInfo>
-      	<sl:MimeType>application/octetstream</sl:MimeType>
+      	<sl:MimeType>application/octet-stream</sl:MimeType>
       </sl:FinalDataMetaInfo>
     </sl:TransformsInfo>
   </sl:DataObjectInfo>
diff --git a/utils/src/main/java/at/gv/egiz/slbinding/RedirectEventFilter.java b/utils/src/main/java/at/gv/egiz/slbinding/RedirectEventFilter.java
index 14c5ba48..5fe84aae 100644
--- a/utils/src/main/java/at/gv/egiz/slbinding/RedirectEventFilter.java
+++ b/utils/src/main/java/at/gv/egiz/slbinding/RedirectEventFilter.java
@@ -153,9 +153,6 @@ public class RedirectEventFilter implements EventFilter {
 
   private void redirectEvent(XMLEvent event) {
     try {
-      if (log.isTraceEnabled()) {
-        log.trace("redirecting StAX event " + event);
-      }
       redirectWriter.add(event);
     } catch (XMLStreamException ex) {
       ex.printStackTrace();
diff --git a/utils/src/main/java/at/gv/egiz/slbinding/impl/TransformsInfoType.java b/utils/src/main/java/at/gv/egiz/slbinding/impl/TransformsInfoType.java
index 1180e9fa..b1de9406 100644
--- a/utils/src/main/java/at/gv/egiz/slbinding/impl/TransformsInfoType.java
+++ b/utils/src/main/java/at/gv/egiz/slbinding/impl/TransformsInfoType.java
@@ -22,6 +22,7 @@ package at.gv.egiz.slbinding.impl;
 
 import at.gv.egiz.slbinding.*;
 import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.HashSet;
 import java.util.Set;
 import javax.xml.bind.annotation.XmlTransient;
@@ -62,6 +63,13 @@ public class TransformsInfoType extends at.buergerkarte.namespaces.securitylayer
         log.debug("disabling event redirection for TransformsInfoType");
         filter.flushRedirectStream();
         filter.setRedirectStream(null);
+        if (log.isDebugEnabled()) {
+          try {
+            log.debug("redirected events (UTF-8): " + redirectOS.toString("UTF-8"));
+          } catch (UnsupportedEncodingException ex) {
+            log.debug("failed to log redirected events", ex);
+          }
+        }
     }
 
     @Override
diff --git a/utils/src/main/java/at/gv/egiz/slbinding/impl/XMLContentType.java b/utils/src/main/java/at/gv/egiz/slbinding/impl/XMLContentType.java
index eb147f88..fd52e378 100644
--- a/utils/src/main/java/at/gv/egiz/slbinding/impl/XMLContentType.java
+++ b/utils/src/main/java/at/gv/egiz/slbinding/impl/XMLContentType.java
@@ -23,6 +23,8 @@ package at.gv.egiz.slbinding.impl;
 import at.gv.egiz.slbinding.RedirectCallback;
 import at.gv.egiz.slbinding.RedirectEventFilter;
 import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
+
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.stream.XMLStreamException;
 import org.apache.commons.logging.Log;
@@ -51,6 +53,13 @@ public class XMLContentType extends at.buergerkarte.namespaces.securitylayer._1.
         log.debug("disabling event redirection for XMLContentType");
         filter.flushRedirectStream();
         filter.setRedirectStream(null);
+        if (log.isDebugEnabled()) {
+          try {
+            log.debug("redirected events (UTF-8): " + redirectOS.toString("UTF-8"));
+          } catch (UnsupportedEncodingException ex) {
+            log.debug("failed to log redirected events", ex);
+          }
+        }
     }
 
     @Override
-- 
cgit v1.2.3


From ceeaeb1790d1ed1ef9565f7c47e8bf247a83f28c Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 2 Dec 2009 09:19:40 +0000
Subject: [maven-release-plugin] prepare release mocca-1.2.9

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@558 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 14 +++++++-------
 BKUAppletExt/pom.xml    | 16 ++++++++--------
 BKUCertificates/pom.xml |  4 ++--
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUFonts/pom.xml        |  4 ++--
 BKUGuiExt/pom.xml       |  8 ++++----
 BKUHelp/pom.xml         |  4 ++--
 BKULocal/pom.xml        | 26 +++++++++++++-------------
 BKUOnline/pom.xml       | 28 ++++++++++++++--------------
 BKUViewer/pom.xml       |  8 ++++----
 BKUWebStart/pom.xml     |  6 +++---
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  4 ++--
 pom.xml                 | 10 +++++-----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 smccSTALExt/pom.xml     |  4 ++--
 utils/pom.xml           |  4 ++--
 21 files changed, 93 insertions(+), 93 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 0c6768aa..3bafd8c9 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.9-SNAPSHOT</version>
+  <version>1.2.9</version>
   <build>
     <plugins>
       <plugin>
@@ -118,27 +118,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 84c4844c..cb831cff 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.9-SNAPSHOT</version>
+        <version>1.2.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.9-SNAPSHOT</version>
+            <version>1.2.9</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.9-SNAPSHOT</version>
+            <version>1.2.9</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.9-SNAPSHOT</version>
+            <version>1.2.9</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.9-SNAPSHOT</version>
+            <version>1.2.9</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.9-SNAPSHOT</version>
+            <version>1.2.9</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.9-SNAPSHOT</version>
+            <version>1.2.9</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 14cd84bf..4313dbb1 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.1</version>
   <name>BKU Certificates</name>
 
   <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index e077401f..453a34ae 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.9-SNAPSHOT</version>
+        <version>1.2.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.9-SNAPSHOT</version>
+            <version>1.2.9</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.9-SNAPSHOT</version>
+            <version>1.2.9</version>
             <scope>compile</scope>
         </dependency>
         <!-- see BKUFonts.pom
diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml
index 8a9a5ec0..8a43f504 100644
--- a/BKUFonts/pom.xml
+++ b/BKUFonts/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUFonts</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.1</version>
   <name>BKU Fonts</name>
   <description>
     This module is used in validator(s) and viewer and is a direct dependency of
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 29e01aed..ccf1567f 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.9-SNAPSHOT</version>
+  <version>1.2.9</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 791909a6..31b61e04 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.2.9-SNAPSHOT</version>
+  <version>1.2.9</version>
   <name>BKU Help</name>
   <build>
     <resources>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 7f7002fe..87d4d9a3 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.9-SNAPSHOT</version>
+		<version>1.2.9</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.9-SNAPSHOT</version>
+	<version>1.2.9</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -72,42 +72,42 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.9-SNAPSHOT</version>
+			<version>1.2.9</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.9-SNAPSHOT</version>
+			<version>1.2.9</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.9-SNAPSHOT</version>
+			<version>1.2.9</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.9-SNAPSHOT</version>
+			<version>1.2.9</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 018e99ab..a482736e 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.9-SNAPSHOT</version>
+  <version>1.2.9</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -28,22 +28,22 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -67,13 +67,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -117,13 +117,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
       <scope>provided</scope>
     </dependency>
     <!--
@@ -143,9 +143,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index c582767e..06208a84 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.9-SNAPSHOT</version>
+		<version>1.2.9</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.9-SNAPSHOT</version>
+	<version>1.2.9</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.9-SNAPSHOT</version>
+			<version>1.2.9</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -42,7 +42,7 @@
 	 <dependency>
 	  <groupId>at.gv.egiz</groupId>
 	  <artifactId>BKUFonts</artifactId>
-	  <version>1.1-SNAPSHOT</version>
+	  <version>1.1</version>
 	 </dependency>
 	</dependencies>
 </project>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 1c5c3935..2eebdc96 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.9-SNAPSHOT</version>
+  <version>1.2.9</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -230,7 +230,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCertificates</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 8fe1c263..aacbe4ab 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.9-SNAPSHOT</version>
+        <version>1.2.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 300a6865..da411749 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.9-SNAPSHOT</version>
+  <version>1.2.9</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 8133df51..46026241 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.9-SNAPSHOT</version>
+        <version>1.2.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.9-SNAPSHOT</version>
+            <version>1.2.9</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index c5799274..a49011ef 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.9-SNAPSHOT</version>
+  <version>1.2.9</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.9-SNAPSHOT</version>
+      <version>1.2.9</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 53dfbf46..b859cc60 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.9-SNAPSHOT</version>
+		<version>1.2.9</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.9-SNAPSHOT</version>
+	<version>1.2.9</version>
 
 	<build>
 		<plugins>
diff --git a/pom.xml b/pom.xml
index 829b6bf3..8f97c46f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.9-SNAPSHOT</version>
+  <version>1.2.9</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -48,9 +48,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -250,7 +250,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.9-SNAPSHOT</version>
+        <version>1.2.9</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index a47b2f7c..ac80b122 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.9-SNAPSHOT</version>
+  <version>1.2.9</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 441c4dcd..dd2142b3 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.9-SNAPSHOT</version>
+        <version>1.2.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.9-SNAPSHOT</version>
+            <version>1.2.9</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.9-SNAPSHOT</version>
+            <version>1.2.9</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.9-SNAPSHOT</version>
+            <version>1.2.9</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index 6224eeee..dbd6b4c5 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9-SNAPSHOT</version>
+    <version>1.2.9</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.9-SNAPSHOT</version>
+  <version>1.2.9</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 353c7fc2..3588ee83 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.9-SNAPSHOT</version>
+		<version>1.2.9</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.9-SNAPSHOT</version>
+	<version>1.2.9</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From f03ce51929e344a92d04aeb4bba473ae47a913b2 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 2 Dec 2009 09:23:50 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@560 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 14 +++++++-------
 BKUAppletExt/pom.xml    | 16 ++++++++--------
 BKUCertificates/pom.xml |  4 ++--
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUFonts/pom.xml        |  4 ++--
 BKUGuiExt/pom.xml       |  8 ++++----
 BKUHelp/pom.xml         |  4 ++--
 BKULocal/pom.xml        | 26 +++++++++++++-------------
 BKUOnline/pom.xml       | 28 ++++++++++++++--------------
 BKUViewer/pom.xml       |  8 ++++----
 BKUWebStart/pom.xml     |  6 +++---
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  4 ++--
 pom.xml                 | 10 +++++-----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 smccSTALExt/pom.xml     |  4 ++--
 utils/pom.xml           |  4 ++--
 21 files changed, 93 insertions(+), 93 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 3bafd8c9..402aea02 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.9</version>
+  <version>1.2.10-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -118,27 +118,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index cb831cff..95ebcab5 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.9</version>
+        <version>1.2.10-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.9</version>
+            <version>1.2.10-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.9</version>
+            <version>1.2.10-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.9</version>
+            <version>1.2.10-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.9</version>
+            <version>1.2.10-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.9</version>
+            <version>1.2.10-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.9</version>
+            <version>1.2.10-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 4313dbb1..7d6cdc82 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
-  <version>1.1</version>
+  <version>1.2-SNAPSHOT</version>
   <name>BKU Certificates</name>
 
   <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 453a34ae..88bb48c1 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.9</version>
+        <version>1.2.10-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.9</version>
+            <version>1.2.10-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.9</version>
+            <version>1.2.10-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <!-- see BKUFonts.pom
diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml
index 8a43f504..40d38a3d 100644
--- a/BKUFonts/pom.xml
+++ b/BKUFonts/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUFonts</artifactId>
-  <version>1.1</version>
+  <version>1.2-SNAPSHOT</version>
   <name>BKU Fonts</name>
   <description>
     This module is used in validator(s) and viewer and is a direct dependency of
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index ccf1567f..1d918331 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.9</version>
+  <version>1.2.10-SNAPSHOT</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 31b61e04..f526dccc 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.2.9</version>
+  <version>1.2.10-SNAPSHOT</version>
   <name>BKU Help</name>
   <build>
     <resources>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 87d4d9a3..3b1e6873 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.9</version>
+		<version>1.2.10-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.9</version>
+	<version>1.2.10-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -72,42 +72,42 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.9</version>
+			<version>1.2.10-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.9</version>
+			<version>1.2.10-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.9</version>
+			<version>1.2.10-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.9</version>
+			<version>1.2.10-SNAPSHOT</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index a482736e..ec8ca282 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.9</version>
+  <version>1.2.10-SNAPSHOT</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -28,22 +28,22 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.1</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -67,13 +67,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -117,13 +117,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <!--
@@ -143,9 +143,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 06208a84..5e6d6778 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.9</version>
+		<version>1.2.10-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.9</version>
+	<version>1.2.10-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.9</version>
+			<version>1.2.10-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -42,7 +42,7 @@
 	 <dependency>
 	  <groupId>at.gv.egiz</groupId>
 	  <artifactId>BKUFonts</artifactId>
-	  <version>1.1</version>
+	  <version>1.2-SNAPSHOT</version>
 	 </dependency>
 	</dependencies>
 </project>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 2eebdc96..9592235b 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.9</version>
+  <version>1.2.10-SNAPSHOT</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -230,7 +230,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCertificates</artifactId>
-      <version>1.1</version>
+      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index aacbe4ab..965eff0e 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.9</version>
+        <version>1.2.10-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index da411749..4a88f02e 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.9</version>
+  <version>1.2.10-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 46026241..845349b6 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.9</version>
+        <version>1.2.10-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.9</version>
+            <version>1.2.10-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index a49011ef..c4f44f8a 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.9</version>
+  <version>1.2.10-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.9</version>
+      <version>1.2.10-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index b859cc60..5e0702e4 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.9</version>
+		<version>1.2.10-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.9</version>
+	<version>1.2.10-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/pom.xml b/pom.xml
index 8f97c46f..2b1cbad4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.9</version>
+  <version>1.2.10-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -48,9 +48,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.9</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -250,7 +250,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.9</version>
+        <version>1.2.10-SNAPSHOT</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index ac80b122..2222e62d 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.9</version>
+  <version>1.2.10-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index dd2142b3..bdc9e5bc 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.9</version>
+        <version>1.2.10-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.9</version>
+            <version>1.2.10-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.9</version>
+            <version>1.2.10-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.9</version>
+            <version>1.2.10-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index dbd6b4c5..201735eb 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.9</version>
+    <version>1.2.10-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.9</version>
+  <version>1.2.10-SNAPSHOT</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 3588ee83..fc44d3c8 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.9</version>
+		<version>1.2.10-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.9</version>
+	<version>1.2.10-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 3da4655d011dfc2f04f9e4ac28b38aee42d01bc0 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 5 Jan 2010 10:06:47 +0000
Subject: Features [#437] Handle pinpad [64:03] response apdu correctly [#445]
 pin entry feedback for VERIFY_PIN_START/FINISH [#471] Provide SecureViewer
 Link before Pinpad PinEntry timeout starts

Bugs
[#479] PIN Managment Applet allows unmatching new pin and pin confirmation
[#480] PIN Management displays blocked PINs as ACTIVE
[#486] Not possible to select 3 times in series the same item from signedReferencesList for display in secureViewer
[#506] change pin dialog (gui) issues
[#508] e-card G3 PIN activation (with TransportPIN) not supported
[#509] closing secure viewer window (WINDOW_CLOSING) leaves "signature data is displayed in viewer" dialog in applet


git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@565 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java |  28 +-
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 765 +++++++++------------
 .../main/java/at/gv/egiz/bku/gui/PinDocument.java  | 125 +---
 .../at/gv/egiz/bku/gui/SecureViewerDialog.java     | 118 ++--
 .../at/gv/egiz/bku/gui/Messages.properties         |   9 +-
 .../at/gv/egiz/bku/gui/Messages_en.properties      |   9 +-
 .../test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java |  13 +-
 .../at/gv/egiz/bku/gui/ComparePinDocument.java     | 102 +++
 .../at/gv/egiz/bku/gui/ExtendedPinDocument.java    | 108 +++
 .../java/at/gv/egiz/bku/gui/PINManagementGUI.java  | 163 +++--
 .../at/gv/egiz/bku/gui/PINManagementGUIFacade.java |  66 +-
 .../gv/egiz/bku/gui/ActivationMessages.properties  |  36 +-
 .../egiz/bku/gui/ActivationMessages_en.properties  |  34 +-
 BKUOnline/src/main/resources/log4j.properties      |   2 +-
 BKUOnline/src/main/webapp/META-INF/context.xml     |   2 +-
 smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java   |  44 +-
 .../at/gv/egiz/smcc/AbstractSignatureCard.java     |  14 +-
 smcc/src/main/java/at/gv/egiz/smcc/BELPICCard.java |  11 +-
 .../java/at/gv/egiz/smcc/ChangePINProvider.java    |  36 -
 smcc/src/main/java/at/gv/egiz/smcc/ITCard.java     |  11 +-
 .../at/gv/egiz/smcc/PINConfirmationException.java  |  19 -
 .../java/at/gv/egiz/smcc/PINFormatException.java   |  19 -
 .../java/at/gv/egiz/smcc/PINMgmtSignatureCard.java |  11 +-
 .../src/main/java/at/gv/egiz/smcc/PINProvider.java |  45 --
 .../at/gv/egiz/smcc/ResetRetryCounterAPDUSpec.java |  38 +
 .../src/main/java/at/gv/egiz/smcc/STARCOSCard.java | 208 +++---
 smcc/src/main/java/at/gv/egiz/smcc/SWCard.java     | 106 +--
 .../main/java/at/gv/egiz/smcc/SignatureCard.java   |   9 +-
 .../java/at/gv/egiz/smcc/pin/gui/ModifyPINGUI.java |  36 +
 .../at/gv/egiz/smcc/pin/gui/ModifyPINProvider.java |  48 ++
 .../main/java/at/gv/egiz/smcc/pin/gui/PINGUI.java  |  42 ++
 .../java/at/gv/egiz/smcc/pin/gui/PINProvider.java  |  49 ++
 .../java/at/gv/egiz/smcc/reader/CardReader.java    |  92 +++
 .../at/gv/egiz/smcc/reader/DefaultCardReader.java  | 106 +++
 .../at/gv/egiz/smcc/reader/PinpadCardReader.java   | 703 +++++++++++++++++++
 .../java/at/gv/egiz/smcc/reader/ReaderFactory.java | 128 ++++
 .../test/java/at/gv/egiz/smcc/AbstractAppl.java    |   1 +
 smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java   |  14 +-
 smcc/src/test/java/at/gv/egiz/smcc/CardTest.java   | 171 +----
 smcc/src/test/java/at/gv/egiz/smcc/PIN.java        |  10 +-
 .../test/java/at/gv/egiz/smcc/acos/A03ApplDEC.java |   2 +-
 .../java/at/gv/egiz/smcc/acos/A03CardEmul.java     |   7 +-
 .../java/at/gv/egiz/smcc/acos/A03CardTest.java     |   9 +-
 .../java/at/gv/egiz/smcc/acos/A04CardEmul.java     |   7 +-
 .../java/at/gv/egiz/smcc/acos/A04CardTest.java     |  12 +-
 .../java/at/gv/egiz/smcc/acos/ACOSApplDEC.java     |   2 +-
 .../java/at/gv/egiz/smcc/acos/ACOSApplSIG.java     |   2 +-
 .../java/at/gv/egiz/smcc/acos/ACOSCardTest.java    |  21 +-
 .../egiz/smcc/pin/gui/CancelChangePINProvider.java |  39 ++
 .../at/gv/egiz/smcc/pin/gui/CancelPINProvider.java |  29 +
 .../at/gv/egiz/smcc/pin/gui/ChangePINProvider.java |  49 ++
 .../at/gv/egiz/smcc/pin/gui/DummyChangePINGUI.java |  68 ++
 .../java/at/gv/egiz/smcc/pin/gui/DummyPINGUI.java  |  48 ++
 .../gv/egiz/smcc/pin/gui/InterruptPINProvider.java |  34 +
 .../smcc/pin/gui/InvalidChangePINProvider.java     |  56 ++
 .../gv/egiz/smcc/pin/gui/InvalidPINProvider.java   |  48 ++
 .../gv/egiz/smcc/pin/gui/SMCCTestPINProvider.java  |  43 ++
 .../java/at/gv/egiz/smcc/starcos/STARCOSAppl.java  |  23 -
 .../starcos/STARCOSApplGewoehnlicheSignatur.java   |  27 +-
 .../gv/egiz/smcc/starcos/STARCOSApplInfobox.java   |   5 +
 .../smcc/starcos/STARCOSApplSichereSignatur.java   |  36 +-
 .../egiz/smcc/starcos/STARCOSCardChannelEmul.java  | 105 ++-
 .../at/gv/egiz/smcc/starcos/STARCOSCardEmul.java   |  24 +-
 .../at/gv/egiz/smcc/starcos/STARCOSCardTest.java   | 132 ++--
 .../smcc/starcos/STARCOSG3CardChannelEmul.java     |  46 ++
 .../at/gv/egiz/smcc/starcos/STARCOSG3CardEmul.java |  57 ++
 .../at/gv/egiz/smcc/starcos/STARCOSG3CardTest.java | 119 ++++
 smccSTAL/src/main/java/META-INF/MANIFEST.MF        |   3 -
 .../gv/egiz/bku/pin/gui/AbstractPINProvider.java   |  60 ++
 .../java/at/gv/egiz/bku/pin/gui/SignPINGUI.java    | 136 ++++
 .../at/gv/egiz/bku/pin/gui/SignPINProvider.java    | 105 +++
 .../java/at/gv/egiz/bku/pin/gui/VerifyPINGUI.java  |  76 ++
 .../at/gv/egiz/bku/pin/gui/VerifyPINProvider.java  |  72 ++
 .../gv/egiz/bku/smccstal/AbstractPINProvider.java  |  67 --
 .../bku/smccstal/InfoBoxReadRequestHandler.java    |   9 +-
 .../gv/egiz/bku/smccstal/PINProviderFactory.java   | 327 ---------
 .../gv/egiz/bku/smccstal/SignRequestHandler.java   |   4 +-
 .../java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java |  13 +-
 .../at/gv/egiz/bku/pin/gui/ManagementPINGUI.java   |  88 +++
 .../gv/egiz/bku/pin/gui/ManagementPINProvider.java |  89 +++
 .../bku/smccstal/ManagementPINProviderFactory.java | 246 -------
 .../bku/smccstal/PINManagementRequestHandler.java  | 210 ++++--
 82 files changed, 4011 insertions(+), 2095 deletions(-)
 create mode 100644 BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ComparePinDocument.java
 create mode 100644 BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ExtendedPinDocument.java
 delete mode 100644 smcc/src/main/java/at/gv/egiz/smcc/ChangePINProvider.java
 delete mode 100644 smcc/src/main/java/at/gv/egiz/smcc/PINProvider.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/ResetRetryCounterAPDUSpec.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/pin/gui/ModifyPINGUI.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/pin/gui/ModifyPINProvider.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINGUI.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINProvider.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/reader/CardReader.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/reader/DefaultCardReader.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/reader/PinpadCardReader.java
 create mode 100644 smcc/src/main/java/at/gv/egiz/smcc/reader/ReaderFactory.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/pin/gui/CancelChangePINProvider.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/pin/gui/CancelPINProvider.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/pin/gui/ChangePINProvider.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/pin/gui/DummyChangePINGUI.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/pin/gui/DummyPINGUI.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/pin/gui/InterruptPINProvider.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/pin/gui/InvalidChangePINProvider.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/pin/gui/InvalidPINProvider.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/pin/gui/SMCCTestPINProvider.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardChannelEmul.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardEmul.java
 create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardTest.java
 delete mode 100644 smccSTAL/src/main/java/META-INF/MANIFEST.MF
 create mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/AbstractPINProvider.java
 create mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINGUI.java
 create mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINProvider.java
 create mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINGUI.java
 create mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINProvider.java
 delete mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java
 delete mode 100644 smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java
 create mode 100644 smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINGUI.java
 create mode 100644 smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINProvider.java
 delete mode 100644 smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/ManagementPINProviderFactory.java

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
index 91c91dcb..1e23c64c 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIFacade.java
@@ -16,7 +16,7 @@
  */
 package at.gv.egiz.bku.gui;
 
-import at.gv.egiz.stal.HashDataInput;
+  import at.gv.egiz.stal.HashDataInput;
 import at.gv.egiz.smcc.PINSpec;
 import java.awt.Color;
 import java.awt.event.ActionListener;
@@ -53,14 +53,15 @@ public interface BKUGUIFacade {
   public static final String TITLE_WELCOME = "title.welcome";
   public static final String TITLE_INSERTCARD = "title.insertcard";
   public static final String TITLE_CARD_NOT_SUPPORTED = "title.cardnotsupported";
-  public static final String TITLE_CARDPIN = "title.cardpin";
+  public static final String TITLE_VERIFY_PIN = "title.verify.pin";
   public static final String TITLE_SIGN = "title.sign";
+  public static final String TITLE_VERIFY_PINPAD = "title.verify.pinpad";
   public static final String TITLE_ERROR = "title.error";
   public static final String TITLE_WARNING = "title.warning";
   public static final String TITLE_ENTRY_TIMEOUT = "title.entry.timeout";
   public static final String TITLE_RETRY = "title.retry";
   public static final String TITLE_WAIT = "title.wait";
-  public static final String TITLE_HASHDATA = "title.hashdata";
+  public static final String TITLE_SIGNATURE_DATA = "title.signature.data";
   public static final String WINDOWTITLE_SAVE = "windowtitle.save";
   public static final String WINDOWTITLE_ERROR = "windowtitle.error";
   public static final String WINDOWTITLE_SAVEDIR = "windowtitle.savedir";
@@ -75,6 +76,7 @@ public interface BKUGUIFacade {
   public static final String MESSAGE_CARD_NOT_SUPPORTED = "cardnotsupported";
   public static final String MESSAGE_ENTERPIN = "enterpin";
   public static final String MESSAGE_ENTERPIN_PINPAD = "enterpin.pinpad";
+  public static final String MESSAGE_ENTERPIN_PINPAD_DIRECT = "enterpin.pinpad.direct";
   public static final String MESSAGE_HASHDATALINK = "hashdatalink";
   public static final String MESSAGE_HASHDATALINK_TINY = "hashdatalink.tiny";
   public static final String MESSAGE_HASHDATALINK_FOCUS = "hashdatalink.focus";
@@ -96,8 +98,9 @@ public interface BKUGUIFacade {
   public static final String HELP_WAIT = "help.wait";
   public static final String HELP_CARDNOTSUPPORTED = "help.cardnotsupported";
   public static final String HELP_INSERTCARD = "help.insertcard";
-  public static final String HELP_CARDPIN = "help.cardpin";
+  public static final String HELP_VERIFY_PIN = "help.cardpin";
   public static final String HELP_SIGNPIN = "help.signpin";
+  public static final String HELP_PINPAD = "help.pinpad";
   public static final String HELP_RETRY = "help.retry";
   public static final String HELP_HASHDATA = "help.hashdata";
   public static final String HELP_HASHDATALIST = "help.hashdatalist";
@@ -111,6 +114,18 @@ public interface BKUGUIFacade {
   public static final String SAVE_HASHDATAINPUT_PREFIX = "save.hashdatainput.prefix";
   public static final String ALT_HELP = "alt.help";
 
+  public void showEnterPINDirect(PINSpec spec, int retries);
+
+  public void showEnterPIN(PINSpec spec, int retries);
+
+  public void showSignatureDataDialog(PINSpec spec, ActionListener listener, String string, ActionListener aThis0, String string0, ActionListener aThis1, String string1);
+
+  public void correctionButtonPressed();
+
+  public void allKeysCleared();
+
+  public void validKeyPressed();
+
   public enum Style { tiny, simple, advanced };
     
   /**
@@ -119,7 +134,7 @@ public interface BKUGUIFacade {
    */
   public Locale getLocale();
 
-  public void showCardPINDialog(PINSpec pinSpec, int numRetries,
+  public void showVerifyPINDialog(PINSpec pinSpec, int numRetries,
           ActionListener okListener, String okCommand,
           ActionListener cancelListener, String cancelCommand);
 
@@ -128,9 +143,6 @@ public interface BKUGUIFacade {
           ActionListener cancelListener, String cancelCommand,
           ActionListener viewerListener, String viewerCommand);
 
-  public void showPinpadSignaturePINDialog(PINSpec pinSpec, int numRetries, 
-          ActionListener viewerListener, String viewerCommand);
-
   public char[] getPin();
 
   /**
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index baffb3fd..3fc631c3 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -93,6 +93,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
     protected JLabel switchFocusDummyLabel; 
     /** remember the pinfield to return to worker */
     protected JPasswordField pinField;
+    protected JPasswordField pinpadPINField;
 
     protected int buttonSize;
     
@@ -360,221 +361,27 @@ public class BKUGUIImpl implements BKUGUIFacade {
       return messages.containsKey(key);
     }
 
-//    @Override
-//    public void showWelcomeDialog() {
-//
-//      log.debug("scheduling welcome dialog");
-//
-//        SwingUtilities.invokeLater(new Runnable() {
-//
-//            @Override
-//            public void run() {
-//
-//              log.debug("show welcome dialog");
-//
-//                mainPanel.removeAll();
-//                buttonPanel.removeAll();
-//
-//                helpListener.setHelpTopic(HELP_WELCOME);
-//
-//                JLabel welcomeMsgLabel = new JLabel();
-//                welcomeMsgLabel.setFont(welcomeMsgLabel.getFont().deriveFont(welcomeMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-//
-//                if (renderHeaderPanel) {
-//                  titleLabel.setText(getMessage(TITLE_WELCOME));
-//                  welcomeMsgLabel.setText(getMessage(MESSAGE_WAIT));
-//                } else {
-//                  welcomeMsgLabel.setText(getMessage(TITLE_WELCOME));
-//                }
-//
-//                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-//                mainPanel.setLayout(mainPanelLayout);
-//
-//                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
-//                        .addComponent(welcomeMsgLabel);
-//                GroupLayout.Group messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//                        .addComponent(welcomeMsgLabel);
-//                if (!renderHeaderPanel) {
-//                  messageHorizontal
-//                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-//                          .addComponent(helpLabel);
-//                  messageVertical
-//                          .addComponent(helpLabel);
-//                }
-//
-//                mainPanelLayout.setHorizontalGroup(messageHorizontal);
-//                mainPanelLayout.setVerticalGroup(messageVertical);
-//
-//                contentPanel.validate();
-//
-//            }
-//        });
-//    }
-
-//    @Override
-//    public void showInsertCardDialog(
-//            final ActionListener cancelListener, final String cancelCommand) {
-//
-//      log.debug("scheduling insert card dialog");
-//
-//      SwingUtilities.invokeLater(new Runnable() {
-//
-//            @Override
-//            public void run() {
-//
-//              log.debug("show insert card dialog");
-//
-//                mainPanel.removeAll();
-//                buttonPanel.removeAll();
-//
-//                if (renderHeaderPanel) {
-//                  titleLabel.setText(getMessage(TITLE_INSERTCARD));
-//                }
-//
-//                helpListener.setHelpTopic(HELP_INSERTCARD);
-//
-//                JLabel insertCardMsgLabel = new JLabel();
-//                insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-//                insertCardMsgLabel.setText(getMessage(MESSAGE_INSERTCARD));
-//
-//                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-//                mainPanel.setLayout(mainPanelLayout);
-//
-//                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
-//                        .addComponent(insertCardMsgLabel);
-//                GroupLayout.ParallelGroup messageVertical = mainPanelLayout.createParallelGroup()
-//                        .addComponent(insertCardMsgLabel);
-//
-//                if (!renderHeaderPanel) {
-//                  messageHorizontal
-//                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-//                          .addComponent(helpLabel);
-//                  messageVertical
-//                          .addComponent(helpLabel);
-//                }
-//
-//                mainPanelLayout.setHorizontalGroup(messageHorizontal);
-//                mainPanelLayout.setVerticalGroup(messageVertical);
-//
-//                if (renderCancelButton) {
-//                  JButton cancelButton = new JButton();
-//                  cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-//                  cancelButton.setText(getMessage(BUTTON_CANCEL));
-//                  cancelButton.addActionListener(cancelListener);
-//                  cancelButton.setActionCommand(cancelCommand);
-//
-//                  GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-//                  buttonPanel.setLayout(buttonPanelLayout);
-//
-//                  buttonPanelLayout.setHorizontalGroup(
-//                    buttonPanelLayout.createSequentialGroup()
-//                          .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-//                          .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-//                  buttonPanelLayout.setVerticalGroup(
-//                    buttonPanelLayout.createSequentialGroup()
-//                      .addComponent(cancelButton));
-//                }
-//
-//                contentPanel.validate();
-//            }
-//        });
-//    }
-
-    /**
-     * only difference to showInsertCard: title text: card not supported
-     * @param cancelListener
-     * @param cancelCommand
-     */
-//    @Override
-//    public void showCardNotSupportedDialog(final ActionListener cancelListener, final String cancelCommand) {
-//
-//      log.debug("scheduling card not supported dialog");
-//
-//      SwingUtilities.invokeLater(new Runnable() {
-//
-//            @Override
-//            public void run() {
-//
-//              log.debug("show card not supported dialog");
-//
-//              mainPanel.removeAll();
-//              buttonPanel.removeAll();
-//
-//              JLabel insertCardMsgLabel = new JLabel();
-//              insertCardMsgLabel.setFont(insertCardMsgLabel.getFont().deriveFont(insertCardMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-//
-//              if (renderHeaderPanel) {
-//                titleLabel.setText(getMessage(TITLE_CARD_NOT_SUPPORTED));
-//                insertCardMsgLabel.setText(getMessage(MESSAGE_INSERTCARD));
-//              } else {
-//                insertCardMsgLabel.setText(getMessage(TITLE_CARD_NOT_SUPPORTED));
-//              }
-//
-//              helpListener.setHelpTopic(HELP_CARDNOTSUPPORTED);
-//
-//              GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-//              mainPanel.setLayout(mainPanelLayout);
-//
-//              GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
-//                      .addComponent(insertCardMsgLabel);
-//              GroupLayout.Group messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//                      .addComponent(insertCardMsgLabel);
-//              if (!renderHeaderPanel) {
-//                messageHorizontal
-//                        .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-//                        .addComponent(helpLabel);
-//                messageVertical
-//                        .addComponent(helpLabel);
-//              }
-//
-//              mainPanelLayout.setHorizontalGroup(messageHorizontal);
-//              mainPanelLayout.setVerticalGroup(messageVertical);
-//
-//              if (renderCancelButton) {
-//                JButton cancelButton = new JButton();
-//                cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-//                cancelButton.setText(getMessage(BUTTON_CANCEL));
-//                cancelButton.addActionListener(cancelListener);
-//                cancelButton.setActionCommand(cancelCommand);
-//
-//                GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-//                buttonPanel.setLayout(buttonPanelLayout);
-//
-//                buttonPanelLayout.setHorizontalGroup(
-//                  buttonPanelLayout.createSequentialGroup()
-//                        .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-//                        .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE));
-//                buttonPanelLayout.setVerticalGroup(
-//                  buttonPanelLayout.createSequentialGroup()
-//                    .addComponent(cancelButton));
-//              }
-//
-//              contentPanel.validate();
-//            }
-//        });
-//    }
-
   @Override
-  public void showCardPINDialog(final PINSpec pinSpec, final int numRetries,
+  public void showVerifyPINDialog(final PINSpec pinSpec, final int numRetries,
           final ActionListener okListener, final String okCommand,
           final ActionListener cancelListener, final String cancelCommand) {
         
-      log.debug("scheduling card-pin dialog");
+      log.debug("scheduling verify pin dialog");
       
       SwingUtilities.invokeLater(new Runnable() {
 
             @Override
             public void run() {
 
-              log.debug("[" + Thread.currentThread().getName() + "] show card-pin dialog");
+              log.debug("[" + Thread.currentThread().getName() + "] show verify pin dialog");
       
                 mainPanel.removeAll();
                 buttonPanel.removeAll();
 
                 if (renderHeaderPanel) {
                   if (numRetries < 0) {
-                      String cardpinTitle = getMessage(TITLE_CARDPIN);
-                      titleLabel.setText(MessageFormat.format(cardpinTitle, new Object[]{pinSpec.getLocalizedName()}));
+                      String verifyTitle = getMessage(TITLE_VERIFY_PIN);
+                      titleLabel.setText(MessageFormat.format(verifyTitle, new Object[]{pinSpec.getLocalizedName()}));
                   } else {
                       titleLabel.setText(getMessage(TITLE_RETRY));
                   }
@@ -615,8 +422,8 @@ public class BKUGUIImpl implements BKUGUIFacade {
                   } else {
                     infoLabel.setText(MessageFormat.format(infoPattern, new Object[] {pinSpec.getLocalizedName()}));
                   }
-                  helpMouseListener.setHelpTopic(HELP_CARDPIN);
-                  helpKeyListener.setHelpTopic(HELP_CARDPIN);
+                  helpMouseListener.setHelpTopic(HELP_VERIFY_PIN);
+                  helpKeyListener.setHelpTopic(HELP_VERIFY_PIN);
                 } else {
                   String retryPattern;
                   if (numRetries < 2) {
@@ -732,194 +539,346 @@ public class BKUGUIImpl implements BKUGUIFacade {
         });
     }
 
-//    @Override
-//    public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
-//        showCardPINDialog(pinSpec, -1, okListener, okCommand, cancelListener, cancelCommand);
-//    }
-//
-//    @Override
-//    public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries, ActionListener okListener, String okCommand, ActionListener cancelListener, String cancelCommand) {
-//        showCardPINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand);
-//    }
+  @Override
+  public void showEnterPINDirect(PINSpec pinSpec, int retries) {
+    if (retries < 0) {
+      showMessageDialog(TITLE_VERIFY_PINPAD, MESSAGE_ENTERPIN_PINPAD_DIRECT, new Object[] {
+                  pinSpec.getLocalizedName(), pinSpec.getLocalizedLength() });
+    } else {
+      showMessageDialog(TITLE_RETRY, MESSAGE_RETRIES, new Object[]{String.valueOf(retries) });
+    }
+  }
 
-//    @Override
-//    public void showSignaturePINDialog(PINSpec pinSpec, ActionListener signListener, String signCommand, ActionListener cancelListener, String cancelCommand, ActionListener hashdataListener, String hashdataCommand) {
-//        showSignaturePINDialog(pinSpec, -1, signListener, signCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
-//    }
+  @Override
+  public void showEnterPIN(final PINSpec pinSpec, final int retries) {
+    showEnterPIN(pinSpec, retries, TITLE_VERIFY_PINPAD, MESSAGE_ENTERPIN_PINPAD, null);
+  }
 
-    @Override
-    public void showPinpadSignaturePINDialog(final PINSpec pinSpec, final int numRetries,
-//            final ActionListener cancelListener, final String cancelCommand,
-            final ActionListener hashdataListener, final String hashdataCommand) {
+  protected void showEnterPIN(final PINSpec pinSpec, final int retries, final String titleKey, final String messageKey, final Object[] messageParams) {
+    log.debug("scheduling pinpad dialog");
 
-        log.debug("scheduling pinpad signature-pin dialog");
+    SwingUtilities.invokeLater(new Runnable() {
 
-        SwingUtilities.invokeLater(new Runnable() {
+      @Override
+      public void run() {
 
-            @Override
-            public void run() {
+        log.debug("[" + Thread.currentThread().getName() + "] show pinpad dialog");
 
-              log.debug("[" + Thread.currentThread().getName() + "] show pinpad signature-pin dialog");
+        mainPanel.removeAll();
+        buttonPanel.removeAll();
 
-                mainPanel.removeAll();
-                buttonPanel.removeAll();
+        if (renderHeaderPanel) {
+          if (retries < 0) {
+              titleLabel.setText(getMessage(titleKey));
+          } else {
+              titleLabel.setText(getMessage(TITLE_RETRY));
+          }
+        }
 
-                if (renderHeaderPanel) {
-                  if (numRetries < 0) {
-                      titleLabel.setText(getMessage(TITLE_SIGN));
-                  } else {
-                      titleLabel.setText(getMessage(TITLE_RETRY));
-                  }
-                }
+        final JLabel infoLabel = new JLabel();
+        if (retries < 0) {
+          infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+          infoLabel.setText(MessageFormat.format(getMessage(messageKey), messageParams));
+          helpMouseListener.setHelpTopic(HELP_PINPAD);
+          helpKeyListener.setHelpTopic(HELP_PINPAD);
+        } else {
+          String retryPattern;
+          if (retries == 1) {
+            retryPattern = getMessage(MESSAGE_LAST_RETRY);
+          } else {
+            retryPattern = getMessage(MESSAGE_RETRIES);
+          }
+          infoLabel.setText(MessageFormat.format(retryPattern, new Object[]{String.valueOf(retries)}));
+          infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
+          infoLabel.setForeground(ERROR_COLOR);
+          helpMouseListener.setHelpTopic(HELP_RETRY);
+          helpKeyListener.setHelpTopic(HELP_RETRY);
+        }
+
+        JLabel pinLabel = new JLabel();
+        pinLabel.setFont(pinLabel.getFont().deriveFont(pinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+        String pinName = getMessage(LABEL_PIN);
+        pinLabel.setText(MessageFormat.format(pinName, new Object[]{pinSpec.getLocalizedName()}));
+
+        pinpadPINField = new JPasswordField();
+        pinpadPINField.setText("");
+        pinpadPINField.setEnabled(false);
+
+        JLabel pinsizeLabel = new JLabel();
+        pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
+        pinsizeLabel.setText(MessageFormat.format(getMessage(LABEL_PINSIZE), pinSpec.getLocalizedLength()));
+
+        GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+        mainPanel.setLayout(mainPanelLayout);
+
+        GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
+                .addComponent(infoLabel);
+        GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                .addComponent(infoLabel);
+
+        if (!renderHeaderPanel) {
+          infoHorizontal
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                  .addComponent(switchFocusDummyLabel)
+                  .addComponent(helpLabel)
+                  ;
+          infoVertical
+                  .addComponent(switchFocusDummyLabel)
+                  .addComponent(helpLabel)
+                  ;
+        }
+
+        // align pinfield and pinsize to the right
+        GroupLayout.Group pinHorizontal = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.TRAILING);
+        GroupLayout.SequentialGroup pinVertical = mainPanelLayout.createSequentialGroup();
+
+        if (pinLabelPos == PinLabelPosition.ABOVE) {
+          pinHorizontal
+                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                    .addComponent(pinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addComponent(pinpadPINField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                  .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
+          pinVertical
+                  .addComponent(pinLabel)
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                  .addComponent(pinpadPINField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                  .addComponent(pinsizeLabel);
+        } else { // PinLabelPosition.LEFT
+          pinHorizontal
+                  .addGroup(mainPanelLayout.createSequentialGroup()
+                    .addComponent(pinLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                    .addComponent(pinpadPINField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                  .addComponent(pinsizeLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE);
+          pinVertical
+                  .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                    .addComponent(pinLabel)
+                    .addComponent(pinpadPINField))
+                  .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+                  .addComponent(pinsizeLabel);
+        }
+
+        mainPanelLayout.setHorizontalGroup(
+          mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+            .addGroup(infoHorizontal)
+            .addGroup(pinHorizontal));
+
+        mainPanelLayout.setVerticalGroup(
+          mainPanelLayout.createSequentialGroup()
+            .addGroup(infoVertical)
+            .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+            .addGroup(pinVertical));
+
+        contentPanel.validate();
+      }
+    });
+  }
+
+  @Override
+  public void showSignatureDataDialog(PINSpec spec,
+          final ActionListener enterPINListener, final String enterPINCommand,
+          final ActionListener cancelListener, final String cancelCommand,
+          final ActionListener hashdataListener, final String hashdataCommand) {
+
+    log.debug("scheduling signature-data dialog");
+
+    SwingUtilities.invokeLater(new Runnable() {
+
+        @Override
+        public void run() {
+
+          log.debug("[" + Thread.currentThread().getName() + "] show signature-data dialog");
+
+          mainPanel.removeAll();
+          buttonPanel.removeAll();
+
+          if (renderHeaderPanel) {
+            titleLabel.setText(getMessage(TITLE_SIGNATURE_DATA));
+          }
+
+          final JLabel infoLabel = new JLabel();
+          infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
+          if (shortText) {
+            infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_TINY));
+          } else {
+            infoLabel.setText(getMessage(MESSAGE_HASHDATALINK));
+          }
+          infoLabel.setFocusable(true);
+          infoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+          infoLabel.setForeground(HYPERLINK_COLOR);
+          infoLabel.addMouseListener(new MouseAdapter() {
+
+              @Override
+              public void mouseClicked(MouseEvent me) {
+                  ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
+                  hashdataListener.actionPerformed(e);
+              }
+          });
+
+          infoLabel.addKeyListener(new KeyAdapter() {
+
+             @Override
+             public void keyPressed(KeyEvent e) {
+
+                 if(e.getKeyCode() == KeyEvent.VK_ENTER) {
+                     ActionEvent e1 = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
+                      hashdataListener.actionPerformed(e1);
+                 }
+             }
+
+           });
+
+          infoLabel.addFocusListener(new FocusAdapter() {
+
+              @Override
+              public void focusGained(FocusEvent e) {
 
-                final JLabel infoLabel = new JLabel();
-                if (numRetries < 0) {
-                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
                   if (shortText) {
-                    infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_TINY));
-                  } else {
-                    infoLabel.setText(getMessage(MESSAGE_HASHDATALINK));
-                  }
-                  infoLabel.setFocusable(true);
-                  infoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-                  infoLabel.setForeground(HYPERLINK_COLOR);
-                  infoLabel.addMouseListener(new MouseAdapter() {
+                      infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_TINY_FOCUS));
+                    } else {
+                      infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_FOCUS));
+                    }
+              }
 
-                      @Override
-                      public void mouseClicked(MouseEvent me) {
-                          ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
-                          hashdataListener.actionPerformed(e);
-                      }
-                  });
-                  
-                  infoLabel.addKeyListener(new KeyAdapter() {
-                	  
-                 	 @Override
-                 	 public void keyPressed(KeyEvent e) {
-                 		 
-                 		 if(e.getKeyCode() == KeyEvent.VK_ENTER) {                			 
-                 			 ActionEvent e1 = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, hashdataCommand);
-                              hashdataListener.actionPerformed(e1);
-                 		 }
-                 	 }
-                 	  
-                   });  
-                  
-                  infoLabel.addFocusListener(new FocusAdapter() {
-                	  
-                	  @Override
-                	  public void focusGained(FocusEvent e) {
-                		  
-                          if (shortText) {
-                              infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_TINY_FOCUS));
-                            } else {
-                              infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_FOCUS));
-                            }
-                	  }
-                	  
-                	  @Override
-                	  public void focusLost(FocusEvent e) {
-                		  
-                          if (shortText) {
-                              infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_TINY));
-                            } else {
-                              infoLabel.setText(getMessage(MESSAGE_HASHDATALINK));
-                            }
-                		  
-                	  }                	  
-                	  
-                  });                  
-                  
-                  helpMouseListener.setHelpTopic(HELP_SIGNPIN);
-                  helpKeyListener.setHelpTopic(HELP_SIGNPIN);
-                } else {
-                  String retryPattern;
-                  if (numRetries < 2) {
-                    retryPattern = getMessage(MESSAGE_LAST_RETRY);
-                  } else {
-                    retryPattern = getMessage(MESSAGE_RETRIES);
-                  }
-                  infoLabel.setFocusable(true);
-                  infoLabel.setText(MessageFormat.format(retryPattern, new Object[]{String.valueOf(numRetries)}));
-                  infoLabel.setFont(infoLabel.getFont().deriveFont(infoLabel.getFont().getStyle() | java.awt.Font.BOLD));
-                  infoLabel.setForeground(ERROR_COLOR);
-                  helpMouseListener.setHelpTopic(HELP_RETRY);
-                  helpKeyListener.setHelpTopic(HELP_RETRY);
-                }
+              @Override
+              public void focusLost(FocusEvent e) {
 
-                String msgPattern = getMessage(MESSAGE_ENTERPIN_PINPAD);
-                String msg = MessageFormat.format(msgPattern, new Object[] {
-                  pinSpec.getLocalizedName(), pinSpec.getLocalizedLength() });
+                  if (shortText) {
+                      infoLabel.setText(getMessage(MESSAGE_HASHDATALINK_TINY));
+                    } else {
+                      infoLabel.setText(getMessage(MESSAGE_HASHDATALINK));
+                    }
 
-                JLabel msgLabel = new JLabel();
-                msgLabel.setFont(msgLabel.getFont().deriveFont(msgLabel.getFont().getStyle() & ~Font.BOLD));
-                msgLabel.setText(msg);
+              }
 
-                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-                mainPanel.setLayout(mainPanelLayout);
+          });
 
-                GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
-                        .addComponent(infoLabel);
-                GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                        .addComponent(infoLabel);
+          helpMouseListener.setHelpTopic(HELP_SIGNPIN);
+          helpKeyListener.setHelpTopic(HELP_SIGNPIN);
 
-                if (!renderHeaderPanel) {
-                  infoHorizontal
-                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-                          .addComponent(switchFocusDummyLabel)
-                          .addComponent(helpLabel)
-                          ;
-                  infoVertical
-                          .addComponent(switchFocusDummyLabel)
-                          .addComponent(helpLabel)
-                          ;
-                }
+          //TODO message panel
 
-                mainPanelLayout.setHorizontalGroup(
-                  mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-                    .addGroup(infoHorizontal)
-                    .addComponent(msgLabel));
+//              String msgPattern = getMessage(MESSAGE_ENTERPIN_PINPAD);
+//              String msg = MessageFormat.format(msgPattern, new Object[] {
+//                pinSpec.getLocalizedName(), pinSpec.getLocalizedLength() });
+//
+//              JLabel msgLabel = new JLabel();
+//              msgLabel.setFont(msgLabel.getFont().deriveFont(msgLabel.getFont().getStyle() & ~Font.BOLD));
+//              msgLabel.setText(msg);
 
-                mainPanelLayout.setVerticalGroup(
-                  mainPanelLayout.createSequentialGroup()
-                    .addGroup(infoVertical)
+          GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
+          mainPanel.setLayout(mainPanelLayout);
+
+          GroupLayout.SequentialGroup infoHorizontal = mainPanelLayout.createSequentialGroup()
+                  .addComponent(infoLabel);
+          GroupLayout.ParallelGroup infoVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+                  .addComponent(infoLabel);
+
+          if (!renderHeaderPanel) {
+            infoHorizontal
+                    .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
+                    .addComponent(switchFocusDummyLabel)
+                    .addComponent(helpLabel)
+                    ;
+            infoVertical
+                    .addComponent(switchFocusDummyLabel)
+                    .addComponent(helpLabel)
+                    ;
+          }
+
+          mainPanelLayout.setHorizontalGroup(
+                  infoHorizontal);
+//              mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+//                .addGroup(infoHorizontal)
+//                .addComponent(msgLabel));
+
+          mainPanelLayout.setVerticalGroup(
+                  infoVertical);
+//              mainPanelLayout.createSequentialGroup()
+//                .addGroup(infoVertical)
+//                .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+//                .addComponent(msgLabel));
+
+
+          GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
+          buttonPanel.setLayout(buttonPanelLayout);
+
+          GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup();
+          GroupLayout.Group buttonVertical;
+
+          JButton enterPINButton = new JButton();
+          enterPINButton.setFont(enterPINButton.getFont().deriveFont(enterPINButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+          enterPINButton.setText(getMessage(BUTTON_SIGN));
+          enterPINButton.setActionCommand(enterPINCommand);
+          enterPINButton.addActionListener(enterPINListener);
+
+          if (renderCancelButton) {
+            JButton cancelButton = new JButton();
+            cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
+            cancelButton.setText(getMessage(BUTTON_CANCEL));
+            cancelButton.setActionCommand(cancelCommand);
+            cancelButton.addActionListener(cancelListener);
+
+            buttonHorizontal
+                    .addComponent(enterPINButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
                     .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-                    .addComponent(msgLabel));
-
-                //no cancel button (cancel via pinpad)
-//                if (renderCancelButton) {
-//                    JButton cancelButton = new JButton();
-//                    cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD));
-//                    cancelButton.setText(getMessage(BUTTON_CANCEL));
-//                    cancelButton.setActionCommand(cancelCommand);
-//                    cancelButton.addActionListener(cancelListener);
-//
-//                    GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
-//                    buttonPanel.setLayout(buttonPanelLayout);
-//
-//                    GroupLayout.SequentialGroup buttonHorizontal = buttonPanelLayout.createSequentialGroup()
-//                            .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE);
-//                    GroupLayout.SequentialGroup buttonVertical = buttonPanelLayout.createSequentialGroup()
-//                            .addComponent(cancelButton);
-//
-//                    buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
-//                    buttonPanelLayout.setVerticalGroup(buttonVertical);
-//                }
+                    .addComponent(cancelButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
+                    ;
+            buttonVertical = buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+                    .addComponent(enterPINButton)
+                    .addComponent(cancelButton)
+                    ;
+          } else {
+            buttonHorizontal
+                    .addComponent(enterPINButton, GroupLayout.PREFERRED_SIZE, buttonSize, GroupLayout.PREFERRED_SIZE)
+                    ;
+            buttonVertical = buttonPanelLayout.createSequentialGroup()
+                    .addComponent(enterPINButton)
+                    ;
+          }
 
-                contentPanel.validate();
-            }
-        });
+          buttonPanelLayout.setHorizontalGroup(buttonHorizontal);
+          buttonPanelLayout.setVerticalGroup(buttonVertical);
+
+          contentPanel.validate();
+        }
+    });
+  }
+
+  @Override
+  public void correctionButtonPressed() {
+    log.debug("[" + Thread.currentThread().getName() + "] correction button pressed");
+
+    if (pinpadPINField != null) {
+      String maskedPIN = pinpadPINField.getText();
+      pinpadPINField.setText(maskedPIN.substring(0, maskedPIN.length() - 1));
+    }
+  }
+
+  @Override
+  public void allKeysCleared() {
+    log.debug("[" + Thread.currentThread().getName() + "] all keys cleared");
+
+    if (pinpadPINField != null) {
+      pinpadPINField.setText("");
+    }
+  }
+
+  @Override
+  public void validKeyPressed() {
+    log.debug("[" + Thread.currentThread().getName() + "] valid key pressed");
+
+    if (pinpadPINField != null) {
+      pinpadPINField.setText(pinpadPINField.getText() + '*');
     }
+  }
 
     @Override
     public void showSignaturePINDialog(final PINSpec pinSpec, final int numRetries,
             final ActionListener signListener, final String signCommand,
             final ActionListener cancelListener, final String cancelCommand,
             final ActionListener hashdataListener, final String hashdataCommand) {
-//        showSignaturePINDialog(pinSpec, numRetries, okListener, okCommand, cancelListener, cancelCommand, hashdataListener, hashdataCommand);
-//    }
-//
-//    private void showSignaturePINDialog(final PINSpec pinSpec, final int numRetries, final ActionListener signListener, final String signCommand, final ActionListener cancelListener, final String cancelCommand, final ActionListener hashdataListener, final String hashdataCommand) {
 
       log.debug("scheduling signature-pin dialog");
       
@@ -1302,57 +1261,6 @@ public class BKUGUIImpl implements BKUGUIFacade {
         });
     }
 
-//    @Override
-//    public void showWaitDialog(final String waitMessage) {
-//
-//      log.debug("scheduling wait dialog");
-//
-//      SwingUtilities.invokeLater(new Runnable() {
-//
-//            @Override
-//            public void run() {
-//
-//              log.debug("show wait dialog");
-//
-//                mainPanel.removeAll();
-//                buttonPanel.removeAll();
-//
-//                if (renderHeaderPanel) {
-//                  titleLabel.setText(getMessage(TITLE_WAIT));
-//                }
-//
-//                helpListener.setHelpTopic(HELP_WAIT);
-//
-//                JLabel waitMsgLabel = new JLabel();
-//                waitMsgLabel.setFont(waitMsgLabel.getFont().deriveFont(waitMsgLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-//                if (waitMessage != null) {
-//                    waitMsgLabel.setText("<html>" + waitMessage + "</html>");
-//                } else {
-//                    waitMsgLabel.setText(getMessage(MESSAGE_WAIT));
-//                }
-//
-//                GroupLayout mainPanelLayout = new GroupLayout(mainPanel);
-//                mainPanel.setLayout(mainPanelLayout);
-//
-//                GroupLayout.SequentialGroup messageHorizontal = mainPanelLayout.createSequentialGroup()
-//                        .addComponent(waitMsgLabel);
-//                GroupLayout.ParallelGroup messageVertical = mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
-//                        .addComponent(waitMsgLabel);
-//
-//                if (!renderHeaderPanel) {
-//                  messageHorizontal
-//                          .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, Short.MAX_VALUE)
-//                          .addComponent(helpLabel);
-//                  messageVertical
-//                          .addComponent(helpLabel);
-//                }
-//                mainPanelLayout.setHorizontalGroup(messageHorizontal);
-//                mainPanelLayout.setVerticalGroup(messageVertical);
-//
-//                contentPanel.validate();
-//            }
-//        });
-//    }
 
     @Override
     public char[] getPin() {
@@ -1395,7 +1303,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
               @Override
               public void run() {
                 try {
-                  showMessageDialog(TITLE_HASHDATA, MESSAGE_HASHDATA_VIEWER);
+                  showMessageDialog(TITLE_SIGNATURE_DATA, MESSAGE_HASHDATA_VIEWER);
                   showSecureViewer(dataToBeSigned.get(0), backListener, backCommand);
                 } catch (FontProviderException ex) {
                   log.error("failed to display secure viewer", ex);
@@ -1411,7 +1319,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
           }
         } else {
           log.debug("[" + Thread.currentThread().getName() + "] mime-type not supported by secure viewer, scheduling save dialog");
-          showMessageDialog(TITLE_HASHDATA, MESSAGE_UNSUPPORTED_MIMETYPE);
+          showMessageDialog(TITLE_SIGNATURE_DATA, MESSAGE_UNSUPPORTED_MIMETYPE);
           SecureViewerSaveDialog.showSaveDialog(dataToBeSigned.get(0), messages, backListener, backCommand); 
         }
       } else {
@@ -1421,28 +1329,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
     
     /**
      * has to be called from event dispatcher thread
-     * @param hashDataText
-     * @param saveListener
-     * @param saveCommand
      */
-//    private void showSecureViewer(HashDataInput dataToBeSigned) throws FontProviderException {
-//      
-//      log.debug("[" + Thread.currentThread().getName() + "] show secure viewer");
-//      if (secureViewer == null) {
-//        secureViewer = new SecureViewerDialog(null, messages,
-//                fontProvider, helpMouseListener.getActionListener());
-//
-//        // workaround for [#439]
-//        // avoid AlwaysOnTop at least in applet, otherwise make secureViewer AlwaysOnTop since MOCCA Dialog (JFrame created in LocalSTALFactory) is always on top.
-//        Window window = SwingUtilities.getWindowAncestor(contentPane);
-//        if (window != null && window.isAlwaysOnTop()) {
-//          log.debug("make secureViewer alwaysOnTop");
-//          secureViewer.setAlwaysOnTop(true);
-//        }
-//      }
-//      secureViewer.setContent(dataToBeSigned);
-//      log.trace("show secure viewer returned");
-//    }
     private void showSecureViewer(HashDataInput dataToBeSigned, ActionListener closeListener, String closeCommand) throws FontProviderException {
       
       log.debug("[" + Thread.currentThread().getName() + "] show secure viewer");
@@ -1479,7 +1366,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
           buttonPanel.removeAll();
 
           if (renderHeaderPanel) {
-            titleLabel.setText(getMessage(TITLE_HASHDATA));
+            titleLabel.setText(getMessage(TITLE_SIGNATURE_DATA));
           }
           
           helpMouseListener.setHelpTopic(HELP_HASHDATALIST);
@@ -1613,7 +1500,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
               @Override
               public void run() {
                 try {
-                  showMessageDialog(TITLE_HASHDATA, MESSAGE_HASHDATA_VIEWER);
+                  showMessageDialog(TITLE_SIGNATURE_DATA, MESSAGE_HASHDATA_VIEWER);
                   showSecureViewer(selection, backToListListener, null);
 //                  SecureViewerDialog.showSecureViewer(selection, messages, fontProvider, helpMouseListener.getActionListener(), false);
                 } catch (FontProviderException ex) {
@@ -1625,7 +1512,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
             });
           } else {
             log.debug("[" + Thread.currentThread().getName() + "] mime-type not supported by secure viewer, scheduling save dialog");
-            showMessageDialog(BKUGUIFacade.TITLE_HASHDATA, BKUGUIFacade.MESSAGE_UNSUPPORTED_MIMETYPE);
+            showMessageDialog(BKUGUIFacade.TITLE_SIGNATURE_DATA, BKUGUIFacade.MESSAGE_UNSUPPORTED_MIMETYPE);
             SecureViewerSaveDialog.showSaveDialog(selection, messages, backToListListener, null);
           }
         }
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
index 96032dc1..52a3d5fe 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/PinDocument.java
@@ -1,19 +1,19 @@
 /*
-* 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.
-*/
+ * 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.
+ */
 package at.gv.egiz.bku.gui;
 
 import java.util.regex.Matcher;
@@ -21,7 +21,6 @@ import java.util.regex.Pattern;
 import javax.swing.JButton;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
-import javax.swing.text.Document;
 import javax.swing.text.PlainDocument;
 
 /**
@@ -31,16 +30,15 @@ import javax.swing.text.PlainDocument;
 class PINDocument extends PlainDocument {
 
   private static final long serialVersionUID = 1L;
-  
   protected Pattern pinPattern;
   protected int minLength;
   protected int maxLength;
-
   protected JButton enterButton;
-  protected Document compareTo;
-  protected Document oldPin;        
 
   public PINDocument(int minLength, int maxLength, String pattern, JButton enterButton) {
+    if (enterButton == null) {
+      throw new NullPointerException("OK button null");
+    }
     if (pattern != null) {
       pinPattern = Pattern.compile(pattern);
     } else {
@@ -51,73 +49,26 @@ class PINDocument extends PlainDocument {
     this.enterButton = enterButton;
   }
 
-  /**
-   * @param pinSpec
-   * @param enterButton
-   * @param compareTo
-   *          enable enterButton if this pinDocument's pin equals to
-   *          compareTo's pin. may be null
-   */
-  public PINDocument(int minLength, int maxLength, String pattern, JButton enterButton, Document compareTo) {
-    this(minLength, maxLength, pattern, enterButton);
-    this.compareTo = compareTo;
+  @Override
+  public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
+    if (maxLength < 0 || maxLength >= (getLength() + str.length())) {
+      boolean matches = true;
+      for (int i = 0; i < str.length(); i++) {
+        Matcher m = pinPattern.matcher(str.substring(i, i + 1));
+        if (!m.matches()) {
+          matches = false;
+        }
+      }
+      if (matches) {
+        super.insertString(offs, str, a);
+        enterButton.setEnabled(getLength() >= minLength);
+      }
+    }
   }
 
-  /**
-   * @param pinSpec
-   * @param enterButton
-   *          may be null
-   * @param compareTo
-   *          enable enterButton if this pinDocument's pin equals to
-   *          compareTo's pin. may be null
-   * @param oldPin
-   *          enable enterButton if oldPin meets the pinSpec pin length
-   *          requirements, may be null
-   */
-  public PINDocument(int minLength, int maxLength, String pattern,
-      JButton enterButton, Document compareTo, Document oldPin) {
-    this(minLength, maxLength, pattern, enterButton);
-    this.compareTo = compareTo;
-    this.oldPin = oldPin;
+  @Override
+  public void remove(int offs, int len) throws BadLocationException {
+    super.remove(offs, len);
+    enterButton.setEnabled(getLength() >= minLength);
   }
-
-        @Override
-        public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
-            if (maxLength < 0 || maxLength >= (getLength() + str.length())) {
-                boolean matches = true;
-                for (int i = 0; i < str.length(); i++) {
-                    Matcher m = pinPattern.matcher(str.substring(i, i + 1));
-                    if (!m.matches()) {
-                        matches = false;
-                    }
-                }
-                if (matches) {
-                    super.insertString(offs, str, a);
-                }
-            }
-            if (enterButton != null) {
-              enterButton.setEnabled(
-                      (oldPin == null || oldPin.getLength() >= minLength) &&
-                      getLength() >= minLength &&
-                      compare());
-            }
-        }
-
-        @Override
-        public void remove(int offs, int len) throws BadLocationException {
-            super.remove(offs, len);
-            if (enterButton != null) {
-              enterButton.setEnabled(
-                      (oldPin == null || oldPin.getLength() >= minLength) &&
-                      getLength() >= minLength &&
-                      compare());
-            }
-        }
-
-        private boolean compare() throws BadLocationException {
-          if (compareTo == null) {
-            return true;
-          }
-          return compareTo.getText(0, compareTo.getLength()).equals(getText(0, getLength()));
-        }
-    }
\ No newline at end of file
+}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
index 7bae4673..7db70c46 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
@@ -17,7 +17,6 @@
 package at.gv.egiz.bku.gui;
 
 import at.gv.egiz.bku.gui.viewer.FontProvider;
-import at.gv.egiz.bku.gui.viewer.FontProviderException;
 import at.gv.egiz.bku.gui.viewer.SecureViewerSaveDialog;
 import at.gv.egiz.stal.HashDataInput;
 import java.awt.Container;
@@ -25,7 +24,6 @@ import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Frame;
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusAdapter;
@@ -34,32 +32,26 @@ import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.io.BufferedOutputStream;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.Charset;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.ResourceBundle;
 import javax.swing.GroupLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JEditorPane;
-import javax.swing.JFileChooser;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.LayoutStyle;
-import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
 import javax.swing.text.Document;
 import javax.swing.text.EditorKit;
 import javax.swing.text.StyledEditorKit;
@@ -71,7 +63,7 @@ import org.apache.commons.logging.LogFactory;
  *
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
-public class SecureViewerDialog extends JDialog implements ActionListener {
+public class SecureViewerDialog extends JDialog {
 
   /** don't import BKUFonts in order not to load BKUFonts.jar
    * BKUApplet includes BKUFonts as runtime dependency only, the jar is copied to the applet dir in BKUOnline with dependency-plugin
@@ -100,19 +92,6 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
    * @param owner, dialog is positioned relative to its owner
    * (if null, at default location of native windowing system)
    */
-//  public static void showDataToBeSigned(HashDataInput dataToBeSigned,
-//          ResourceBundle messages,
-//          ActionListener saveListener, String saveCommand,
-//          ActionListener helpListener) {
-//
-////      Frame ownerFrame = (owner != null) ?
-////        JOptionPane.getFrameForComponent(owner) :
-////        null;
-//    dialog = new SecureViewerDialog(null, messages,
-//            saveListener, saveCommand, helpListener);
-//    dialog.setContent(dataToBeSigned);
-//    dialog.setVisible(true);
-//  }
   public SecureViewerDialog(Frame owner, ResourceBundle messages,
           ActionListener closeListener, String closeCommand,
           FontProvider fontProvider, ActionListener helpListener) {
@@ -125,6 +104,10 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
             createViewerPanel(helpListener),
             createButtonPanel(closeListener, closeCommand));
 
+    // also leave defaultWindowClosing HIDE_ON_CLOSE
+    this.addWindowListener(new WindowCloseListener(closeListener, closeCommand));
+    this.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+
     pack();
     if (owner != null) {
       setLocationRelativeTo(owner);
@@ -305,19 +288,11 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
     JButton closeButton = new JButton();
     closeButton.setText(messages.getString(BKUGUIFacade.BUTTON_CLOSE));
     closeButton.setActionCommand(closeCommand);
-    closeButton.addActionListener(closeListener);
-    closeButton.addActionListener(new ActionListener() {
-      @Override
-      public void actionPerformed(ActionEvent e) {
-        log.trace("[" + Thread.currentThread().getName() + "] closing secure viewer");
-        setVisible(false);
-      }
-    });
+    closeButton.addActionListener(new CloseButtonListener(closeListener));
 
     JButton saveButton = new JButton();
     saveButton.setText(messages.getString(BKUGUIFacade.BUTTON_SAVE));
-    saveButton.setActionCommand("save"); //TODO ensure unequal to closeCommand 
-    saveButton.addActionListener(this);
+    saveButton.addActionListener(new SaveButtonListener());
 
     int buttonSize = closeButton.getPreferredSize().width;
     if (saveButton.getPreferredSize().width > buttonSize) {
@@ -336,39 +311,50 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
     return buttonPanel;
   }
 
-  @Override
-  public void actionPerformed(ActionEvent e) {
-    if ("save".equals(e.getActionCommand())) {
+  public class WindowCloseListener extends WindowAdapter {
+
+    ActionListener closeListener;
+    String closeCommand;
+
+    public WindowCloseListener(ActionListener closeListener, String closeCommand) {
+      this.closeListener = closeListener;
+      this.closeCommand = closeCommand;
+    }
+
+    @Override
+    public void windowClosing(WindowEvent e) {
+      log.trace("[" + Thread.currentThread().getName() + "] closing secure viewer");
+      setVisible(false);
+      if (closeListener != null) {
+        closeListener.actionPerformed(new ActionEvent(e.getSource(), e.getID(), closeCommand));
+      }
+    }
+  }
+
+  public class CloseButtonListener implements ActionListener {
+
+    ActionListener closeListener;
+
+    public CloseButtonListener(ActionListener closeListener) {
+      this.closeListener = closeListener;
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+      log.trace("[" + Thread.currentThread().getName() + "] closing secure viewer");
+      setVisible(false);
+      if (closeListener != null) {
+        closeListener.actionPerformed(e);
+    }
+    }
+  }
+
+  public class SaveButtonListener implements ActionListener {
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
       log.trace("[" + Thread.currentThread().getName() + "] display secure viewer save dialog");
       SecureViewerSaveDialog.showSaveDialog(content, messages, null, null);
-      log.trace("done secure viewer save");
-    } else {
-      log.warn("unknown action command " + e.getActionCommand());
     }
   }
-  
-  
-//  //TEST
-//  private static SecureViewerDialog secureViewer;
-//  public static void showSecureViewerXXX(HashDataInput dataToBeSigned, ResourceBundle messages, FontProvider fontProvider, ActionListener helpListener, boolean alwaysOnTop) throws FontProviderException {
-//    
-////    ResourceBundle messages = ResourceBundle.getBundle(BKUGUIFacade.MESSAGES_BUNDLE, locale);
-//    
-//    log.debug("[" + Thread.currentThread().getName() + "] show secure viewer");
-//    if (secureViewer == null) {
-//      secureViewer = new SecureViewerDialog(null, messages,
-//              fontProvider, helpListener); 
-//
-//      // workaround for [#439]
-//      // avoid AlwaysOnTop at least in applet, otherwise make secureViewer AlwaysOnTop since MOCCA Dialog (JFrame created in LocalSTALFactory) is always on top.
-////      Window window = SwingUtilities.getWindowAncestor(contentPane);
-////      if (window != null && window.isAlwaysOnTop()) {
-////        log.debug("make secureViewer alwaysOnTop");
-//        secureViewer.setAlwaysOnTop(alwaysOnTop);
-////      }
-//    }
-//    secureViewer.setContent(dataToBeSigned);
-//    log.trace("show secure viewer returned");
-//  }
-
 }
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index 3e483fc8..c09433de 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -16,15 +16,15 @@
 title.welcome=<html>Willkommen</html>
 title.insertcard=<html>Keine B\u00FCrgerkarte gefunden</html>
 title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
-#title.cardpin=<html>{0} eingeben</html>
-title.cardpin=<html>Karte wird gelesen</html>
+title.verify.pin=<html>Karte wird gelesen</html>
 title.sign=<html>Signatur erstellen</html>
+title.verify.pinpad=<html>PIN eingeben
 title.error=<html>Fehler</html>
 title.warning=<html>Achtung
 title.entry.timeout=<html>Zeit\u00FCberschreitung</html>
 title.retry=<html>Falsche PIN</html>
 title.wait=<html>Bitte warten</html>
-title.hashdata=<html>Signaturdaten</html>
+title.signature.data=<html>Signaturdaten</html>
 windowtitle.save=Signaturdaten speichern
 windowtitle.error=Fehler
 windowtitle.savedir=Signaturdaten in Verzeichnis speichern
@@ -38,7 +38,8 @@ wait=<html>Bitte warten...</html>
 cardnotsupported=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
 insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
 enterpin=<html>{0} eingeben</html>
-enterpin.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben</html>
+enterpin.pinpad=<html>PIN am Kartenleser eingeben</html>
+enterpin.pinpad.direct=<html>{0} ({1} stellig) am Kartenleser eingeben</html>
 hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
 hashdatalink.tiny=<html><a href=\"anzeige\">Signaturdaten</a></html>
 hashdatalink.focus=<html><a href=\"anzeige\">[Signaturdaten anzeigen]</a></html>
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
index c553bcb5..4d86d21b 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
@@ -16,15 +16,15 @@
 title.welcome=<html>Welcome</html>
 title.insertcard=<html>No citizen card found</html>
 title.cardnotsupported=<html>This card is not supported</html>
-#title.cardpin=<html>Enter {0}</html>
-title.cardpin=<html>Reading card</html>
+title.verify.pin=<html>Reading card</html>
 title.sign=<html>Create signature</html>
+title.verify.pinpad=<html>Enter PIN
 title.error=<html>Error</html>
 title.warning=<html>Warning
 title.entry.timeout=<html>Timeout</html>
 title.retry=<html>Wrong PIN</html>
 title.wait=<html>Please wait</html>
-title.hashdata=<html>Signature data</html>
+title.signature.data=<html>Signature data</html>
 windowtitle.save=Save signature data
 windowtitle.error=Error
 windowtitle.savedir=Save signature data to directory
@@ -38,7 +38,8 @@ wait=<html>Please wait...</html>
 insertcard=<html>Please insert your citizen card into the reader</html>
 cardnotsupported=<html>Please insert your citizen card into the reader</html>
 enterpin=<html>Enter {0}</html>
-enterpin.pinpad=<html>Enter {0} ({1} digits) on card reader pinpad</html>
+enterpin.pinpad=<html>Enter PIN on card reader pinpad</html>
+enterpin.pinpad.direct=<html>Enter {0} ({1} digits) on card reader pinpad</html>
 hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
 hashdatalink.tiny=<html><a href=\"anzeige\">signature data</a></html>
 hashdatalink.focus=<html><a href=\"anzeige\">[Display signature data]</a></html>
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 6e345ee3..a2a84d6e 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
@@ -45,7 +45,7 @@ public class BKUGUIWorker implements Runnable {
 
   @Override
   public void run() {
-//        try {
+        try {
 
     final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Test-PIN", (byte) 0x81, null);
     final PINSpec cardPinSpec = new PINSpec(4, 4, "[0-9]", "Test-PIN", (byte) 0x01, null);
@@ -155,7 +155,10 @@ public class BKUGUIWorker implements Runnable {
 //
 //            gui.showSignaturePINDialog(signPinSpec, -1, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
 
-    gui.showPinpadSignaturePINDialog(signPinSpec, -1, hashdataListener, "hashdata");
+    gui.showSignatureDataDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata");
+    Thread.sleep(2000);
+    
+    gui.showEnterPINDirect(signPinSpec, -1);
 //
 //            Thread.sleep(4000);
 //
@@ -189,8 +192,8 @@ public class BKUGUIWorker implements Runnable {
 //            gui.showTextPlainHashDataInput("hallo,\n welt!", "12345", null, "cancel", null, "save");
 //            Thread.sleep(2000);
 
-//        } catch (InterruptedException ex) {
-//            ex.printStackTrace();
-//        }
+        } catch (InterruptedException ex) {
+            ex.printStackTrace();
+        }
   }
 }
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ComparePinDocument.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ComparePinDocument.java
new file mode 100644
index 00000000..623f6fad
--- /dev/null
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ComparePinDocument.java
@@ -0,0 +1,102 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.gui;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.swing.JButton;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
+import javax.swing.text.PlainDocument;
+
+/**
+ * Checks if the pin confirmation (compareTo) corresponds to this pin.
+ * Additionally, checks if currentPIN (optional) meets the requirements before enabling the OK button.
+ * @author clemens
+ */
+class ComparePinDocument extends PlainDocument {
+
+  private static final long serialVersionUID = 1L;
+  protected Pattern pinPattern;
+  protected int minLength;
+  protected int maxLength;
+  protected JButton enterButton;
+  protected Document compareTo;
+  protected Document currentPIN;
+
+  /**
+   * Constructor without compareTo Document parameter (allow null and set later to avoid cyclic dependencies)
+   */
+  public ComparePinDocument(int minLength, int maxLength, String pattern, JButton enterButton) {
+    if (enterButton == null) {
+      throw new NullPointerException("OK button null");
+    }
+    if (pattern != null) {
+      pinPattern = Pattern.compile(pattern);
+    } else {
+      pinPattern = Pattern.compile(".");
+    }
+    this.minLength = minLength;
+    this.maxLength = maxLength;
+    this.enterButton = enterButton;
+  }
+
+  /**
+   * @param compareTo should not be null (allow null and set later to avoid cyclic dependencies)
+   */
+  public ComparePinDocument(int minLength, int maxLength, String pattern,
+          JButton enterButton, Document compareTo) {
+    this(minLength, maxLength, pattern, enterButton);
+    this.compareTo = compareTo;
+  }
+  
+  public ComparePinDocument(int minLength, int maxLength, String pattern,
+          JButton enterButton, Document compareTo, Document currentPIN) {
+    this(minLength, maxLength, pattern, enterButton, compareTo);
+    this.currentPIN = currentPIN;
+  }
+
+  @Override
+  public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
+    if (maxLength < 0 || maxLength >= (getLength() + str.length())) {
+      boolean matches = true;
+      for (int i = 0; i < str.length(); i++) {
+        Matcher m = pinPattern.matcher(str.substring(i, i + 1));
+        if (!m.matches()) {
+          matches = false;
+        }
+      }
+      if (matches) {
+        super.insertString(offs, str, a);
+        enterButton.setEnabled(
+                getLength() >= minLength
+                && (currentPIN == null || currentPIN.getLength() >= minLength)
+                && compareTo.getText(0, compareTo.getLength()).equals(getText(0, getLength())));
+      }
+    }
+  }
+
+  @Override
+  public void remove(int offs, int len) throws BadLocationException {
+    super.remove(offs, len);
+    enterButton.setEnabled(
+            getLength() >= minLength
+            && (currentPIN == null || currentPIN.getLength() >= minLength)
+            && compareTo.getText(0, compareTo.getLength()).equals(getText(0, getLength())));
+  }
+}
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ExtendedPinDocument.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ExtendedPinDocument.java
new file mode 100644
index 00000000..3a0d7a66
--- /dev/null
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ExtendedPinDocument.java
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.gui;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.swing.JButton;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
+import javax.swing.text.PlainDocument;
+
+/**
+ * This PINDocument also checks if the additional (optional) pinDocuments also meet the requirements
+ * to enable the OK button. 
+ * Checks if (optional) newPIN and confirmPIN correspond
+ * 
+ * @author clemens
+ */
+class ExtendedPinDocument extends PlainDocument {
+
+  private static final long serialVersionUID = 1L;
+  protected Pattern pinPattern;
+  protected int minLength;
+  protected int maxLength;
+  protected JButton enterButton;
+  protected Document newPIN;
+  protected Document confirmPIN;
+
+  public ExtendedPinDocument(int minLength, int maxLength, String pattern, JButton enterButton) {
+    if (enterButton == null) {
+      throw new NullPointerException("OK Button null");
+    }
+    if (pattern != null) {
+      pinPattern = Pattern.compile(pattern);
+    } else {
+      pinPattern = Pattern.compile(".");
+    }
+    this.minLength = minLength;
+    this.maxLength = maxLength;
+    this.enterButton = enterButton;
+  }
+
+  /**
+   * @param pinSpec
+   * @param enterButton
+   * @param newPIN, confirmPIN
+   */
+  public ExtendedPinDocument(int minLength, int maxLength, String pattern, JButton enterButton, Document newPIN, Document confirmPIN) {
+    this(minLength, maxLength, pattern, enterButton);
+    this.newPIN = newPIN;
+    this.confirmPIN = confirmPIN;
+  }
+
+  @Override
+  public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
+    if (maxLength < 0 || maxLength >= (getLength() + str.length())) {
+      boolean matches = true;
+      for (int i = 0; i < str.length(); i++) {
+        Matcher m = pinPattern.matcher(str.substring(i, i + 1));
+        if (!m.matches()) {
+          matches = false;
+        }
+      }
+      if (matches) {
+        super.insertString(offs, str, a);
+        enterButton.setEnabled(
+                getLength() >= minLength
+                && (newPIN == null || newPIN.getLength() >= minLength)
+                && (confirmPIN == null || compare()));
+      }
+    }
+  }
+
+  @Override
+  public void remove(int offs, int len) throws BadLocationException {
+    super.remove(offs, len);
+    enterButton.setEnabled(
+            getLength() >= minLength
+            && (newPIN == null || newPIN.getLength() >= minLength)
+            && (confirmPIN == null || compare()));
+  }
+
+  /**
+   * assume confirmPIN != null
+   * @return
+   */
+  private boolean compare() throws BadLocationException {
+    if (newPIN != null) {
+      return confirmPIN.getText(0, confirmPIN.getLength()).equals(newPIN.getText(0, newPIN.getLength()));
+    }
+    return false;
+  }
+}
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
index 5bbed096..4dcc388f 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java
@@ -239,23 +239,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
   }
 
   @Override
-  public void showPINDialog(DIALOG type, PINSpec pinSpec,
-          ActionListener okListener, String okCommand,
-          ActionListener cancelListener, String cancelCommand) {
-    showPINDialog(type, pinSpec, -1, false,
-            okListener, okCommand, cancelListener, cancelCommand);
-  }
-
-  @Override
-  public void showPINDialog(DIALOG type, PINSpec pinSpec, int retries,
-          ActionListener okListener, String okCommand,
-          ActionListener cancelListener, String cancelCommand) {
-    showPINDialog(type, pinSpec, retries, false,
-            okListener, okCommand, cancelListener, cancelCommand);
-  }
-
-  @Override
-  public void showPinpadPINDialog(DIALOG type, PINSpec pinSpec, int retries) {
+  public void showModifyPINDirect(DIALOG type, PINSpec pinSpec, int retries) {
     String title, msg;
     Object[] params;
     if (retries < 0) {
@@ -269,19 +253,19 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
       if (type == DIALOG.CHANGE) {
         log.debug("show change pin dialog");
         title = TITLE_CHANGE_PIN;
-        msg = MESSAGE_CHANGEPIN_PINPAD;
+        msg = MESSAGE_CHANGE_PINPAD_DIREKT;
       } else if (type == DIALOG.ACTIVATE) {
         log.debug("show activate pin dialog");
         title = TITLE_ACTIVATE_PIN;
-        msg = MESSAGE_ENTERPIN_PINPAD;
+        msg = MESSAGE_ACTIVATE_PINPAD_DIREKT;
       } else if (type == DIALOG.VERIFY) {
         log.debug("show verify pin dialog");
-        title = TITLE_VERIFY_PIN;
-        msg = MESSAGE_ENTERPIN_PINPAD;
+        title = TITLE_VERIFY_PINPAD;
+        msg = MESSAGE_ENTERPIN_PINPAD_DIRECT;
       } else {
         log.debug("show unblock pin dialog");
         title = TITLE_UNBLOCK_PIN;
-        msg = MESSAGE_ENTERPIN_PINPAD;
+        msg = MESSAGE_UNBLOCK_PINPAD_DIREKT;
       }
 
     } else {
@@ -294,6 +278,15 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
     showMessageDialog(title, msg, params);
   }
 
+  @Override
+  public void showPINDialog(DIALOG type, PINSpec pinSpec, int retries,
+          ActionListener okListener, String okCommand,
+          ActionListener cancelListener, String cancelCommand) {
+    showPINDialog(type, pinSpec, retries, false,
+            okListener, okCommand, cancelListener, cancelCommand);
+  }
+
+
   private void showPINDialog(final DIALOG type, final PINSpec pinSpec,
           final int retries, final boolean pinpad,
           final ActionListener okListener, final String okCommand,
@@ -322,7 +315,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                 } else if (type == DIALOG.VERIFY) {
                   log.debug("show verify pin dialog");
                   TITLE = TITLE_VERIFY_PIN;
-                  MESSAGE_MGMT = MESSAGE_VERIFY_PIN;
+                  MESSAGE_MGMT = MESSAGE_ENTERPIN;
                 } else {
                   log.debug("show unblock pin dialog");
                   TITLE = TITLE_UNBLOCK_PIN;
@@ -393,7 +386,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                 if (pinpad) {
                   JLabel pinpadLabel = new JLabel();
                   pinpadLabel.setFont(mgmtLabel.getFont().deriveFont(mgmtLabel.getFont().getStyle() & ~Font.BOLD));
-                  String pinpadPattern = getMessage(MESSAGE_VERIFYPIN_PINPAD);
+                  String pinpadPattern = getMessage(MESSAGE_ENTERPIN_PINPAD);
                   pinpadLabel.setText(MessageFormat.format(pinpadPattern,
                           new Object[] { pinSpec.getLocalizedName(), pinSpec.getLocalizedLength() }));
                   
@@ -403,7 +396,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                           .addComponent(pinpadLabel);
                 } else {
 
-                JButton okButton = new JButton();
+                final JButton okButton = new JButton();
                 okButton.setFont(okButton.getFont().deriveFont(okButton.getFont().getStyle() & ~Font.BOLD));
                 okButton.setText(getMessage(BUTTON_OK));
                 okButton.setEnabled(pinSpec.getMinLength() <= 0);
@@ -414,7 +407,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                 JLabel repeatPinLabel = null;
                 JLabel pinLabel = new JLabel();
                 pinLabel.setFont(pinLabel.getFont().deriveFont(pinLabel.getFont().getStyle() & ~Font.BOLD));
-                String pinLabelPattern = (type == DIALOG.CHANGE) ? getMessage(LABEL_NEW_PIN) : getMessage(LABEL_PIN);
+                String pinLabelPattern = (type == DIALOG.CHANGE || type == DIALOG.UNBLOCK) ? getMessage(LABEL_NEW_PIN) : getMessage(LABEL_PIN);
                 pinLabel.setText(MessageFormat.format(pinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
 
                 final JPasswordField repeatPinField = new JPasswordField();
@@ -436,8 +429,6 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                 });
 
                 if (type != DIALOG.VERIFY) {
-                  pinField.setDocument(
-                      new PINDocument(pinSpec.getRecMinLength(), pinSpec.getRecMaxLength(), pinSpec.getRexepPattern(), null));
                   repeatPinLabel = new JLabel();
                   repeatPinLabel.setFont(pinLabel.getFont());
                   String repeatPinLabelPattern = getMessage(LABEL_REPEAT_PIN);
@@ -449,22 +440,20 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
 
                       @Override
                       public void actionPerformed(ActionEvent e) {
-                          if (pinField.getPassword().length >= pinSpec.getMinLength()) {
+                          if (okButton.isEnabled()) {
                               okListener.actionPerformed(e);
                           }
                       }
                   });
 
-                  if (type == DIALOG.CHANGE) {
+                  if (type == DIALOG.CHANGE || type == DIALOG.UNBLOCK) {
                     oldPinLabel = new JLabel();
                     oldPinLabel.setFont(oldPinLabel.getFont().deriveFont(oldPinLabel.getFont().getStyle() & ~java.awt.Font.BOLD));
-                    String oldPinLabelPattern = getMessage(LABEL_OLD_PIN);
+                    String oldPinLabelPattern = getMessage((type == DIALOG.CHANGE) ? LABEL_OLD_PIN : LABEL_PUK);
                     oldPinLabel.setText(MessageFormat.format(oldPinLabelPattern, new Object[]{pinSpec.getLocalizedName()}));
 
                     oldPinField = new JPasswordField();
                     oldPinField.setText("");
-                    oldPinField.setDocument(
-                        new PINDocument(pinSpec.getMinLength(), pinSpec.getMaxLength(), pinSpec.getRexepPattern(), null));
                     oldPinField.setActionCommand(okCommand);
                     oldPinField.addActionListener(new ActionListener() {
 
@@ -476,16 +465,45 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
                         }
                     });
 
-                    repeatPinField.setDocument(
-                        new PINDocument(pinSpec.getRecMinLength(), pinSpec.getRecMaxLength(), pinSpec.getRexepPattern(), 
-                            okButton, pinField.getDocument(), oldPinField.getDocument()));
+                    ExtendedPinDocument oldPinDocument =
+                        new ExtendedPinDocument(pinSpec.getMinLength(), pinSpec.getMaxLength(),
+                            pinSpec.getRexepPattern(), okButton);
+                    ComparePinDocument newPinDocument =
+                        new ComparePinDocument(pinSpec.getRecMinLength(), pinSpec.getRecMaxLength(), pinSpec.getRexepPattern(),
+                            okButton);
+                    ComparePinDocument confirmPinDocument =
+                        new ComparePinDocument(pinSpec.getRecMinLength(), pinSpec.getRecMaxLength(), pinSpec.getRexepPattern(),
+                            okButton);
+
+                    oldPinDocument.newPIN = newPinDocument;
+                    oldPinDocument.confirmPIN = confirmPinDocument;
+                    
+                    newPinDocument.compareTo = confirmPinDocument;
+                    newPinDocument.currentPIN = oldPinDocument;
+                    confirmPinDocument.compareTo = newPinDocument;
+                    confirmPinDocument.currentPIN = oldPinDocument;
+
+                    oldPinField.setDocument(oldPinDocument);
+                    pinField.setDocument(newPinDocument);
+                    repeatPinField.setDocument(confirmPinDocument);
+
                   } else {
                     // else -> ACTIVATE (not verify, not change)
-                    repeatPinField.setDocument(
-                        new PINDocument(pinSpec.getRecMinLength(), pinSpec.getRecMaxLength(), pinSpec.getRexepPattern(), 
-                            okButton, pinField.getDocument()));
+                    ComparePinDocument newPinDocument =
+                        new ComparePinDocument(pinSpec.getRecMinLength(), pinSpec.getRecMaxLength(), pinSpec.getRexepPattern(),
+                            okButton);
+                    ComparePinDocument confirmPinDocument =
+                        new ComparePinDocument(pinSpec.getRecMinLength(), pinSpec.getRecMaxLength(), pinSpec.getRexepPattern(),
+                            okButton);
+
+                    newPinDocument.compareTo = confirmPinDocument;
+                    confirmPinDocument.compareTo = newPinDocument;
+
+                    pinField.setDocument(newPinDocument);
+                    repeatPinField.setDocument(confirmPinDocument);
                   }
                 } else {
+                  // VERIFY
                   pinField.setDocument(
                       new PINDocument(pinSpec.getMinLength(), pinSpec.getMaxLength(), pinSpec.getRexepPattern(), okButton));
                 }
@@ -534,7 +552,7 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
 //                } else {
 
 
-                  if (type == DIALOG.CHANGE) {
+                  if (type == DIALOG.CHANGE || type == DIALOG.UNBLOCK) {
                     pinHorizontal
                           .addGroup(mainPanelLayout.createSequentialGroup()
                             .addGroup(mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -675,4 +693,69 @@ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFac
     return bs;
   }
 
+  @Override
+  public void showEnterCurrentPIN(DIALOG type, PINSpec pinSpec, int retries) {
+    String title, message;
+//    Object[] params = null;
+    
+    if (type == PINManagementGUIFacade.DIALOG.VERIFY) {
+      title = PINManagementGUIFacade.TITLE_VERIFY_PINPAD;
+      message = BKUGUIFacade.MESSAGE_ENTERPIN_PINPAD;
+//      params = new Object[]{pinSpec.getLocalizedName(), pinSpec.getLocalizedLength()};
+    } else if (type == PINManagementGUIFacade.DIALOG.ACTIVATE) {
+      title = PINManagementGUIFacade.TITLE_ACTIVATE_PIN;
+      message = PINManagementGUIFacade.MESSAGE_ACTIVATE_PINPAD_CURRENT;
+//      params = new Object[]{pinSpec.getLocalizedName(), pinSpec.getLocalizedLength()};
+    } else if (type == PINManagementGUIFacade.DIALOG.CHANGE) {
+      title = PINManagementGUIFacade.TITLE_CHANGE_PIN;
+      message = PINManagementGUIFacade.MESSAGE_CHANGE_PINPAD_CURRENT;
+//      params = new Object[]{pinSpec.getLocalizedName(), pinSpec.getLocalizedLength()};
+    } else { //if (type == DIALOG.UNBLOCK) {
+      title = PINManagementGUIFacade.TITLE_UNBLOCK_PIN;
+      message = PINManagementGUIFacade.MESSAGE_UNBLOCK_PINPAD_CURRENT;
+//      params = new Object[]{pinSpec.getLocalizedName(), pinSpec.getLocalizedLength()};
+    }
+    showEnterPIN(pinSpec, retries, title, message, null);
+  }
+
+  @Override
+  public void showEnterNewPIN(DIALOG type, PINSpec pinSpec) {
+    String title, message;
+    if (type == PINManagementGUIFacade.DIALOG.ACTIVATE) {
+      title = PINManagementGUIFacade.TITLE_ACTIVATE_PIN;
+      message = PINManagementGUIFacade.MESSAGE_ACTIVATE_PINPAD_NEW;
+    } else if (type == PINManagementGUIFacade.DIALOG.CHANGE) {
+      title = PINManagementGUIFacade.TITLE_CHANGE_PIN;
+      message = PINManagementGUIFacade.MESSAGE_CHANGE_PINPAD_NEW;
+    } else if (type == DIALOG.UNBLOCK) {
+      title = PINManagementGUIFacade.TITLE_UNBLOCK_PIN;
+      message = PINManagementGUIFacade.MESSAGE_UNBLOCK_PINPAD_NEW;
+    } else {
+      log.error("enterNewPIN not supported for dialog type " + type);
+      showErrorDialog(ERR_UNKNOWN, null);
+      return;
+    }
+    showEnterPIN(pinSpec, -1, title, message, null);
+  }
+
+  @Override
+  public void showConfirmNewPIN(DIALOG type, PINSpec pinSpec) {
+    String title, message;
+    if (type == PINManagementGUIFacade.DIALOG.ACTIVATE) {
+      title = PINManagementGUIFacade.TITLE_ACTIVATE_PIN;
+      message = PINManagementGUIFacade.MESSAGE_ACTIVATE_PINPAD_CONFIRM;
+    } else if (type == PINManagementGUIFacade.DIALOG.CHANGE) {
+      title = PINManagementGUIFacade.TITLE_CHANGE_PIN;
+      message = PINManagementGUIFacade.MESSAGE_CHANGE_PINPAD_CONFIRM;
+    } else if (type == DIALOG.UNBLOCK) {
+      title = PINManagementGUIFacade.TITLE_UNBLOCK_PIN;
+      message = PINManagementGUIFacade.MESSAGE_UNBLOCK_PINPAD_CONFIRM;
+    } else {
+      log.error("enterNewPIN not supported for dialog type " + type);
+      showErrorDialog(ERR_UNKNOWN, null);
+      return;
+    }
+    showEnterPIN(pinSpec, -1, title, message, null);
+  }
+
 }
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
index f99bcfd1..46ae18b9 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java
@@ -32,26 +32,39 @@ public interface PINManagementGUIFacade extends BKUGUIFacade {
   public static final String TITLE_PINMGMT = "title.pin.mgmt";
   public static final String TITLE_ACTIVATE_PIN = "title.activate.pin";
   public static final String TITLE_CHANGE_PIN = "title.change.pin";
-  public static final String TITLE_VERIFY_PIN = "title.verify.pin";
+//  public static final String TITLE_VERIFY_PIN = "title.verify.pin";
   public static final String TITLE_UNBLOCK_PIN = "title.unblock.pin";
   public static final String TITLE_ACTIVATE_SUCCESS = "title.activate.success";
+  public static final String TITLE_UNBLOCK_SUCCESS = "title.unblock.success";
   public static final String TITLE_CHANGE_SUCCESS = "title.change.success";
 
   // removed message.* prefix to reuse keys as help keys
   public static final String MESSAGE_ACTIVATE_SUCCESS = "activate.success";
   public static final String MESSAGE_CHANGE_SUCCESS = "change.success";
+  public static final String MESSAGE_UNBLOCK_SUCCESS = "unblock.success";
   public static final String MESSAGE_PINMGMT = "pin.mgmt";
 //  public static final String MESSAGE_PINPAD = "pinpad";
+
   public static final String MESSAGE_ACTIVATE_PIN = "activate.pin";
   public static final String MESSAGE_CHANGE_PIN = "change.pin";
-  public static final String MESSAGE_VERIFY_PIN = "verify.pin";
   public static final String MESSAGE_UNBLOCK_PIN = "unblock.pin";
-  public static final String MESSAGE_ACTIVATEPIN_PINPAD = "activate.pinpad";
-  public static final String MESSAGE_CHANGEPIN_PINPAD = "change.pinpad";
-  public static final String MESSAGE_VERIFYPIN_PINPAD = "verify.pinpad";
-  public static final String MESSAGE_UNBLOCKPIN_PINPAD = "unblock.pinpad";
+
+  public static final String MESSAGE_ACTIVATE_PINPAD_CURRENT = "activate.pinpad.current";
+  public static final String MESSAGE_CHANGE_PINPAD_CURRENT = "change.pinpad.current";
+  public static final String MESSAGE_UNBLOCK_PINPAD_CURRENT = "unblock.pinpad.current";
+  public static final String MESSAGE_ACTIVATE_PINPAD_NEW = "activate.pinpad.new";
+  public static final String MESSAGE_CHANGE_PINPAD_NEW = "change.pinpad.new";
+  public static final String MESSAGE_UNBLOCK_PINPAD_NEW = "unblock.pinpad.new";
+  public static final String MESSAGE_ACTIVATE_PINPAD_CONFIRM = "activate.pinpad.confirm";
+  public static final String MESSAGE_CHANGE_PINPAD_CONFIRM = "change.pinpad.confirm";
+  public static final String MESSAGE_UNBLOCK_PINPAD_CONFIRM = "unblock.pinpad.confirm";
+
+  public static final String MESSAGE_ACTIVATE_PINPAD_DIREKT = "activate.pinpad.direct";
+  public static final String MESSAGE_CHANGE_PINPAD_DIREKT = "change.pinpad.direct";
+  public static final String MESSAGE_UNBLOCK_PINPAD_DIREKT = "unblock.pinpad.direct";
 
   public static final String LABEL_OLD_PIN = "label.old.pin";
+  public static final String LABEL_PUK = "label.puk";
   public static final String LABEL_NEW_PIN = "label.new.pin";
   public static final String LABEL_REPEAT_PIN = "label.repeat.pin";
 
@@ -81,35 +94,34 @@ public interface PINManagementGUIFacade extends BKUGUIFacade {
   public enum STATUS { ACTIV, NOT_ACTIV, BLOCKED, UNKNOWN };
   public enum DIALOG { VERIFY, ACTIVATE, CHANGE, UNBLOCK };
 
+  /**
+   * list pins
+   */
   public void showPINManagementDialog(Map<PINSpec, STATUS> pins,
           ActionListener activateListener, String activateCmd, String changeCmd, String unblockCmd, String verifyCmd,
           ActionListener cancelListener, String cancelCmd);
 
-  public void showPINDialog(DIALOG type, PINSpec pin,
+  /**
+   * "software" pin-entry dialog (activate, change, unblock, verify)
+   */
+  public void showPINDialog(DIALOG type, PINSpec pinSpec, int retries,
           ActionListener okListener, String okCmd,
           ActionListener cancelListener, String cancelCmd);
 
-  public void showPINDialog(DIALOG type, PINSpec pin, int retries,
-          ActionListener okListener, String okCmd,
-          ActionListener cancelListener, String cancelCmd);
+  /**
+   * <b>direct</b> pinpad pin-entry dialog
+   */
+  public void showModifyPINDirect(DIALOG type, PINSpec pinSpec, int retries);
+
+  /**
+   * <b>start/finish</b> pinpad pin-entry dialog
+   */
+  public void showEnterCurrentPIN(DIALOG type, PINSpec pinSpec, int retries);
+
+  public void showEnterNewPIN(DIALOG type, PINSpec pinSpec);
+
+  public void showConfirmNewPIN(DIALOG type, PINSpec pinSpec);
 
-  public void showPinpadPINDialog(DIALOG type, PINSpec pin, int retries);
-
-//  public void showActivatePINDialog(PINSpec pin,
-//          ActionListener okListener, String okCmd,
-//          ActionListener cancelListener, String cancelCmd);
-//
-//  public void showChangePINDialog(PINSpec pin,
-//          ActionListener okListener, String okCmd,
-//          ActionListener cancelListener, String cancelCmd);
-//
-//  public void showUnblockPINDialog(PINSpec pin,
-//          ActionListener okListener, String okCmd,
-//          ActionListener cancelListener, String cancelCmd);
-//
-//  public void showVerifyPINDialog(PINSpec pin,
-//          ActionListener okListener, String okCmd,
-//          ActionListener cancelListener, String cancelCmd);
 
   public char[] getOldPin();
 
diff --git a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
index 977d6e3a..5ef3edee 100644
--- a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
+++ b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
@@ -15,30 +15,44 @@
 
 title.activation=<html>Aktivierung</html>
 title.pin.mgmt=<html>PIN Verwaltung</html>
-title.activate.pin=<html>PIN Aktivieren</html>
-title.change.pin=<html>PIN \u00C4ndern</html>
-title.unblock.pin=<html>PIN Entsperren</html>
-title.verify.pin=<html>PIN Eingeben</html>
+title.activate.pin=<html>PIN aktivieren</html>
+title.change.pin=<html>PIN \u00E4ndern</html>
+title.unblock.pin=<html>PIN entsperren</html>
+#title.verify.pin=<html>PIN Eingeben</html>
 title.activate.success=<html>Erfolg</html>
 title.change.success=<html>Erfolg</html>
+title.unblock.success=<html>Erfolg</html>
 
 # removed message.* prefix to reuse keys as help keys
 pin.mgmt=<html>Die Karte verf\u00FCgt \u00FCber {0} PINs</html>
+# software pin-entry messages
 activate.pin=<html>{0} eingeben und best\u00E4tigen</html>
 change.pin=<html>{0} eingeben und best\u00E4tigen</html>
 unblock.pin=<html>PUK zu {0} eingeben</html>
-verify.pin=<html>{0} eingeben</html>
-verify.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben (und best\u00E4tigen).</html>
-activate.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben und wiederholen (jeweils best\u00E4tigen).</html>
-change.pinpad=<html>Alte {0} ({1} stellig) am Kartenleser eingeben, danach neue {0} eingeben und wiederholen (jeweils best\u00E4tigen). </html>
-unblock.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben (und best\u00E4tigen).</html>
-activate.success=<html>{0} wurde erfolgreich aktiviert.</html>
-change.success=<html>{0} wurde erfolgreich ge\u00E4ndert.</html>
+# start/finish pin-entry messages
+activate.pinpad.current=<html>Transport-PIN am Kartenleser eingeben
+activate.pinpad.new=<html>Neue PIN am Kartenleser eingeben
+activate.pinpad.confirm=<html>Neue PIN am Kartenleser best\u00E4tigen
+change.pinpad.current=<html>Alte PIN am Kartenleser eingeben
+change.pinpad.new=<html>Neue PIN am Kartenleser eingeben
+change.pinpad.confirm=<html>Neue PIN am Kartenleser best\u00E4tigen
+unblock.pinpad.current=<html>PUK am Kartenleser eingeben
+unblock.pinpad.new=<html>Neue PIN am Kartenleser eingeben
+unblock.pinpad.confirm=<html>Neue PIN am Kartenleser best\u00E4tigen
+# direct pin-entry messages
+activate.pinpad.direct=<html>{0} ({1} stellig) am Kartenleser eingeben und wiederholen (jeweils best\u00E4tigen).</html>
+change.pinpad.direct=<html>Alte {0} ({1} stellig) am Kartenleser eingeben, danach neue {0} eingeben und wiederholen (jeweils best\u00E4tigen). </html>
+unblock.pinpad.direct=<html>{0} ({1} stellig) am Kartenleser eingeben (und best\u00E4tigen).</html>
+# response messages
+activate.success=<html>{0} wurde erfolgreich aktiviert
+change.success=<html>{0} wurde erfolgreich ge\u00E4ndert
+unblock.success=<html>{0} wurde erfolgreich entsperrt
 
 label.activation=<html>e-card Aktivierungsprozess</html>
 label.activation.step=<html>Schritt {0}</html>
 label.activation.idle=<html>Warte auf Server...</html>
 label.old.pin=<html>Alte {0}:</html>
+label.puk=<html>{0} PUK:</html>
 label.new.pin=<html>Neue {0}:</html>
 label.repeat.pin=<html>Best\u00E4tigung:</html>
 
diff --git a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
index 7f01971b..87e3f181 100644
--- a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
+++ b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties
@@ -16,29 +16,43 @@
 title.activation=<html>Activation</html>
 title.pin.mgmt=<html>PIN Management</html>
 title.activate.pin=<html>Activate PIN</html>
-title.verify.pin=<html>Enter PIN</html>
+#title.verify.pin=<html>Enter PIN</html>
 title.change.pin=<html>Change PIN</html>
 title.unblock.pin=<html>Unblock PIN</html>
 title.activate.success=<html>Success</html>
 title.change.success=<html>Success</html>
+title.unblock.success=<html>Success</html>
 
 # removed message.* prefix to reuse keys as help keys
-pin.mgmt=<html>The smartcard has {0} PINs</html>
-activate.pin=<html>Enter and confirm {0}</html>
-change.pin=<html>Enter and confirm {0}</html>
-unblock.pin=<html>Enter PUK for {0}</html>
-verify.pin=<html>Enter {0}</html>
-verify.pinpad=<html>Enter {0} ({1} digits) on cardreader (and confirm).</html>
-activate.pinpad=<html>Enter {0} ({1} digits) on cardreader and repeat (confirm in each case).</html>
-change.pinpad=<html>Enter old {0} ({1} digits) on cardreader, then enter new {0} and repeat (confirm in each case).</html>
-unblock.pinpad=<html>Enter {0} ({1} digits) on cardreader (and confirm).</html>
+pin.mgmt=<html>{0} PINs available
+# software pin-entry messages
+activate.pin=<html>Enter and confirm {0}
+change.pin=<html>Enter and confirm {0}
+unblock.pin=<html>Enter PUK for {0}
+# start/finish pin-entry messages
+activate.pinpad.current=<html>Enter transport-PIN on cardreader
+activate.pinpad.new=<html>Enter new PIN on cardreader
+activate.pinpad.confirm=<html>Confirm new PIN on cardreader
+change.pinpad.current=<html>Enter old PIN on cardreader
+change.pinpad.new=<html>Enter new PIN on cardreader
+change.pinpad.confirm=<html>Confirm new PIN on cardreader
+unblock.pinpad.current=<html>Enter PUK on cardreader
+unblock.pinpad.new=<html>Enter new PIN on cardreader
+unblock.pinpad.confirm=<html>Confirm new PIN on cardreader
+# direct pin-entry messages
+activate.pinpad.direct=<html>Enter {0} ({1} digits) on cardreader and repeat (confirm in each case)
+change.pinpad.direct=<html>Enter old {0} ({1} digits) on cardreader, then enter new {0} and repeat (confirm in each case)
+unblock.pinpad.direct=<html>Enter {0} ({1} digits) on cardreader, then enter new {0} and repeat (confirm in each case)
+# response messages
 activate.success=<html>{0} successfully activated</html>
 change.success=<html>{0} successfully changed</html>
+unblock.success=<html>{0} successfully unblocked
 
 label.activation=<html>e-card activation process</html>
 label.activation.step=<html>Step {0}</html>
 label.activation.idle=<html>Wait for server...</html>
 label.old.pin=<html>Old {0}:</html>
+label.puk=<html>{0} PUK:</html>
 label.new.pin=<html>New {0}:</html>
 label.repeat.pin=<html>Confirmation:</html>
 
diff --git a/BKUOnline/src/main/resources/log4j.properties b/BKUOnline/src/main/resources/log4j.properties
index 3eab8604..40133c83 100644
--- a/BKUOnline/src/main/resources/log4j.properties
+++ b/BKUOnline/src/main/resources/log4j.properties
@@ -15,7 +15,7 @@
 
 
 #log4j.rootLogger=DEBUG, STDOUT, file
-log4j.rootLogger=INFO, file
+log4j.rootLogger=TRACE, file
 #log4j.logger.at.gv = INFO
 
 
diff --git a/BKUOnline/src/main/webapp/META-INF/context.xml b/BKUOnline/src/main/webapp/META-INF/context.xml
index 2a2da79e..f38215a1 100644
--- a/BKUOnline/src/main/webapp/META-INF/context.xml
+++ b/BKUOnline/src/main/webapp/META-INF/context.xml
@@ -16,4 +16,4 @@
   limitations under the License.
 -->
 <!--Context path="/bkuonline"/-->
-<Context path="/bkuonline"/>
+<Context path=""/>
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
index 1ed5a177..b8cdb208 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ACOSCard.java
@@ -16,6 +16,8 @@
 */
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.pin.gui.ModifyPINGUI;
+import at.gv.egiz.smcc.pin.gui.PINGUI;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -79,10 +81,16 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
 
   public static final byte KID_PIN_SIG = (byte) 0x81;
 
+  public static final byte KID_PUK_SIG = (byte) 0x83;
+
   public static final byte KID_PIN_DEC = (byte) 0x81;
 
+  public static final byte KID_PUK_DEC = (byte) 0x82;
+
   public static final byte KID_PIN_INF = (byte) 0x83;
 
+  public static final byte KID_PUK_INF = (byte) 0x84;
+
   public static final byte[] DST_SIG = new byte[] { (byte) 0x84, (byte) 0x01, // tag
       // ,
       // length
@@ -217,7 +225,7 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
 
   @Override
   @Exclusive
-  public byte[] getInfobox(String infobox, PINProvider provider, String domainId)
+  public byte[] getInfobox(String infobox, PINGUI provider, String domainId)
       throws SignatureCardException, InterruptedException {
     
     if ("IdentityLink".equals(infobox)) {
@@ -233,7 +241,7 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
   
   }
 
-  protected byte[] getIdentityLinkV1(PINProvider provider, String domainId) 
+  protected byte[] getIdentityLinkV1(PINGUI provider, String domainId)
       throws SignatureCardException, InterruptedException {
     
     try {
@@ -262,7 +270,7 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
     
   }
   
-  protected byte[] getIdentityLinkV2(PINProvider provider, String domainId)
+  protected byte[] getIdentityLinkV2(PINGUI provider, String domainId)
       throws SignatureCardException, InterruptedException {
     
     try {
@@ -388,7 +396,7 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
   @Override
   @Exclusive
   public byte[] createSignature(InputStream input, KeyboxName keyboxName,
-      PINProvider provider, String alg) throws SignatureCardException, InterruptedException, IOException {
+      PINGUI provider, String alg) throws SignatureCardException, InterruptedException, IOException {
   
     ByteArrayOutputStream dst = new ByteArrayOutputStream();
     // key ID
@@ -487,7 +495,7 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
    * @see at.gv.egiz.smcc.AbstractSignatureCard#verifyPIN(at.gv.egiz.smcc.PINSpec, at.gv.egiz.smcc.PINProvider)
    */
   @Override
-  public void verifyPIN(PINSpec pinSpec, PINProvider pinProvider)
+  public void verifyPIN(PINSpec pinSpec, PINGUI pinProvider)
       throws LockedException, NotActivatedException, CancelledException,
       TimeoutException, SignatureCardException, InterruptedException {
 
@@ -509,7 +517,7 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
    * @see at.gv.egiz.smcc.AbstractSignatureCard#changePIN(at.gv.egiz.smcc.PINSpec, at.gv.egiz.smcc.ChangePINProvider)
    */
   @Override
-  public void changePIN(PINSpec pinSpec, ChangePINProvider pinProvider)
+  public void changePIN(PINSpec pinSpec, ModifyPINGUI pinProvider)
       throws LockedException, NotActivatedException, CancelledException,
       TimeoutException, SignatureCardException, InterruptedException {
 
@@ -528,7 +536,7 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
   }
 
   @Override
-  public void activatePIN(PINSpec pinSpec, PINProvider pinProvider)
+  public void activatePIN(PINSpec pinSpec, ModifyPINGUI pinGUI)
       throws CancelledException, SignatureCardException, CancelledException,
       TimeoutException, InterruptedException {
     log.error("ACTIVATE PIN not supported by ACOS");
@@ -536,7 +544,7 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
   }
 
   @Override
-  public void unblockPIN(PINSpec pinSpec, PINProvider pinProvider)
+  public void unblockPIN(PINSpec pinSpec, ModifyPINGUI pinGUI)
       throws CancelledException, SignatureCardException, InterruptedException {
     throw new SignatureCardException("Unblock PIN not supported.");
   }
@@ -570,10 +578,8 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
   // PROTECTED METHODS (assume exclusive card access)
   ////////////////////////////////////////////////////////////////////////
 
-  protected void verifyPINLoop(CardChannel channel, PINSpec spec, PINProvider provider)
-      throws InterruptedException, LockedException, NotActivatedException,
-      TimeoutException, PINFormatException, PINOperationAbortedException,
-      SignatureCardException, CardException {
+  protected void verifyPINLoop(CardChannel channel, PINSpec spec, PINGUI provider)
+      throws InterruptedException, CardException, SignatureCardException {
     
     int retries = -1;
     do {
@@ -581,10 +587,8 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
     } while (retries > 0);
   }
 
-  protected void changePINLoop(CardChannel channel, PINSpec spec, ChangePINProvider provider)
-      throws InterruptedException, LockedException, NotActivatedException,
-      TimeoutException, PINFormatException, PINOperationAbortedException,
-      SignatureCardException, CardException {
+  protected void changePINLoop(CardChannel channel, PINSpec spec, ModifyPINGUI provider)
+      throws InterruptedException, CardException, SignatureCardException {
 
     int retries = -1;
     do {
@@ -593,7 +597,7 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
   }
 
   protected int verifyPIN(CardChannel channel, PINSpec pinSpec,
-      PINProvider provider, int retries) throws InterruptedException, CardException, SignatureCardException {
+      PINGUI provider, int retries) throws InterruptedException, CardException, SignatureCardException {
     
     VerifyAPDUSpec apduSpec = new VerifyAPDUSpec(
         new byte[] {
@@ -602,7 +606,7 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
             (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 
         0, VerifyAPDUSpec.PIN_FORMAT_ASCII, 8);
     
-    ResponseAPDU resp = reader.verify(channel, apduSpec, pinSpec, provider, retries);
+    ResponseAPDU resp = reader.verify(channel, apduSpec, provider, pinSpec, retries);
     
     if (resp.getSW() == 0x9000) {
       return -1;
@@ -625,7 +629,7 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
   }
 
   protected int changePIN(CardChannel channel, PINSpec pinSpec,
-      ChangePINProvider pinProvider, int retries) throws CancelledException, InterruptedException, CardException, SignatureCardException {
+      ModifyPINGUI pinProvider, int retries) throws CancelledException, InterruptedException, CardException, SignatureCardException {
 
     ChangeReferenceDataAPDUSpec apduSpec = new ChangeReferenceDataAPDUSpec(
         new byte[] {
@@ -639,7 +643,7 @@ public class ACOSCard extends AbstractSignatureCard implements PINMgmtSignatureC
     
     
     
-    ResponseAPDU resp = reader.modify(channel, apduSpec, pinSpec, pinProvider, retries);
+    ResponseAPDU resp = reader.modify(channel, apduSpec, pinProvider, pinSpec, retries);
     
     if (resp.getSW() == 0x9000) {
       return -1;
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
index 54b4c7fe..fcb94fc6 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
@@ -16,6 +16,8 @@
 */
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.reader.CardReader;
+import at.gv.egiz.smcc.reader.ReaderFactory;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -29,9 +31,6 @@ import javax.smartcardio.CardTerminal;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import at.gv.egiz.smcc.ccid.CCID;
-import at.gv.egiz.smcc.ccid.ReaderFactory;
-
 public abstract class AbstractSignatureCard implements SignatureCard {
 
   private static Log log = LogFactory.getLog(AbstractSignatureCard.class);
@@ -45,7 +44,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
 
   private Card card_;
   
-  protected CCID reader;
+  protected CardReader reader;
 
   protected AbstractSignatureCard(String resourceBundleName) {
     this.resourceBundleName = resourceBundleName;
@@ -68,7 +67,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
   @Override
   public void init(Card card, CardTerminal cardTerminal) {
     this.card_ = card;
-    this.reader = ReaderFactory.getInstance().getReader(card, cardTerminal);
+    this.reader = ReaderFactory.getReader(card, cardTerminal);
   }
   
   @Override
@@ -80,11 +79,6 @@ public abstract class AbstractSignatureCard implements SignatureCard {
     return new LogCardChannel(card_.getBasicChannel());
   }
 
-  @Override
-  public CCID getReader() {
-    return reader;
-  }
-
   @Override
   public void setLocale(Locale locale) {
     if (locale == null) {
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/BELPICCard.java b/smcc/src/main/java/at/gv/egiz/smcc/BELPICCard.java
index e02a55d4..41358bb5 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/BELPICCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/BELPICCard.java
@@ -18,6 +18,7 @@
 
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.pin.gui.PINGUI;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.MessageDigest;
@@ -110,7 +111,7 @@ public class BELPICCard extends AbstractSignatureCard implements SignatureCard {
 
   @Override
   @Exclusive
-  public byte[] getInfobox(String infobox, PINProvider provider, String domainId)
+  public byte[] getInfobox(String infobox, PINGUI provider, String domainId)
       throws SignatureCardException, InterruptedException {
       
     throw new IllegalArgumentException("Infobox '" + infobox
@@ -120,7 +121,7 @@ public class BELPICCard extends AbstractSignatureCard implements SignatureCard {
   @Override
   @Exclusive
   public byte[] createSignature(InputStream input, KeyboxName keyboxName,
-      PINProvider provider, String alg) throws SignatureCardException, InterruptedException, IOException {
+      PINGUI provider, String alg) throws SignatureCardException, InterruptedException, IOException {
     
     if (KeyboxName.SECURE_SIGNATURE_KEYPAIR != keyboxName) {
       throw new SignatureCardException("Card does not support key " + keyboxName + ".");
@@ -176,7 +177,7 @@ public class BELPICCard extends AbstractSignatureCard implements SignatureCard {
   }
   
   protected void verifyPINLoop(CardChannel channel, PINSpec spec,
-      PINProvider provider) throws LockedException, NotActivatedException,
+      PINGUI provider) throws LockedException, NotActivatedException,
       SignatureCardException, InterruptedException, CardException {
     
     int retries = -1; //verifyPIN(channel, spec, null, -1);
@@ -186,7 +187,7 @@ public class BELPICCard extends AbstractSignatureCard implements SignatureCard {
   }
 
   protected int verifyPIN(CardChannel channel, PINSpec pinSpec,
-      PINProvider provider, int retries) throws SignatureCardException,
+      PINGUI provider, int retries) throws SignatureCardException,
       LockedException, NotActivatedException, InterruptedException,
       CardException {
     
@@ -197,7 +198,7 @@ public class BELPICCard extends AbstractSignatureCard implements SignatureCard {
             (byte) 0xff, (byte) 0xff, (byte) 0xff }, 
         1, VerifyAPDUSpec.PIN_FORMAT_BCD, 7, 4, 4);
     
-    ResponseAPDU resp = reader.verify(channel, apduSpec, pinSpec, provider, retries);
+    ResponseAPDU resp = reader.verify(channel, apduSpec, provider, pinSpec, retries);
     
     if (resp.getSW() == 0x9000) {
       return -1;
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ChangePINProvider.java b/smcc/src/main/java/at/gv/egiz/smcc/ChangePINProvider.java
deleted file mode 100644
index 41010551..00000000
--- a/smcc/src/main/java/at/gv/egiz/smcc/ChangePINProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* 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.
-*/
-package at.gv.egiz.smcc;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public interface ChangePINProvider extends PINProvider {
-
-  /**
-   *
-   * @param spec
-   * @param retries
-   * @return null if no old value for this pin
-   * @throws at.gv.egiz.smcc.CancelledException if cancelled by user
-   * @throws java.lang.InterruptedException
-   */
-  public char[] provideOldPIN(PINSpec spec, int retries)
-          throws CancelledException, InterruptedException;
-
-}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ITCard.java b/smcc/src/main/java/at/gv/egiz/smcc/ITCard.java
index 831a1f9b..64389190 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/ITCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ITCard.java
@@ -17,6 +17,7 @@
 
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.pin.gui.PINGUI;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -96,7 +97,7 @@ public class ITCard extends AbstractSignatureCard {
 
   @Override
   @Exclusive
-  public byte[] getInfobox(String infobox, PINProvider provider, String domainId)
+  public byte[] getInfobox(String infobox, PINGUI provider, String domainId)
       throws SignatureCardException, InterruptedException {
       
     throw new IllegalArgumentException("Infobox '" + infobox
@@ -106,7 +107,7 @@ public class ITCard extends AbstractSignatureCard {
   @Override
   @Exclusive
   public byte[] createSignature(InputStream input, KeyboxName keyboxName,
-      PINProvider provider, String alg) throws SignatureCardException,
+      PINGUI provider, String alg) throws SignatureCardException,
       InterruptedException, IOException {
 
     if (KeyboxName.SECURE_SIGNATURE_KEYPAIR != keyboxName) {
@@ -159,7 +160,7 @@ public class ITCard extends AbstractSignatureCard {
   }
 
   protected void verifyPINLoop(CardChannel channel, PINSpec spec,
-      PINProvider provider) throws LockedException, NotActivatedException,
+      PINGUI provider) throws LockedException, NotActivatedException,
       SignatureCardException, InterruptedException, CardException {
     
     int retries = -1;
@@ -169,7 +170,7 @@ public class ITCard extends AbstractSignatureCard {
   }
 
   protected int verifyPIN(CardChannel channel, PINSpec pinSpec,
-      PINProvider provider, int retries) throws SignatureCardException,
+      PINGUI provider, int retries) throws SignatureCardException,
       LockedException, NotActivatedException, InterruptedException,
       CardException {
     
@@ -180,7 +181,7 @@ public class ITCard extends AbstractSignatureCard {
             (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff }, 
         0, VerifyAPDUSpec.PIN_FORMAT_ASCII, 8);
     
-    ResponseAPDU resp = reader.verify(channel, apduSpec, pinSpec, provider, retries);
+    ResponseAPDU resp = reader.verify(channel, apduSpec, provider, pinSpec, retries);
     
     if (resp.getSW() == 0x9000) {
       return -2;
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/PINConfirmationException.java b/smcc/src/main/java/at/gv/egiz/smcc/PINConfirmationException.java
index eaf38435..24dfa53c 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/PINConfirmationException.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/PINConfirmationException.java
@@ -23,23 +23,4 @@ package at.gv.egiz.smcc;
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class PINConfirmationException extends SignatureCardException {
-
-  private static final long serialVersionUID = 1L;
-
-  public PINConfirmationException() {
-    super();
-  }
-
-  public PINConfirmationException(String message, Throwable cause) {
-    super(message, cause);
-  }
-
-  public PINConfirmationException(String message) {
-    super(message);
-  }
-
-  public PINConfirmationException(Throwable cause) {
-    super(cause);
-  }
-
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/PINFormatException.java b/smcc/src/main/java/at/gv/egiz/smcc/PINFormatException.java
index 774fcdf5..721c63e2 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/PINFormatException.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/PINFormatException.java
@@ -23,23 +23,4 @@ package at.gv.egiz.smcc;
  * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class PINFormatException extends SignatureCardException {
-
-  private static final long serialVersionUID = 1L;
-
-  public PINFormatException() {
-    super();
-  }
-
-  public PINFormatException(String message, Throwable cause) {
-    super(message, cause);
-  }
-
-  public PINFormatException(String message) {
-    super(message);
-  }
-
-  public PINFormatException(Throwable cause) {
-    super(cause);
-  }
-
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/PINMgmtSignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/PINMgmtSignatureCard.java
index 53738612..5091c10f 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/PINMgmtSignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/PINMgmtSignatureCard.java
@@ -16,6 +16,9 @@
 */
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.pin.gui.ModifyPINGUI;
+
+import at.gv.egiz.smcc.pin.gui.PINGUI;
 import java.util.List;
 
 public interface PINMgmtSignatureCard extends SignatureCard {
@@ -26,16 +29,16 @@ public interface PINMgmtSignatureCard extends SignatureCard {
 
   public PIN_STATE getPINState(PINSpec pinSpec) throws SignatureCardException;
   
-  public void verifyPIN(PINSpec pinSpec, PINProvider pinProvider)
+  public void verifyPIN(PINSpec pinSpec, PINGUI pinGUI)
   throws LockedException, NotActivatedException, CancelledException, SignatureCardException, InterruptedException;
 
-  public void changePIN(PINSpec pinSpec, ChangePINProvider pinProvider)
+  public void changePIN(PINSpec pinSpec, ModifyPINGUI changePINGUI)
   throws LockedException, NotActivatedException, CancelledException, PINFormatException, SignatureCardException, InterruptedException;
 
-  public void activatePIN(PINSpec pinSpec, PINProvider pinProvider)
+  public void activatePIN(PINSpec pinSpec, ModifyPINGUI activatePINGUI)
   throws CancelledException, SignatureCardException, InterruptedException;
 
-  public void unblockPIN(PINSpec pinSpec, PINProvider pukProvider)
+  public void unblockPIN(PINSpec pinSpec, ModifyPINGUI pukGUI)
   throws CancelledException, SignatureCardException, InterruptedException;
 
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/PINProvider.java b/smcc/src/main/java/at/gv/egiz/smcc/PINProvider.java
deleted file mode 100644
index 5c294b5b..00000000
--- a/smcc/src/main/java/at/gv/egiz/smcc/PINProvider.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* 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.
-*/
-package at.gv.egiz.smcc;
-
-/**
- * The number of retries is not fixed and there is no way (?) to obtain this value.
- * A PINProvider should therefore maintain an internal retry counter or flag
- * to decide whether or not to warn the user (num retries passed in providePIN).
- *
- * Therefore PINProvider objects should not be reused.
- *
- * (ACOS: reload counter: between 0 and 15, where 15 meens deactivated)
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public interface PINProvider {
-
-  /**
-   *
-   * @param spec
-   * @param retries num of remaining retries or -1 if unknown
-   * (a positive value does <em>not</em> necessarily signify that there was
-   * already an unsuccessful PIN verification)
-   * @return pin != null
-   * @throws at.gv.egiz.smcc.CancelledException
-   * @throws java.lang.InterruptedException
-   */
-  public char[] providePIN(PINSpec spec, int retries)
-          throws CancelledException, InterruptedException;
-
-}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ResetRetryCounterAPDUSpec.java b/smcc/src/main/java/at/gv/egiz/smcc/ResetRetryCounterAPDUSpec.java
new file mode 100644
index 00000000..7e71eb7e
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ResetRetryCounterAPDUSpec.java
@@ -0,0 +1,38 @@
+/*
+* 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.
+*/
+package at.gv.egiz.smcc;
+
+public class ResetRetryCounterAPDUSpec extends ChangeReferenceDataAPDUSpec {
+
+  /**
+   * @param apdu
+   * @param pukPosition
+   * @param pukFormat
+   * @param pukLength
+   * @param pukLengthSize
+   * @param pukLengthPos
+   * @param pinInsertionOffsetNew
+   */
+  public ResetRetryCounterAPDUSpec(byte[] apdu, int pukPosition,
+      int pukFormat, int pukLength, int pukLengthSize, int pukLengthPos,
+      int pinInsertionOffsetNew) {
+    super(apdu, pukPosition, pukFormat, pukLength, pukLengthSize, pukLengthPos);
+    this.pinInsertionOffsetNew = pinInsertionOffsetNew;
+  }
+
+  
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
index 79a4cc69..ad05352f 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java
@@ -17,6 +17,8 @@
 
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.pin.gui.ModifyPINGUI;
+import at.gv.egiz.smcc.pin.gui.PINGUI;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -225,7 +227,7 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
   
   @Override
   @Exclusive
-  public byte[] getInfobox(String infobox, PINProvider provider, String domainId)
+  public byte[] getInfobox(String infobox, PINGUI pinGUI, String domainId)
       throws SignatureCardException, InterruptedException {
   
     try {
@@ -243,7 +245,7 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
           try {
             return ISO7816Utils.readTransparentFileTLV(channel, -1, (byte) 0x30);
           } catch (SecurityStatusNotSatisfiedException e) {
-            verifyPINLoop(channel, spec, provider);
+            verifyPINLoop(channel, spec, pinGUI);
           }
         }
         
@@ -301,7 +303,7 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
   @Override
   @Exclusive
   public byte[] createSignature(InputStream input, KeyboxName keyboxName,
-      PINProvider provider, String alg) throws SignatureCardException, InterruptedException, IOException {
+      PINGUI provider, String alg) throws SignatureCardException, InterruptedException, IOException {
   
     ByteArrayOutputStream dst = new ByteArrayOutputStream();
     byte[] ht = null;
@@ -431,7 +433,7 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
    */
   @Override
   @Exclusive
-  public void verifyPIN(PINSpec pinSpec, PINProvider pinProvider)
+  public void verifyPIN(PINSpec pinSpec, PINGUI pinProvider)
       throws LockedException, NotActivatedException, CancelledException,
       TimeoutException, SignatureCardException, InterruptedException {
     
@@ -442,12 +444,7 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
         // SELECT application
         execSELECT_AID(channel, pinSpec.getContextAID());
       }
-      log.debug("*** verifyPIN loop");
       verifyPINLoop(channel, pinSpec, pinProvider);
-//      log.debug("*** verifyPIN 0");
-//      int retries = verifyPIN(channel, pinSpec, null, 0);
-//      log.debug("*** verifyPIN " + retries + " tries");
-//      verifyPIN(channel, pinSpec, pinProvider, retries);
     } catch (CardException e) {
       log.info("Failed to verify PIN.", e);
       throw new SignatureCardException("Failed to verify PIN.", e);
@@ -460,7 +457,7 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
    */
   @Override
   @Exclusive
-  public void changePIN(PINSpec pinSpec, ChangePINProvider pinProvider)
+  public void changePIN(PINSpec pinSpec, ModifyPINGUI pinGUI)
       throws LockedException, NotActivatedException, CancelledException,
       TimeoutException, SignatureCardException, InterruptedException {
     
@@ -471,9 +468,7 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
         // SELECT application
         execSELECT_AID(channel, pinSpec.getContextAID());
       }
-      changePINLoop(channel, pinSpec, pinProvider);
-//      int retries = verifyPIN(channel, pinSpec, null, 0);
-//      changePIN(channel, pinSpec, pinProvider, retries);
+      changePINLoop(channel, pinSpec, pinGUI);
     } catch (CardException e) {
       log.info("Failed to change PIN.", e);
       throw new SignatureCardException("Failed to change PIN.", e);
@@ -486,7 +481,7 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
    */
   @Override
   @Exclusive
-  public void activatePIN(PINSpec pinSpec, PINProvider pinProvider)
+  public void activatePIN(PINSpec pinSpec, ModifyPINGUI activatePINGUI)
       throws CancelledException, SignatureCardException, CancelledException,
       TimeoutException, InterruptedException {
 
@@ -497,7 +492,7 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
         // SELECT application
         execSELECT_AID(channel, pinSpec.getContextAID());
       }
-      activatePIN(channel, pinSpec, pinProvider);
+      activatePIN(channel, pinSpec, activatePINGUI);
     } catch (CardException e) {
       log.info("Failed to activate PIN.", e);
       throw new SignatureCardException("Failed to activate PIN.", e);
@@ -509,9 +504,16 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
    * @see at.gv.egiz.smcc.PINMgmtSignatureCard#unblockPIN(at.gv.egiz.smcc.PINSpec, at.gv.egiz.smcc.PINProvider)
    */
   @Override
-  public void unblockPIN(PINSpec pinSpec, PINProvider pukProvider)
+  public void unblockPIN(PINSpec pinSpec, ModifyPINGUI pukProvider)
       throws CancelledException, SignatureCardException, InterruptedException {
-    throw new SignatureCardException("Unblock PIN is not supported.");
+    CardChannel channel = getCardChannel();
+
+    try {
+      unblockPINLoop(channel, pinSpec, pukProvider);
+    } catch (CardException e) {
+      log.info("Failed to activate PIN.", e);
+      throw new SignatureCardException("Failed to activate PIN.", e);
+    }
   }
 
   @Override
@@ -574,7 +576,7 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
   // PROTECTED METHODS (assume exclusive card access)
   ////////////////////////////////////////////////////////////////////////
   
-  protected void verifyPINLoop(CardChannel channel, PINSpec spec, PINProvider provider)
+  protected void verifyPINLoop(CardChannel channel, PINSpec spec, PINGUI provider)
       throws LockedException, NotActivatedException, SignatureCardException,
       InterruptedException, CardException {
     
@@ -584,7 +586,7 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
     } while (retries > 0);
   }
 
-  protected void changePINLoop(CardChannel channel, PINSpec spec, ChangePINProvider provider)
+  protected void changePINLoop(CardChannel channel, PINSpec spec, ModifyPINGUI provider)
       throws LockedException, NotActivatedException, SignatureCardException,
       InterruptedException, CardException {
 
@@ -594,8 +596,19 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
     } while (retries > 0);
   }
   
+  protected void unblockPINLoop(CardChannel channel, PINSpec spec, ModifyPINGUI provider)
+      throws LockedException, NotActivatedException, SignatureCardException,
+      InterruptedException, CardException {
+
+    //TODO get PUK retry counter from EF FID 0036 in MF
+    int retries = -1;
+    do {
+      retries = unblockPIN(channel, spec, provider, retries);
+    } while (retries > 0);
+  }
+
   protected int verifyPIN(CardChannel channel, PINSpec pinSpec,
-      PINProvider provider, int retries) throws SignatureCardException,
+      PINGUI provider, int retries) throws SignatureCardException,
       LockedException, NotActivatedException, InterruptedException,
       CardException {
     
@@ -608,108 +621,135 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu
     
     ResponseAPDU resp;
     if (provider != null) {
-      resp = reader.verify(channel, apduSpec, pinSpec, provider, retries);
+      resp = reader.verify(channel, apduSpec, provider, pinSpec, retries);
     } else {
       resp = channel.transmit(new CommandAPDU(0x00, 0x20, 0x00, pinSpec.getKID()));
     }
-    
+
+
     if (resp.getSW() == 0x9000) {
       return -1;
-    }
-    if (resp.getSW() == 0x63c0) {
-      // returned by the 'short' VERIFY
+    } else if (resp.getSW() == 0x6983 || resp.getSW() == 0x63c0) {
+      // authentication method blocked (0x63c0 returned by 'short' VERIFY)
       throw new LockedException();
-    }
-    if (resp.getSW() >> 4 == 0x63c) {
-      return 0x0f & resp.getSW();
-    }
-    
-    switch (resp.getSW()) {
-    case 0x6983:
-      // authentication method blocked
-      // returned by the 'long' VERIFY
-      throw new LockedException();
-    case 0x6984:
-      // reference data not usable
+    } else if (resp.getSW() == 0x6984 || resp.getSW() == 0x6985) {
+      // reference data not usable; conditions of use not satisfied
       throw new NotActivatedException();
-    case 0x6985:
-      // conditions of use not satisfied
+    } else if (resp.getSW() >> 4 == 0x63c) {
+      return 0x0f & resp.getSW();
+    } else if (version > 1.2 && resp.getSW() == 0x6400) {
+      log.warn("cannot query pin status prior to card activation");
       throw new NotActivatedException();
-  
-    default:
+    } else {
       String msg = "VERIFY failed. SW=" + Integer.toHexString(resp.getSW()); 
       log.info(msg);
       throw new SignatureCardException(msg);
     }
-    
   }
   
   protected int changePIN(CardChannel channel, PINSpec pinSpec,
-      ChangePINProvider pinProvider, int retries) throws CancelledException,
+      ModifyPINGUI pinProvider, int retries) throws CancelledException,
       InterruptedException, CardException, SignatureCardException {
-    
-    ChangeReferenceDataAPDUSpec apduSpec = new ChangeReferenceDataAPDUSpec(
-        new byte[] { 
-            (byte) 0x00, (byte) 0x24, (byte) 0x00, pinSpec.getKID(), (byte) 0x10, 
-            (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, 
-            (byte) 0xff, (byte) 0xff, (byte) 0xff, 
-            (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, 
-            (byte) 0xff, (byte) 0xff, (byte) 0xff }, 
+
+      ChangeReferenceDataAPDUSpec apduSpec = new ChangeReferenceDataAPDUSpec(
+        new byte[] {
+            (byte) 0x00, (byte) 0x24, (byte) 0x00, pinSpec.getKID(), (byte) 0x10,
+            (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
+            (byte) 0xff, (byte) 0xff, (byte) 0xff,
+            (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
+            (byte) 0xff, (byte) 0xff, (byte) 0xff },
         1, VerifyAPDUSpec.PIN_FORMAT_BCD, 7, 4, 4, 8);
-    
-    ResponseAPDU resp = reader.modify(channel, apduSpec, pinSpec, pinProvider, retries);
-    
+
+    ResponseAPDU resp = reader.modify(channel, apduSpec, pinProvider, pinSpec, retries);
+
     if (resp.getSW() == 0x9000) {
       return -1;
-    }
-    if (resp.getSW() >> 4 == 0x63c) {
-      return 0x0f & resp.getSW();
-    }
-    
-    switch (resp.getSW()) {
-    case 0x6983:
+    } else if (resp.getSW() == 0x6983) {
       // authentication method blocked
       throw new LockedException();
-  
-    default:
+    } else if (resp.getSW() == 0x6984) {
+      throw new NotActivatedException();
+    } else if (resp.getSW() >> 4 == 0x63c) {
+      return 0x0f & resp.getSW();
+    } else {
       String msg = "CHANGE REFERENCE DATA failed. SW=" + Integer.toHexString(resp.getSW()); 
       log.info(msg);
       throw new SignatureCardException(msg);
     }
-   
-    
   }
 
   protected int activatePIN(CardChannel channel, PINSpec pinSpec,
-      PINProvider provider) throws SignatureCardException,
+      ModifyPINGUI provider) throws SignatureCardException,
       InterruptedException, CardException {
     
-    NewReferenceDataAPDUSpec apduSpec = new NewReferenceDataAPDUSpec(
+    ResponseAPDU resp;
+    if (version < 1.2) {
+      NewReferenceDataAPDUSpec apduSpec = new NewReferenceDataAPDUSpec(
+          new byte[] {
+              (byte) 0x00, (byte) 0x24, (byte) 0x01, pinSpec.getKID(), (byte) 0x08,
+              (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
+              (byte) 0xff, (byte) 0xff, (byte) 0xff },
+          1, VerifyAPDUSpec.PIN_FORMAT_BCD, 7, 4, 4);
+
+      resp = reader.modify(channel, apduSpec, provider, pinSpec);
+    } else {
+      NewReferenceDataAPDUSpec apduSpec = new NewReferenceDataAPDUSpec(
+          new byte[] {
+              (byte) 0x00, (byte) 0x24, (byte) 0x00, pinSpec.getKID(), (byte) 0x10,
+              (byte) 0x26, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0xff,
+              (byte) 0xff, (byte) 0xff, (byte) 0xff, 
+              (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
+              (byte) 0xff, (byte) 0xff, (byte) 0xff },
+          1, VerifyAPDUSpec.PIN_FORMAT_BCD, 7, 4, 4);
+      apduSpec.setPinInsertionOffsetNew(8);
+      resp = reader.modify(channel, apduSpec, provider, pinSpec);
+    }
+
+    if (resp.getSW() == 0x9000) {
+      return -1;
+    } else {
+      String msg = "CHANGE REFERENCE DATA failed. SW=" + Integer.toHexString(resp.getSW());
+      log.info(msg);
+      throw new SignatureCardException(msg);
+    }
+  }
+  
+  protected int unblockPIN(CardChannel channel, PINSpec pinSpec,
+      ModifyPINGUI provider, int retries) throws SignatureCardException,
+      InterruptedException, CardException {
+
+    if (version < 1.2) {
+      // would return 0x6982 (Security status not satisfied)
+      throw new SignatureCardException("RESET RETRY COUNTER is not supported by this card.");
+    }
+
+    ResetRetryCounterAPDUSpec apduSpec = new ResetRetryCounterAPDUSpec(
         new byte[] {
-            (byte) 0x00, (byte) 0x24, (byte) 0x01, pinSpec.getKID(), (byte) 0x08,
+            (byte) 0x00, (byte) 0x2c, (byte) 0x00, pinSpec.getKID(), (byte) 0x10,
             (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
-            (byte) 0xff, (byte) 0xff, (byte) 0xff }, 
-        1, VerifyAPDUSpec.PIN_FORMAT_BCD, 7, 4, 4);
-    
-    ResponseAPDU resp = reader.activate(channel, apduSpec, pinSpec, provider);
-    
-    switch (resp.getSW()) {
-    
-    case 0x9000:
-      return -1;
+            (byte) 0xff, (byte) 0xff, (byte) 0xff,
+            (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
+            (byte) 0xff, (byte) 0xff, (byte) 0xff },
+        1, VerifyAPDUSpec.PIN_FORMAT_BCD, 7, 4, 4, 8);
 
-    case 0x6983:
-      // authentication method blocked
-      throw new LockedException();
+    ResponseAPDU resp = reader.modify(channel, apduSpec, provider, pinSpec, retries);
 
-    default:
-      String msg = "CHANGE REFERENCE DATA failed. SW=" + Integer.toHexString(resp.getSW()); 
+    if (resp.getSW() == 0x9000) {
+      return -1;
+    } else if (resp.getSW() == 0x6983) {
+      // PUK blocked
+      throw new LockedException();
+    } else if (resp.getSW() == 0x6984) {
+      throw new NotActivatedException();
+    } else if (resp.getSW() >> 4 == 0x63c) {
+      return 0x0f & resp.getSW();
+    } else {
+      String msg = "RESET RETRY COUNTER failed. SW=" + Integer.toHexString(resp.getSW());
       log.info(msg);
       throw new SignatureCardException(msg);
     }
-    
   }
-  
+
   protected void execSELECT_MF(CardChannel channel) throws CardException, SignatureCardException {
     ResponseAPDU resp = channel.transmit(
         new CommandAPDU(0x00, 0xA4, 0x00, 0x0C));
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
index 670704d5..73c7faa8 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
@@ -40,15 +40,12 @@ import java.util.Enumeration;
 import java.util.Locale;
 
 import javax.smartcardio.Card;
-import javax.smartcardio.CardChannel;
-import javax.smartcardio.CardException;
 import javax.smartcardio.CardTerminal;
-import javax.smartcardio.ResponseAPDU;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import at.gv.egiz.smcc.ccid.CCID;
+import at.gv.egiz.smcc.pin.gui.PINGUI;
 
 /**
  *
@@ -280,7 +277,7 @@ public class SWCard implements SignatureCard {
     
   }
 
-  public byte[] getInfobox(String infobox, PINProvider provider, String domainId) throws SignatureCardException {
+  public byte[] getInfobox(String infobox, PINGUI provider, String domainId) throws SignatureCardException {
     
     String fileName = getFileName(infobox + ".ibx");
     FileInputStream file;
@@ -309,7 +306,7 @@ public class SWCard implements SignatureCard {
   }
 
   @Override
-  public byte[] createSignature(InputStream input, KeyboxName keyboxName, PINProvider provider, String alg) throws SignatureCardException, InterruptedException, IOException {
+  public byte[] createSignature(InputStream input, KeyboxName keyboxName, PINGUI provider, String alg) throws SignatureCardException, InterruptedException, IOException {
 
     // KeyStore password
     char[] password = getPassword(keyboxName);
@@ -396,101 +393,4 @@ public class SWCard implements SignatureCard {
   @Override
   public void reset() throws SignatureCardException {
   }
-
-  @Override
-  public CCID getReader() {
-    return new CCID() {
-
-      @Override
-      public boolean hasFeature(Byte feature) {
-        return false;
-      }
-
-      @Override
-      public byte getbTimeOut() {
-        return 0;
-      }
-
-      @Override
-      public byte getbTimeOut2() {
-        return 0;
-      }
-
-      @Override
-      public byte getwPINMaxExtraDigitL() {
-        return 0x12;
-      }
-
-      @Override
-      public byte getwPINMaxExtraDigitH() {
-        return 0x00;
-      }
-
-      @Override
-      public byte getbEntryValidationCondition() {
-        return 0x02;
-      }
-
-      @Override
-      public Card connect() {
-        return null;
-      }
-
-      @Override
-      public String getName() {
-        return "Software CardReader";
-      }
-
-      @Override
-      public byte[] verifyPin(byte[] PIN_VERIFY) throws CardException {
-        throw new UnsupportedOperationException("Not supported yet.");
-      }
-
-      @Override
-      public byte[] verifyPinDirect(byte[] PIN_VERIFY) throws CardException {
-        throw new UnsupportedOperationException("Not supported yet.");
-      }
-
-      @Override
-      public byte[] modifyPin(byte[] PIN_MODIFY) throws CardException {
-        throw new UnsupportedOperationException("Not supported yet.");
-      }
-
-      @Override
-      public byte[] modifyPinDirect(byte[] PIN_MODIFY) throws CardException {
-        throw new UnsupportedOperationException("Not supported yet.");
-      }
-
-      @Override
-      public void setDisablePinpad(boolean disable) {
-        throw new UnsupportedOperationException("Not supported yet.");
-      }
-
-      @Override
-      public ResponseAPDU verify(CardChannel channel, VerifyAPDUSpec apduSpec,
-          PINSpec pinSpec, PINProvider provider, int retries)
-          throws CancelledException, InterruptedException, CardException,
-          SignatureCardException {
-        throw new UnsupportedOperationException("Not supported yet.");
-      }
-
-      @Override
-      public ResponseAPDU activate(CardChannel channel,
-          NewReferenceDataAPDUSpec apduSpec, PINSpec pinSpec,
-          PINProvider provider) throws CancelledException,
-          InterruptedException, CardException, SignatureCardException {
-        // TODO Auto-generated method stub
-        return null;
-      }
-
-      @Override
-      public ResponseAPDU modify(CardChannel channel,
-          ChangeReferenceDataAPDUSpec apduSpec, PINSpec pinSpec,
-          ChangePINProvider provider, int retries) throws CancelledException,
-          InterruptedException, CardException, SignatureCardException {
-        // TODO Auto-generated method stub
-        return null;
-      }
-    };
-  }
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
index 3d56f97b..fa589b84 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
@@ -17,8 +17,7 @@
 
 package at.gv.egiz.smcc;
 
-import at.gv.egiz.smcc.ccid.CCID;
-
+import at.gv.egiz.smcc.pin.gui.PINGUI;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Locale;
@@ -99,7 +98,7 @@ public interface SignatureCard {
    * @throws SignatureCardException
    * @throws InterruptedException if applet is destroyed while in pin dialog
    */
-  public byte[] getInfobox(String infobox, PINProvider provider, String domainId)
+  public byte[] getInfobox(String infobox, PINGUI pinGUI, String domainId)
       throws SignatureCardException, InterruptedException;
 
   /**
@@ -114,9 +113,7 @@ public interface SignatureCard {
    * @throws IOException 
    */
   public byte[] createSignature(InputStream input, KeyboxName keyboxName,
-      PINProvider provider, String alg) throws SignatureCardException, InterruptedException, IOException;
-
-  public CCID getReader();
+      PINGUI pinGUI, String alg) throws SignatureCardException, InterruptedException, IOException;
 
   /**
    * Sets the local for evtl. required callbacks (e.g. PINSpec)
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/ModifyPINGUI.java b/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/ModifyPINGUI.java
new file mode 100644
index 00000000..00dc2d0e
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/ModifyPINGUI.java
@@ -0,0 +1,36 @@
+/*
+* 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.
+*/
+package at.gv.egiz.smcc.pin.gui;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+
+
+public interface ModifyPINGUI extends ModifyPINProvider {
+
+  void modifyPINDirect(PINSpec spec, int retries) throws CancelledException, InterruptedException;
+  void finishDirect();
+
+  void enterCurrentPIN(PINSpec spec, int retries);
+  void enterNewPIN(PINSpec spec);
+  void confirmNewPIN(PINSpec spec);
+  void validKeyPressed();
+  void correctionButtonPressed();
+  void allKeysCleared();
+  /** called prior to MODIFY_PIN_FINISH control command transmission (clear display or display wait message) */
+  void finish();
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/ModifyPINProvider.java b/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/ModifyPINProvider.java
new file mode 100644
index 00000000..36f0097d
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/ModifyPINProvider.java
@@ -0,0 +1,48 @@
+/*
+* 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.
+*/
+package at.gv.egiz.smcc.pin.gui;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+
+
+/**
+ * user interface for "software pin-entry" of
+ * <ul>
+ * <li> current pin and new pin (change pin)
+ * <li> new pin (pin activation, no current pin)
+ * <li> puk and new pin (probably verify only?)
+ * </ul>
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public interface ModifyPINProvider {
+
+  /**
+   *
+   * @param spec
+   * @param retries
+   * @return null if no old value for this pin
+   * @throws at.gv.egiz.smcc.CancelledException if cancelled by user
+   * @throws java.lang.InterruptedException
+   */
+  public char[] provideCurrentPIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException;
+
+  public char[] provideNewPIN(PINSpec spec)
+          throws CancelledException, InterruptedException;
+
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINGUI.java b/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINGUI.java
new file mode 100644
index 00000000..5199977b
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINGUI.java
@@ -0,0 +1,42 @@
+/*
+* 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.
+*/
+package at.gv.egiz.smcc.pin.gui;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+
+
+/**
+ * Display messages for pinpad pin-entry.
+ * Provides an interface for two types of pinpad pin-entry: pinpad-direct and pinpad-start/finish
+ * @author clemens.orthacker@iaik.tugraz.at
+ */
+public interface PINGUI extends PINProvider {
+
+  void enterPINDirect(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException;
+  
+  /**
+   * @throws CancelledException, InterruptedException if signature-data dialog is interrupted or cancelled
+   */
+  void enterPIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException;
+  void validKeyPressed();
+  void correctionButtonPressed();
+  void allKeysCleared();
+  
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINProvider.java b/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINProvider.java
new file mode 100644
index 00000000..3bf49888
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINProvider.java
@@ -0,0 +1,49 @@
+/*
+* 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.
+*/
+package at.gv.egiz.smcc.pin.gui;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+
+
+/**
+ * The number of retries is not fixed and there is no way (?) to obtain this value.
+ * A PINProvider should therefore maintain an internal retry counter or flag
+ * to decide whether or not to warn the user (num retries passed in providePIN).
+ *
+ * Therefore PINProvider objects should not be reused.
+ *
+ * (ACOS: reload counter: between 0 and 15, where 15 meens deactivated)
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public interface PINProvider {
+
+  /**
+   *
+   * @param spec
+   * @param retries num of remaining retries or -1 if unknown
+   * (a positive value does <em>not</em> necessarily signify that there was
+   * already an unsuccessful PIN verification)
+   * @return pin != null
+   * @throws at.gv.egiz.smcc.CancelledException
+   * @throws java.lang.InterruptedException
+   */
+  char[] providePIN(PINSpec pinSpec, int retries)
+          throws CancelledException, InterruptedException;
+
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/reader/CardReader.java b/smcc/src/main/java/at/gv/egiz/smcc/reader/CardReader.java
new file mode 100644
index 00000000..a1246dd6
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/reader/CardReader.java
@@ -0,0 +1,92 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.reader;
+
+import javax.smartcardio.CardChannel;
+import javax.smartcardio.CardException;
+import javax.smartcardio.ResponseAPDU;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.ChangeReferenceDataAPDUSpec;
+import at.gv.egiz.smcc.NewReferenceDataAPDUSpec;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.ResetRetryCounterAPDUSpec;
+import at.gv.egiz.smcc.SignatureCardException;
+import at.gv.egiz.smcc.VerifyAPDUSpec;
+import at.gv.egiz.smcc.pin.gui.ModifyPINGUI;
+import at.gv.egiz.smcc.pin.gui.PINGUI;
+import javax.smartcardio.Card;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public interface CardReader {
+
+
+  String[] FEATURES = new String[]{"NO_FEATURE",
+    "FEATURE_VERIFY_PIN_START",
+    "FEATURE_VERIFY_PIN_FINISH",
+    "FEATURE_MODIFY_PIN_START",
+    "FEATURE_MODIFY_PIN_FINISH",
+    "FEATURE_GET_KEY_PRESSED",
+    "FEATURE_VERIFY_PIN_DIRECT",
+    "FEATURE_MODIFY_PIN_DIRECT",
+    "FEATURE_MCT_READER_DIRECT",
+    "FEATURE_MCT_UNIVERSAL",
+    "FEATURE_IFD_PIN_PROPERTIES",
+    "FEATURE_ABORT",
+    "FEATURE_SET_SPE_MESSAGE",
+    "FEATURE_VERIFY_PIN_DIRECT_APP_ID",
+    "FEATURE_MODIFY_PIN_DIRECT_APP_ID",
+    "FEATURE_WRITE_DISPLAY",
+    "FEATURE_GET_KEY",
+    "FEATURE_IFD_DISPLAY_PROPERTIES"};
+
+  Byte FEATURE_VERIFY_PIN_START = new Byte((byte) 0x01);
+  Byte FEATURE_VERIFY_PIN_FINISH = new Byte((byte) 0x02);
+  Byte FEATURE_MODIFY_PIN_START = new Byte((byte) 0x03);
+  Byte FEATURE_MODIFY_PIN_FINISH = new Byte((byte) 0x04);
+  Byte FEATURE_GET_KEY_PRESSED = new Byte((byte) 0x05);
+  Byte FEATURE_VERIFY_PIN_DIRECT = new Byte((byte) 0x06);
+  Byte FEATURE_MODIFY_PIN_DIRECT = new Byte((byte) 0x07);
+  Byte FEATURE_MCT_READER_DIRECT = new Byte((byte) 0x08);
+  Byte FEATURE_MCT_UNIVERSAL = new Byte((byte) 0x09);
+  Byte FEATURE_IFD_PIN_PROPERTIES = new Byte((byte) 0x0a);
+  //TODO continue list
+
+
+  Card connect() throws CardException;
+
+  boolean hasFeature(Byte feature);
+
+  ResponseAPDU verify(CardChannel channel, VerifyAPDUSpec apduSpec,
+          PINGUI pinGUI, PINSpec pinSpec, int retries)
+      throws CancelledException, InterruptedException, CardException, SignatureCardException;
+
+  ResponseAPDU modify(CardChannel channel, ChangeReferenceDataAPDUSpec apduSpec,
+          ModifyPINGUI pinGUI, PINSpec pinSpec, int retries)
+      throws CancelledException, InterruptedException, CardException, SignatureCardException;
+
+  ResponseAPDU modify(CardChannel channel, NewReferenceDataAPDUSpec apduSpec,
+          ModifyPINGUI pinGUI, PINSpec pinSpec)
+      throws CancelledException, InterruptedException, CardException, SignatureCardException;
+
+  ResponseAPDU modify(CardChannel channel, ResetRetryCounterAPDUSpec apduSpec,
+          ModifyPINGUI pinGUI, PINSpec pinSpec, int retries)
+      throws CancelledException, InterruptedException, CardException, SignatureCardException;
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/reader/DefaultCardReader.java b/smcc/src/main/java/at/gv/egiz/smcc/reader/DefaultCardReader.java
new file mode 100644
index 00000000..45ea7a5a
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/reader/DefaultCardReader.java
@@ -0,0 +1,106 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.reader;
+
+
+import javax.smartcardio.Card;
+import javax.smartcardio.CardChannel;
+import javax.smartcardio.CardException;
+import javax.smartcardio.CardTerminal;
+import javax.smartcardio.ResponseAPDU;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.smcc.ChangeReferenceDataAPDUSpec;
+import at.gv.egiz.smcc.NewReferenceDataAPDUSpec;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.ResetRetryCounterAPDUSpec;
+import at.gv.egiz.smcc.SignatureCardException;
+import at.gv.egiz.smcc.VerifyAPDUSpec;
+import at.gv.egiz.smcc.pin.gui.ModifyPINGUI;
+import at.gv.egiz.smcc.pin.gui.PINGUI;
+import at.gv.egiz.smcc.util.ISO7816Utils;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class DefaultCardReader implements CardReader {
+
+  protected final static Log log = LogFactory.getLog(DefaultCardReader.class);
+
+  protected CardTerminal ct;
+  protected String name;
+
+  public DefaultCardReader(CardTerminal ct) {
+    if (ct == null) {
+      throw new NullPointerException("no card or card terminal provided");
+    }
+    this.ct = ct;
+    this.name = ct.getName();
+  }
+
+  @Override
+  public ResponseAPDU verify(CardChannel channel, VerifyAPDUSpec apduSpec,
+          PINGUI pinGUI, PINSpec pinSpec, int retries)
+        throws SignatureCardException, CardException, InterruptedException {
+
+    log.debug("VERIFY");
+    return channel.transmit(ISO7816Utils.createVerifyAPDU(apduSpec, pinGUI.providePIN(pinSpec, retries)));
+  }
+
+  @Override
+  public ResponseAPDU modify(CardChannel channel, ChangeReferenceDataAPDUSpec apduSpec,
+          ModifyPINGUI pinGUI, PINSpec pinSpec, int retries)
+        throws SignatureCardException, CardException, InterruptedException {
+    log.debug("MODIFY (CHANGE_REFERENCE_DATA)");
+    char[] oldPin = pinGUI.provideCurrentPIN(pinSpec, retries);
+    char[] newPin = pinGUI.provideNewPIN(pinSpec);
+    return channel.transmit(ISO7816Utils.createChangeReferenceDataAPDU(apduSpec, oldPin, newPin));
+  }
+
+  @Override
+  public ResponseAPDU modify(CardChannel channel, NewReferenceDataAPDUSpec apduSpec,
+          ModifyPINGUI pinGUI, PINSpec pinSpec)
+        throws SignatureCardException, CardException, InterruptedException {
+    log.debug("MODIFY (NEW_REFERENCE_DATA)");
+    char[] newPIN = pinGUI.provideNewPIN(pinSpec);
+    return channel.transmit(ISO7816Utils.createNewReferenceDataAPDU(apduSpec, newPIN));
+  }
+
+  @Override
+  public ResponseAPDU modify(CardChannel channel, ResetRetryCounterAPDUSpec apduSpec,
+          ModifyPINGUI pinGUI, PINSpec pinSpec, int retries)
+          throws InterruptedException, CardException, SignatureCardException {
+    log.debug("MODIFY (RESET_RETRY_COUNTER)");
+    //TODO
+    return modify(channel, (ChangeReferenceDataAPDUSpec) apduSpec, pinGUI, pinSpec, retries);
+  }
+
+  @Override
+  public Card connect() throws CardException {
+    log.debug("connect icc");
+    return ct.connect("*");
+  }
+
+  @Override
+  public boolean hasFeature(Byte feature) {
+    return false;
+  }
+
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/reader/PinpadCardReader.java b/smcc/src/main/java/at/gv/egiz/smcc/reader/PinpadCardReader.java
new file mode 100644
index 00000000..c2537af8
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/reader/PinpadCardReader.java
@@ -0,0 +1,703 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.reader;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Map;
+
+import javax.smartcardio.Card;
+import javax.smartcardio.CardChannel;
+import javax.smartcardio.CardException;
+import javax.smartcardio.CardTerminal;
+import javax.smartcardio.ResponseAPDU;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.ChangeReferenceDataAPDUSpec;
+import at.gv.egiz.smcc.NewReferenceDataAPDUSpec;
+import at.gv.egiz.smcc.PINConfirmationException;
+import at.gv.egiz.smcc.PINFormatException;
+import at.gv.egiz.smcc.PINOperationAbortedException;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.ResetRetryCounterAPDUSpec;
+import at.gv.egiz.smcc.SignatureCardException;
+import at.gv.egiz.smcc.TimeoutException;
+import at.gv.egiz.smcc.VerifyAPDUSpec;
+import at.gv.egiz.smcc.pin.gui.ModifyPINGUI;
+import at.gv.egiz.smcc.pin.gui.PINGUI;
+import at.gv.egiz.smcc.util.SMCCHelper;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class PinpadCardReader extends DefaultCardReader {
+
+  public static final int PIN_ENTRY_POLLING_INTERVAL = 10;
+
+  protected final static Log log = LogFactory.getLog(PinpadCardReader.class);
+
+  protected byte bEntryValidationCondition = 0x02;  // validation key pressed
+  protected byte bTimeOut = 0x3c;                   // 60sec (= max on ReinerSCT)
+  protected byte bTimeOut2 = 0x00;                  // default (attention with SCM)
+  protected byte wPINMaxExtraDigitH = 0x00;         // min pin length zero digits
+  protected byte wPINMaxExtraDigitL = 0x0c;         // max pin length 12 digits
+
+  /**
+   * supported features and respective control codes
+   */
+  protected Map<Byte, Integer> features;
+  protected boolean VERIFY, MODIFY, VERIFY_DIRECT, MODIFY_DIRECT;
+
+  public PinpadCardReader(CardTerminal ct, Map<Byte, Integer> features) {
+    super(ct);
+    if (features == null) {
+      throw new NullPointerException("Pinpad card reader does not support any features");
+    }
+    this.features = features;
+
+    if (features.containsKey(FEATURE_VERIFY_PIN_START) &&
+        features.containsKey(FEATURE_GET_KEY_PRESSED) &&
+        features.containsKey(FEATURE_VERIFY_PIN_FINISH)) {
+      VERIFY = true;
+    }
+    if (features.containsKey(FEATURE_MODIFY_PIN_START) &&
+        features.containsKey(FEATURE_GET_KEY_PRESSED) &&
+        features.containsKey(FEATURE_MODIFY_PIN_FINISH)) {
+      MODIFY = true;
+    }
+    if (features.containsKey(FEATURE_VERIFY_PIN_DIRECT)) {
+      VERIFY_DIRECT = true;
+    }
+    if (features.containsKey(FEATURE_MODIFY_PIN_DIRECT)) {
+      MODIFY_DIRECT = true;
+    }
+
+    if (name != null) {
+      name = name.toLowerCase();
+      //ReinerSCT: http://support.reiner-sct.de/downloads/LINUX
+      //           http://www.linux-club.de/viewtopic.php?f=61&t=101287&start=0
+      //old: REINER SCT CyberJack 00 00
+      //new (CCID): 0C4B/0300 Reiner-SCT cyberJack pinpad(a) 00 00
+      //Snow Leopard: Reiner-SCT cyberJack pinpad(a) 00 00
+      //display: REINER SCT CyberJack 00 00
+      if(name.startsWith("gemplus gempc pinpad") || name.startsWith("gemalto gempc pinpad")) {
+        log.debug("setting custom wPINMaxExtraDigitH (0x04) for " + name);
+        wPINMaxExtraDigitH = 0x04;
+        log.debug("setting custom wPINMaxExtraDigitL (0x08) for " + name);
+        wPINMaxExtraDigitL = 0x08;
+      } else if (name.startsWith("omnikey cardman 3621")) {
+        log.debug("setting custom wPINMaxExtraDigitH (0x01) for " + name);
+        wPINMaxExtraDigitH = 0x01;
+      } else if (name.startsWith("scm spr 532") || name.startsWith("scm microsystems inc. sprx32 usb smart card reader")) {
+        log.debug("setting custom bTimeOut (0x3c) for " + name);
+        bTimeOut = 0x3c;
+        log.debug("setting custom bTimeOut2 (0x0f) for " + name);
+        bTimeOut2 = 0x0f;
+      } else if (name.startsWith("cherry smartboard xx44")) {
+        log.debug("setting custom wPINMaxExtraDigitH (0x01) for " + name);
+        wPINMaxExtraDigitH = 0x01;
+      }
+    }
+
+  }
+
+  @Override
+  public boolean hasFeature(Byte feature) {
+    return features.containsKey(feature);
+  }
+  
+  private void VERIFY_PIN_START(Card icc, byte[] PIN_VERIFY) throws CardException {
+    int ioctl = features.get(FEATURE_VERIFY_PIN_START);
+    if (log.isTraceEnabled()) {
+      log.trace("VERIFY_PIN_START (" + Integer.toHexString(ioctl) +
+              ")  " + SMCCHelper.toString(PIN_VERIFY));
+    }
+    byte[] resp = icc.transmitControlCommand(ioctl, PIN_VERIFY);
+    if (resp != null && resp.length > 0) {
+      if (resp[0] == (byte) 0x57) {
+        log.error("Invalid parameter in PIN_VERIFY structure");
+        throw new CardException("ERROR_INVALID_PARAMETER");
+      } else {
+        log.error("unexpected response to VERIFY_PIN_START: " +
+                SMCCHelper.toString(resp));
+        throw new CardException("unexpected response to VERIFY_PIN_START: " +
+                SMCCHelper.toString(resp));
+      }
+    }
+  }
+
+  private byte GET_KEY_PRESSED(Card icc) throws CardException {
+    int ioctl = features.get(FEATURE_GET_KEY_PRESSED);
+    byte[] resp = icc.transmitControlCommand(ioctl, new byte[0]);
+    if (resp != null && resp.length == 1) {
+//      if (log.isTraceEnabled()) {
+//        log.trace("response " + SMCCHelper.toString(resp));
+//      }
+      return resp[0];
+    }
+    log.error("unexpected response to GET_KEY_PRESSED: " +
+            SMCCHelper.toString(resp));
+    throw new CardException("unexpected response to GET_KEY_PRESSED: " +
+            SMCCHelper.toString(resp));
+  }
+
+  private byte[] VERIFY_PIN_FINISH(Card icc) throws CardException {
+    int ioctl = features.get(FEATURE_VERIFY_PIN_FINISH);
+    if (log.isTraceEnabled()) {
+      log.trace("VERIFY_PIN_FINISH (" + Integer.toHexString(ioctl) + ")");
+    }
+    byte[] resp = icc.transmitControlCommand(ioctl, new byte[0]);
+    if (resp != null && resp.length == 2) {
+      if (log.isTraceEnabled()) {
+        log.trace("response " + SMCCHelper.toString(resp));
+      }
+      return resp;
+    }
+    log.error("unexpected response to VERIFY_PIN_FINISH: " +
+            SMCCHelper.toString(resp));
+    throw new CardException("unexpected response to VERIFY_PIN_FINISH: " +
+            SMCCHelper.toString(resp));
+  }
+
+  private void MODIFY_PIN_START(Card icc, byte[] PIN_MODIFY) throws CardException {
+    int ioctl = features.get(FEATURE_MODIFY_PIN_START);
+    if (log.isTraceEnabled()) {
+      log.trace("MODFIY_PIN_START (" + Integer.toHexString(ioctl) +
+              ")  " + SMCCHelper.toString(PIN_MODIFY));
+    }
+    byte[] resp = icc.transmitControlCommand(ioctl, PIN_MODIFY);
+    if (resp != null && resp.length > 0) {
+      if (resp[0] == (byte) 0x57) {
+        log.error("Invalid parameter in PIN_MODIFY structure");
+        throw new CardException("ERROR_INVALID_PARAMETER");
+      } else {
+        log.error("unexpected response to MODIFY_PIN_START: " +
+                SMCCHelper.toString(resp));
+        throw new CardException("unexpected response to MODIFY_PIN_START: " +
+                SMCCHelper.toString(resp));
+      }
+    }
+  }
+
+  private byte[] MODIFY_PIN_FINISH(Card icc) throws CardException {
+    int ioctl = features.get(FEATURE_MODIFY_PIN_FINISH);
+    if (log.isTraceEnabled()) {
+      log.trace("MODIFY_PIN_FINISH (" + Integer.toHexString(ioctl) + ")");
+    }
+    byte[] resp = icc.transmitControlCommand(ioctl, new byte[0]);
+    if (resp != null && resp.length == 2) {
+      if (log.isTraceEnabled()) {
+        log.trace("response " + SMCCHelper.toString(resp));
+      }
+      return resp;
+    }
+    log.error("unexpected response to MODIFY_PIN_FINISH: " +
+            SMCCHelper.toString(resp));
+    throw new CardException("unexpected response to MODIFY_PIN_FINISH: " +
+            SMCCHelper.toString(resp));
+  }
+
+  private byte[] VERIFY_PIN_DIRECT(Card icc, byte[] PIN_VERIFY) throws CardException {
+    int ioctl = features.get(FEATURE_VERIFY_PIN_DIRECT);
+    if (log.isTraceEnabled()) {
+      log.trace("VERIFY_PIN_DIRECT (" + Integer.toHexString(ioctl) +
+              ")  " + SMCCHelper.toString(PIN_VERIFY));
+    }
+    byte[] resp = icc.transmitControlCommand(ioctl, PIN_VERIFY);
+    if (log.isTraceEnabled()) {
+      log.trace("response " + SMCCHelper.toString(resp));
+    }
+    return resp;
+  }
+
+  private byte[] verifyPin(Card icc, byte[] PIN_VERIFY, PINGUI pinGUI) 
+          throws SignatureCardException, CardException, InterruptedException {
+
+//    pinGUI.enterPIN(pinSpec, retries);
+
+    log.debug("VERIFY_PIN_START [" + FEATURES[FEATURE_VERIFY_PIN_START] + "]");
+    VERIFY_PIN_START(icc, PIN_VERIFY);
+
+    byte resp;
+    do {
+      resp = GET_KEY_PRESSED(icc);
+      if (resp == (byte) 0x00) {
+        synchronized(this) {
+          try {
+            wait(PIN_ENTRY_POLLING_INTERVAL);
+          } catch (InterruptedException ex) {
+            log.error("interrupted in VERIFY_PIN");
+          }
+        }
+      } else if (resp == (byte) 0x0d) {
+        log.debug("GET_KEY_PRESSED: 0x0d (user confirmed)");
+        break;
+      } else if (resp == (byte) 0x2b) {
+        log.trace("GET_KEY_PRESSED: 0x2b (user entered valid key 0-9)");
+        pinGUI.validKeyPressed();
+      } else if (resp == (byte) 0x1b) {
+        log.debug("GET_KEY_PRESSED: 0x1b (user cancelled VERIFY_PIN via cancel button)");
+        break; // returns 0x6401
+      } else if (resp == (byte) 0x08) {
+        log.debug("GET_KEY_PRESSED: 0x08 (user pressed correction/backspace button)");
+        pinGUI.correctionButtonPressed();
+      } else if (resp == (byte) 0x0e) {
+        log.debug("GET_KEY_PRESSED: 0x0e (timeout occured)");
+        break; // return 0x6400
+      } else if (resp == (byte) 0x40) {
+        log.debug("GET_KEY_PRESSED: 0x40 (PIN_Operation_Aborted)");
+        throw new PINOperationAbortedException("PIN_Operation_Aborted (0x40)");
+      } else if (resp == (byte) 0x0a) {
+        log.debug("GET_KEY_PRESSED: 0x0a (all keys cleared");
+        pinGUI.allKeysCleared();
+      } else {
+        log.error("unexpected response to GET_KEY_PRESSED: " +
+            Integer.toHexString(resp));
+        throw new CardException("unexpected response to GET_KEY_PRESSED: " +
+            Integer.toHexString(resp));
+      }
+    } while (true); 
+
+    return VERIFY_PIN_FINISH(icc);
+  }
+
+  /**
+   * does not display the first pin dialog (enterCurrentPIN or enterNewPIN, depends on bConfirmPIN),
+   * since this is easier to do in calling modify()
+   */
+  private byte[] modifyPin(Card icc, byte[] PIN_MODIFY, ModifyPINGUI pinGUI, PINSpec pINSpec)
+          throws PINOperationAbortedException, CardException {
+
+    byte pinConfirmations = (byte) 0x00; //b0: new pin not entered (0) / entered (1)
+                                         //b1: current pin not entered (0) / entered (1)
+    byte bConfirmPIN = PIN_MODIFY[9];
+    
+//    if ((bConfirmPIN & (byte) 0x02) == 0) {
+//      log.debug("no current PIN entry requested");
+//      pinGUI.enterNewPIN(pINSpec);
+//    } else {
+//      log.debug("current PIN entry requested");
+//      pinGUI.enterCurrentPIN(pINSpec, retries);
+//    }
+
+    log.debug("MODIFY_PIN_START [" + FEATURES[FEATURE_MODIFY_PIN_START] + "]");
+    MODIFY_PIN_START(icc, PIN_MODIFY);
+
+    byte resp;
+    while (true) {
+      resp = GET_KEY_PRESSED(icc);
+      if (resp == (byte) 0x00) {
+        synchronized(this) {
+          try {
+            wait(PIN_ENTRY_POLLING_INTERVAL);
+          } catch (InterruptedException ex) {
+            log.error("interrupted in MODIFY_PIN");
+          }
+        }
+      } else if (resp == (byte) 0x0d) {
+        if (log.isTraceEnabled()) {
+          log.trace("requested pin confirmations: 0b" + Integer.toBinaryString(bConfirmPIN & 0xff));
+          log.trace("performed pin confirmations: 0b" + Integer.toBinaryString(pinConfirmations & 0xff));
+        }
+        log.debug("GET_KEY_PRESSED: 0x0d (user confirmed)");
+        if (pinConfirmations == bConfirmPIN) {
+          break;
+        } else if ((bConfirmPIN & (byte) 0x02) == 0 ||
+            (pinConfirmations & (byte) 0x02) == (byte) 0x02) {
+          // no current pin entry or current pin entry already performed
+          if ((pinConfirmations & (byte) 0x01) == 0) {
+            // new pin
+            pinConfirmations |= (byte) 0x01;
+            pinGUI.confirmNewPIN(pINSpec);
+          } // else: new pin confirmed
+        } else {
+          // current pin entry
+          pinConfirmations |= (byte) 0x02;
+          pinGUI.enterNewPIN(pINSpec);
+        }
+      } else if (resp == (byte) 0x2b) {
+        log.trace("GET_KEY_PRESSED: 0x2b (user entered valid key 0-9)");
+        pinGUI.validKeyPressed();
+      } else if (resp == (byte) 0x1b) {
+        log.debug("GET_KEY_PRESSED: 0x1b (user cancelled VERIFY_PIN via cancel button)");
+        break; // returns 0x6401
+      } else if (resp == (byte) 0x08) {
+        log.debug("GET_KEY_PRESSED: 0x08 (user pressed correction/backspace button)");
+        pinGUI.correctionButtonPressed();
+      } else if (resp == (byte) 0x0e) {
+        log.debug("GET_KEY_PRESSED: 0x0e (timeout occured)");
+        break; // return 0x6400
+      } else if (resp == (byte) 0x40) {
+        log.debug("GET_KEY_PRESSED: 0x40 (PIN_Operation_Aborted)");
+        throw new PINOperationAbortedException("PIN_Operation_Aborted (0x40)");
+      } else if (resp == (byte) 0x0a) {
+        log.debug("GET_KEY_PRESSED: 0x0a (all keys cleared");
+        pinGUI.allKeysCleared();
+      } else {
+        log.error("unexpected response to GET_KEY_PRESSED: " +
+            Integer.toHexString(resp));
+        throw new CardException("unexpected response to GET_KEY_PRESSED: " +
+            Integer.toHexString(resp));
+      }
+
+    }
+
+    pinGUI.finish();
+    return MODIFY_PIN_FINISH(icc);
+  }
+
+  private byte[] MODIFY_PIN_DIRECT(Card icc, byte[] PIN_MODIFY) throws CardException {
+    int ioctl = features.get(FEATURE_MODIFY_PIN_DIRECT);
+    if (log.isTraceEnabled()) {
+      log.trace("MODIFY_PIN_DIRECT (" + Integer.toHexString(ioctl) +
+              ")  " + SMCCHelper.toString(PIN_MODIFY));
+    }
+    byte[] resp = icc.transmitControlCommand(ioctl, PIN_MODIFY);
+    if (log.isTraceEnabled()) {
+      log.trace("response " + SMCCHelper.toString(resp));
+    }
+    return resp;
+  }
+  
+  protected byte[] createPINModifyStructure(NewReferenceDataAPDUSpec apduSpec, PINSpec pinSpec) {
+
+    ByteArrayOutputStream s = new ByteArrayOutputStream();
+    // bTimeOut
+    s.write(bTimeOut);
+    // bTimeOut2
+    s.write(bTimeOut2);
+    // bmFormatString
+    s.write(1 << 7 // system unit = byte
+        | (0xF & apduSpec.getPinPosition()) << 3
+        | (0x1 & apduSpec.getPinJustification() << 2)
+        | (0x3 & apduSpec.getPinFormat()));
+    // bmPINBlockString
+    s.write((0xF & apduSpec.getPinLengthSize()) << 4
+        | (0xF & apduSpec.getPinLength()));
+    // bmPINLengthFormat
+    s.write(// system unit = bit
+        (0xF & apduSpec.getPinLengthPos()));
+    // bInsertionOffsetOld
+    s.write(0x00);
+    // bInsertionOffsetNew
+    s.write(apduSpec.getPinInsertionOffsetNew());
+    // wPINMaxExtraDigit
+    s.write(Math.min(pinSpec.getMaxLength(), wPINMaxExtraDigitL));
+    s.write(Math.max(pinSpec.getMinLength(), wPINMaxExtraDigitH));
+    // bConfirmPIN
+    s.write(0x01);
+    // bEntryValidationCondition
+    s.write(bEntryValidationCondition);
+    // bNumberMessage
+    s.write(0x02);
+    // wLangId English (United States), see http://www.usb.org/developers/docs/USB_LANGIDs.pdf
+    s.write(0x09);
+    s.write(0x04);
+    // bMsgIndex1
+    s.write(0x01);
+    // bMsgIndex2
+    s.write(0x02);
+    // bMsgIndex3
+    s.write(0x00);
+
+    // bTeoPrologue
+    s.write(0x00);
+    s.write(0x00);
+    s.write(0x00);
+    // ulDataLength
+    s.write(apduSpec.getApdu().length);
+    s.write(0x00);
+    s.write(0x00);
+    s.write(0x00);
+    // abData
+    try {
+      s.write(apduSpec.getApdu());
+    } catch (IOException e) {
+      // As we are dealing with ByteArrayOutputStreams no exception is to be
+      // expected.
+      throw new RuntimeException(e);
+    }
+
+    return s.toByteArray();
+
+  }
+  
+  protected byte[] createPINModifyStructure(ChangeReferenceDataAPDUSpec apduSpec, PINSpec pinSpec) {
+    //TODO bInsertionOffsetOld (0x00), bConfirmPIN (0x01), bNumberMessage (0x02), bMsgIndex1/2/3
+
+    ByteArrayOutputStream s = new ByteArrayOutputStream();
+    // bTimeOut
+    s.write(bTimeOut);
+    // bTimeOut2
+    s.write(bTimeOut2);
+    // bmFormatString
+    s.write(1 << 7 // system unit = byte
+        | (0xF & apduSpec.getPinPosition()) << 3
+        | (0x1 & apduSpec.getPinJustification() << 2)
+        | (0x3 & apduSpec.getPinFormat()));
+    // bmPINBlockString
+    s.write((0xF & apduSpec.getPinLengthSize()) << 4
+        | (0xF & apduSpec.getPinLength()));
+    // bmPINLengthFormat
+    s.write(// system unit = bit
+        (0xF & apduSpec.getPinLengthPos()));
+    // bInsertionOffsetOld (0x00 for no old pin?)
+    s.write(apduSpec.getPinInsertionOffsetOld());
+    // bInsertionOffsetNew
+    s.write(apduSpec.getPinInsertionOffsetNew());
+    // wPINMaxExtraDigit
+    s.write(Math.min(pinSpec.getMaxLength(), wPINMaxExtraDigitL));
+    s.write(Math.max(pinSpec.getMinLength(), wPINMaxExtraDigitH));
+    // bConfirmPIN
+    s.write(0x03);
+    // bEntryValidationCondition
+    s.write(bEntryValidationCondition);
+    // bNumberMessage
+    s.write(0x03);
+    // wLangId English (United States), see http://www.usb.org/developers/docs/USB_LANGIDs.pdf
+    s.write(0x09);
+    s.write(0x04);
+    // bMsgIndex1
+    s.write(0x00);
+    // bMsgIndex2
+    s.write(0x01);
+    // bMsgIndex3
+    s.write(0x02);
+    
+    // bTeoPrologue
+    s.write(0x00);
+    s.write(0x00);
+    s.write(0x00);
+    // ulDataLength
+    s.write(apduSpec.getApdu().length);
+    s.write(0x00);
+    s.write(0x00);
+    s.write(0x00);
+    // abData
+    try {
+      s.write(apduSpec.getApdu());
+    } catch (IOException e) {
+      // As we are dealing with ByteArrayOutputStreams no exception is to be
+      // expected.
+      throw new RuntimeException(e);
+    }
+    
+    return s.toByteArray();
+
+  }
+  
+  protected byte[] createPINVerifyStructure(VerifyAPDUSpec apduSpec, PINSpec pinSpec) {
+    
+    ByteArrayOutputStream s = new ByteArrayOutputStream();
+    // bTimeOut
+    s.write(bTimeOut);
+    // bTimeOut2
+    s.write(bTimeOut2);
+    // bmFormatString
+    s.write(1 << 7 // system unit = byte
+        | (0xF & apduSpec.getPinPosition()) << 3
+        | (0x1 & apduSpec.getPinJustification() << 2)
+        | (0x3 & apduSpec.getPinFormat()));
+    // bmPINBlockString
+    s.write((0xF & apduSpec.getPinLengthSize()) << 4
+        | (0xF & apduSpec.getPinLength()));
+    // bmPINLengthFormat
+    s.write(// system unit = bit
+        (0xF & apduSpec.getPinLengthPos()));
+    // wPINMaxExtraDigit
+    s.write(Math.min(pinSpec.getMaxLength(), wPINMaxExtraDigitL)); // max PIN length
+    s.write(Math.max(pinSpec.getMinLength(), wPINMaxExtraDigitH)); // min PIN length
+    // bEntryValidationCondition
+    s.write(bEntryValidationCondition);
+    // bNumberMessage
+    s.write(0x01);
+    // wLangId
+    s.write(0x09);
+    s.write(0x04);
+    // bMsgIndex
+    s.write(0x00);
+    // bTeoPrologue
+    s.write(0x00);
+    s.write(0x00);
+    s.write(0x00);
+    // ulDataLength
+    s.write(apduSpec.getApdu().length);
+    s.write(0x00);
+    s.write(0x00);
+    s.write(0x00);
+    // abData
+    try {
+      s.write(apduSpec.getApdu());
+    } catch (IOException e) {
+      // As we are dealing with ByteArrayOutputStreams no exception is to be
+      // expected.
+      throw new RuntimeException(e);
+    }
+    
+    return s.toByteArray();
+    
+  }
+
+  @Override
+  public ResponseAPDU verify(CardChannel channel, VerifyAPDUSpec apduSpec,
+          PINGUI pinGUI, PINSpec pinSpec, int retries)
+        throws SignatureCardException, CardException, InterruptedException {
+
+    ResponseAPDU resp = null;
+
+    byte[] s = createPINVerifyStructure(apduSpec, pinSpec);
+    Card icc = channel.getCard();
+
+    if (VERIFY) {
+      pinGUI.enterPIN(pinSpec, retries);
+      resp = new ResponseAPDU(verifyPin(icc, s, pinGUI));
+    } else if (VERIFY_DIRECT) {
+      pinGUI.enterPINDirect(pinSpec, retries);
+      log.debug("VERIFY_PIN_DIRECT [" + FEATURES[FEATURE_VERIFY_PIN_DIRECT] + "]");
+      resp = new ResponseAPDU(VERIFY_PIN_DIRECT(icc, s));
+    } else {
+      log.warn("falling back to default pin-entry");
+      return super.verify(channel, apduSpec, pinGUI, pinSpec, retries);
+    }
+
+    switch (resp.getSW()) {
+      case 0x6400:
+        log.debug("SPE operation timed out.");
+        throw new TimeoutException();
+      case 0x6401:
+        log.debug("SPE operation was cancelled by the 'Cancel' button.");
+        throw new CancelledException();
+      case 0x6403:
+          log.debug("User entered too short or too long PIN "
+              + "regarding MIN/MAX PIN length.");
+          throw new PINFormatException();
+      case 0x6480:
+        log.debug("SPE operation was aborted by the 'Cancel' operation "
+            + "at the host system.");
+      case 0x6b80:
+        log.info("Invalid parameter in passed structure.");
+      default:
+        return resp;
+    }
+  }
+
+  @Override
+  public ResponseAPDU modify(CardChannel channel, ChangeReferenceDataAPDUSpec apduSpec,
+          ModifyPINGUI pinGUI, PINSpec pinSpec, int retries)
+        throws SignatureCardException, CardException, InterruptedException {
+    
+    ResponseAPDU resp = null;
+
+    byte[] s = createPINModifyStructure(apduSpec, pinSpec);
+    Card icc = channel.getCard();
+    
+    if (MODIFY) {
+      pinGUI.enterCurrentPIN(pinSpec, retries);
+      resp = new ResponseAPDU(modifyPin(icc, s, pinGUI, pinSpec));
+    } else if (MODIFY_DIRECT) {
+      pinGUI.modifyPINDirect(pinSpec, retries);
+      log.debug("MODIFY_PIN_DIRECT [" + FEATURES[FEATURE_MODIFY_PIN_DIRECT] + "]");
+      resp = new ResponseAPDU(MODIFY_PIN_DIRECT(icc, s));
+    } else {
+      log.warn("falling back to default pin-entry");
+      return super.modify(channel, apduSpec, pinGUI, pinSpec, retries);
+    }
+
+    switch (resp.getSW()) {
+      case 0x6400:
+        log.debug("SPE operation timed out.");
+        throw new TimeoutException();
+      case 0x6401:
+        log.debug("SPE operation was cancelled by the 'Cancel' button.");
+        throw new CancelledException();
+      case 0x6402:
+        log.debug("Modify PIN operation failed because two 'new PIN' " +
+                "entries do not match");
+        throw new PINConfirmationException();
+      case 0x6403:
+        log.debug("User entered too short or too long PIN "
+              + "regarding MIN/MAX PIN length.");
+        throw new PINFormatException();
+      case 0x6480:
+        log.debug("SPE operation was aborted by the 'Cancel' operation "
+            + "at the host system.");
+      case 0x6b80:
+        log.info("Invalid parameter in passed structure.");
+      default:
+        return resp;
+    }
+  }
+
+  @Override
+  public ResponseAPDU modify(CardChannel channel, NewReferenceDataAPDUSpec apduSpec,
+          ModifyPINGUI pinGUI, PINSpec pinSpec)
+        throws SignatureCardException, CardException, InterruptedException {
+
+    ResponseAPDU resp = null;
+
+    byte[] s = createPINModifyStructure(apduSpec, pinSpec);
+    Card icc = channel.getCard();
+
+    if (MODIFY) {
+      pinGUI.enterNewPIN(pinSpec);
+      resp = new ResponseAPDU(modifyPin(icc, s, pinGUI, pinSpec));
+    } else if (MODIFY_DIRECT) {
+      pinGUI.modifyPINDirect(pinSpec, -1);
+      log.debug("MODIFY_PIN_DIRECT [" + FEATURES[FEATURE_MODIFY_PIN_DIRECT] + "]");
+      resp = new ResponseAPDU(MODIFY_PIN_DIRECT(icc, s));
+    } else {
+      log.warn("falling back to default pin-entry");
+      return super.modify(channel, apduSpec, pinGUI, pinSpec);
+    }
+
+    switch (resp.getSW()) {
+      case 0x6400:
+        log.debug("SPE operation timed out.");
+        throw new TimeoutException();
+      case 0x6401:
+        log.debug("SPE operation was cancelled by the 'Cancel' button.");
+        throw new CancelledException();
+      case 0x6402:
+        log.debug("Modify PIN operation failed because two 'new PIN' " +
+                "entries do not match");
+        throw new PINConfirmationException();
+      case 0x6403:
+        log.debug("User entered too short or too long PIN "
+              + "regarding MIN/MAX PIN length.");
+        throw new PINFormatException();
+      case 0x6480:
+        log.debug("SPE operation was aborted by the 'Cancel' operation "
+            + "at the host system.");
+      case 0x6b80:
+        log.info("Invalid parameter in passed structure.");
+      default:
+        return resp;
+    }
+  }
+
+  @Override
+  public ResponseAPDU modify(CardChannel channel, ResetRetryCounterAPDUSpec apduSpec,
+          ModifyPINGUI pinGUI, PINSpec pinSpec, int retries)
+          throws InterruptedException, CardException, SignatureCardException {
+    //TODO
+    return modify(channel, (ChangeReferenceDataAPDUSpec) apduSpec, pinGUI, pinSpec, retries);
+  }
+}
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/reader/ReaderFactory.java b/smcc/src/main/java/at/gv/egiz/smcc/reader/ReaderFactory.java
new file mode 100644
index 00000000..eb197d9f
--- /dev/null
+++ b/smcc/src/main/java/at/gv/egiz/smcc/reader/ReaderFactory.java
@@ -0,0 +1,128 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.smcc.reader;
+
+import at.gv.egiz.smcc.conf.SMCCConfiguration;
+import at.gv.egiz.smcc.util.SMCCHelper;
+import java.util.HashMap;
+import java.util.Map;
+import javax.smartcardio.Card;
+import javax.smartcardio.CardException;
+import javax.smartcardio.CardTerminal;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class ReaderFactory {
+
+  protected final static Log log = LogFactory.getLog(ReaderFactory.class);
+  
+  protected SMCCConfiguration configuration;
+
+  private ReaderFactory() {
+  }
+
+  /**
+   * @param configuration the configuration to set
+   */
+  public void setConfiguration(SMCCConfiguration configuration) {
+    this.configuration = configuration;
+  }
+
+  public static CardReader getReader(Card icc, CardTerminal ct) {
+
+    String name = ct.getName();
+    log.info("creating reader " + name);
+
+    Map<Byte, Integer> features = queryFeatures(icc);
+    boolean disablePinpad = false;
+    CardReader reader;
+
+        //TODO query application context for reader config
+//    if (configuration != null) {
+//      String disablePinpad = configuration.getProperty(SMCCConfiguration.DISABLE_PINPAD_P);
+//      log.debug("setting disablePinpad to " + Boolean.parseBoolean(disablePinpad));
+//      reader.setDisablePinpad(Boolean.parseBoolean(disablePinpad));
+//    }
+    log.warn("card reader configuration is not considered");
+
+    if (features.isEmpty() || disablePinpad) {
+      reader = new DefaultCardReader(ct);
+    } else {
+      reader = new PinpadCardReader(ct, features);
+    }
+
+    return reader;
+  }
+
+  private static int CTL_CODE(int code) {
+    String os_name = System.getProperty("os.name").toLowerCase();
+    if (os_name.indexOf("windows") > -1) {
+      // cf. WinIOCTL.h
+      return (0x31 << 16 | (code) << 2);
+    }
+    // cf. reader.h
+    return 0x42000000 + (code);
+  }
+
+  static int IOCTL_GET_FEATURE_REQUEST = CTL_CODE(3400);
+
+  private static Map<Byte, Integer> queryFeatures(Card icc) {
+    Map<Byte, Integer> features = new HashMap<Byte, Integer>();
+
+    if (icc == null) {
+      log.warn("invalid card handle, cannot query ifd features");
+    } else {
+      try {
+        if (log.isTraceEnabled()) {
+          log.trace("GET_FEATURE_REQUEST " + Integer.toHexString(IOCTL_GET_FEATURE_REQUEST));
+        }
+        byte[] resp = icc.transmitControlCommand(IOCTL_GET_FEATURE_REQUEST,
+                new byte[0]);
+
+        if (log.isTraceEnabled()) {
+          log.trace("Response TLV " + SMCCHelper.toString(resp));
+        }
+        // tag
+        // length in bytes (always 4)
+        // control code value for supported feature (in big endian)
+        for (int i = 0; i < resp.length; i += 6) {
+          Byte feature = new Byte(resp[i]);
+          Integer ioctl = new Integer((0xff & resp[i + 2]) << 24) |
+                  ((0xff & resp[i + 3]) << 16) |
+                  ((0xff & resp[i + 4]) << 8) |
+                  (0xff & resp[i + 5]);
+          if (log.isInfoEnabled()) {
+            log.info("IFD supports " + CardReader.FEATURES[feature.intValue()] +
+                    ": " + Integer.toHexString(ioctl.intValue()));
+          }
+          features.put(feature, ioctl);
+        }
+      } catch (CardException ex) {
+        log.debug("Failed to query IFD features: " + ex.getMessage());
+        log.trace(ex);
+        log.info("IFD does not support secure pin entry");
+      }
+    }
+    return features;
+  }
+
+}
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/AbstractAppl.java b/smcc/src/test/java/at/gv/egiz/smcc/AbstractAppl.java
index 137de509..affb06ff 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/AbstractAppl.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/AbstractAppl.java
@@ -51,6 +51,7 @@ public abstract class AbstractAppl implements CardAppl {
     return files;
   }
 
+  @Override
   public abstract void setPin(int kid, char[] value);
   
 }
\ No newline at end of file
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java b/smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java
index 6017bcce..3dfc8510 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java
@@ -28,15 +28,15 @@ import javax.smartcardio.CardException;
 @SuppressWarnings("restriction")
 public abstract class CardEmul extends Card {
 
-  protected Thread exclThread = null;
-  protected CardChannel channel = newCardChannel(this);
+  protected Thread exclThread; // = null;
+  protected CardChannel channel; // = newCardChannel(this);
   protected List<AbstractAppl> applications = new ArrayList<AbstractAppl>();
 
   public CardEmul() {
     super();
   }
 
-  protected abstract CardChannelEmul newCardChannel(CardEmul cardEmul);
+//  protected abstract CardChannelEmul newCardChannel(CardEmul cardEmul);
 
   @Override
   public void beginExclusive() throws CardException {
@@ -71,9 +71,9 @@ public abstract class CardEmul extends Card {
 
   @Override
   public void disconnect(boolean reset) throws CardException {
-    if (reset) {
-      channel = newCardChannel(this);
-    }
+//    if (reset) {
+//      channel = newCardChannel(this);
+//    }
   }
 
   @Override
@@ -93,7 +93,7 @@ public abstract class CardEmul extends Card {
       }
 
   public AbstractAppl getApplication(byte[] fid) {
-    
+
     for(AbstractAppl appl : applications) {
       if (Arrays.equals(appl.getAID(), fid) || Arrays.equals(appl.getFID(), fid)) {
         return appl;
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/CardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/CardTest.java
index b3bd07ab..44e48836 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/CardTest.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/CardTest.java
@@ -16,12 +16,14 @@
 */
 package at.gv.egiz.smcc;
 
+import at.gv.egiz.smcc.pin.gui.CancelPINProvider;
+import at.gv.egiz.smcc.pin.gui.InterruptPINProvider;
+import at.gv.egiz.smcc.pin.gui.CancelChangePINProvider;
 import static org.junit.Assert.*;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.List;
@@ -32,119 +34,15 @@ import org.junit.Test;
 
 import at.gv.egiz.smcc.SignatureCard.KeyboxName;
 import at.gv.egiz.smcc.acos.A04ApplDEC;
+import at.gv.egiz.smcc.pin.gui.DummyPINGUI;
+import at.gv.egiz.smcc.pin.gui.ModifyPINGUI;
+import at.gv.egiz.smcc.pin.gui.PINGUI;
+import at.gv.egiz.smcc.pin.gui.SMCCTestPINProvider;
+import org.junit.Ignore;
 
 @SuppressWarnings("restriction")
 public abstract class CardTest {
 
-  public class TestPINProvider implements PINProvider {
-    
-    int provided = 0;
-  
-    char[] pin;
-  
-    public TestPINProvider(char[] pin) {
-      super();
-      this.pin = pin;
-    }
-  
-    @Override
-    public char[] providePIN(PINSpec spec, int retries)
-        throws CancelledException, InterruptedException {
-      provided++;
-      return pin;
-    }
-
-    public int getProvided() {
-      return provided;
-    }
-  
-  }
-
-  public class TestChangePINProvider extends TestPINProvider implements
-      ChangePINProvider {
-  
-    char[] oldPin;
-  
-    public TestChangePINProvider(char[] oldPin, char[] pin) {
-      super(pin);
-      this.oldPin = oldPin;
-    }
-  
-    @Override
-    public char[] provideOldPIN(PINSpec spec, int retries)
-        throws CancelledException, InterruptedException {
-      return oldPin;
-    }
-  
-  }
-
-  public class TestInvalidPINProvider implements PINProvider {
-
-    int provided = 0;
-    int numWrongTries = 0;
-
-    char[] pin;
-
-    public TestInvalidPINProvider(char[] pin, int numWrongTries) {
-      super();
-      this.pin = pin;
-      this.numWrongTries = numWrongTries;
-    }
-
-    @Override
-    public char[] providePIN(PINSpec spec, int retries)
-        throws CancelledException, InterruptedException {
-      if (provided >= numWrongTries) {
-        throw new CancelledException("Number of wrong tries reached: " + provided);
-      } else {
-        provided++;
-        return pin;
-      }
-    }
-
-    public int getProvided() {
-      return provided;
-    }
-  }
-
-  public class TestInvalidChangePINProvider implements ChangePINProvider {
-
-    int provided = 0;
-    int numWrongTries = 0;
-
-    char[] pin;
-    char[] oldPin;
-
-    /** emulate ChangePinProvider */
-    public TestInvalidChangePINProvider(char[] oldPin, char[] newPin, int numWrongTries) {
-      super();
-      this.pin = newPin;
-      this.oldPin = oldPin;
-      this.numWrongTries = numWrongTries;
-    }
-
-    @Override
-    public char[] providePIN(PINSpec spec, int retries)
-        throws CancelledException, InterruptedException {
-      return pin;
-    }
-
-    public int getProvided() {
-      return provided;
-    }
-
-    @Override
-    public char[] provideOldPIN(PINSpec spec, int retries)
-        throws CancelledException, InterruptedException {
-      if (provided >= numWrongTries) {
-        throw new CancelledException("Number of wrong tries reached: " + provided);
-      } else {
-        provided++;
-        return oldPin;
-      }
-    }
-  }
-
   public CardTest() {
     super();
   }
@@ -167,7 +65,7 @@ public abstract class CardTest {
     
     SignatureCard signatureCard = createSignatureCard();
     
-    TestPINProvider pinProvider = new TestPINProvider(pin);
+    SMCCTestPINProvider pinProvider = new SMCCTestPINProvider(pin);
 
     byte[] idlink = signatureCard.getInfobox("IdentityLink",
         pinProvider, null);
@@ -184,13 +82,7 @@ public abstract class CardTest {
       
         SignatureCard signatureCard = createSignatureCard();
       
-        PINProvider pinProvider = new PINProvider() {
-          @Override
-          public char[] providePIN(PINSpec spec, int retries)
-              throws CancelledException, InterruptedException {
-            throw new CancelledException();
-          }
-        };
+        PINGUI pinProvider = new CancelPINProvider();
       
     signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
         .getBytes("ASCII")), KeyboxName.SECURE_SIGNATURE_KEYPAIR, pinProvider,
@@ -205,13 +97,7 @@ public abstract class CardTest {
       
         SignatureCard signatureCard = createSignatureCard();
       
-        PINProvider pinProvider = new PINProvider() {
-          @Override
-          public char[] providePIN(PINSpec spec, int retries)
-              throws CancelledException, InterruptedException {
-            throw new CancelledException();
-          }
-        };
+        PINGUI pinProvider = new CancelPINProvider();
       
         signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
             .getBytes("ASCII")), KeyboxName.CERITIFIED_KEYPAIR,
@@ -226,13 +112,7 @@ public abstract class CardTest {
       
         SignatureCard signatureCard = createSignatureCard();
       
-        PINProvider pinProvider = new PINProvider() {
-          @Override
-          public char[] providePIN(PINSpec spec, int retries)
-              throws CancelledException, InterruptedException {
-            throw new InterruptedException();
-          }
-        };
+        PINGUI pinProvider = new InterruptPINProvider();
       
         signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
             .getBytes("ASCII")), KeyboxName.SECURE_SIGNATURE_KEYPAIR,
@@ -247,13 +127,7 @@ public abstract class CardTest {
       
         SignatureCard signatureCard = createSignatureCard();
       
-        PINProvider pinProvider = new PINProvider() {
-          @Override
-          public char[] providePIN(PINSpec spec, int retries)
-              throws CancelledException, InterruptedException {
-            throw new InterruptedException();
-          }
-        };
+        PINGUI pinProvider = new InterruptPINProvider();
       
         signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
             .getBytes("ASCII")), KeyboxName.CERITIFIED_KEYPAIR,
@@ -268,11 +142,11 @@ public abstract class CardTest {
       
         final SignatureCard signatureCard = createSignatureCard();
       
-        PINProvider pinProvider = new PINProvider() {
+        PINGUI pinProvider = new DummyPINGUI() {
           @Override
           public char[] providePIN(PINSpec spec, int retries)
               throws CancelledException, InterruptedException {
-      
+
             try {
               signatureCard.getCertificate(KeyboxName.SECURE_SIGNATURE_KEYPAIR);
               assertTrue(false);
@@ -281,10 +155,10 @@ public abstract class CardTest {
               // expected
               throw new CancelledException();
             }
-      
+
           }
         };
-      
+
         signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
             .getBytes("ASCII")), KeyboxName.SECURE_SIGNATURE_KEYPAIR,
             pinProvider, null);
@@ -298,7 +172,7 @@ public abstract class CardTest {
       
         final SignatureCard signatureCard = createSignatureCard();
       
-        PINProvider pinProvider = new PINProvider() {
+        PINGUI pinProvider = new DummyPINGUI() {
           @Override
           public char[] providePIN(PINSpec spec, int retries)
               throws CancelledException, InterruptedException {
@@ -311,7 +185,6 @@ public abstract class CardTest {
               // expected
               throw new CancelledException();
             }
-      
           }
         };
       
@@ -339,13 +212,7 @@ public abstract class CardTest {
       
         PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard();
       
-        PINProvider pinProvider = new PINProvider() {
-          @Override
-          public char[] providePIN(PINSpec spec, int retries)
-              throws CancelledException, InterruptedException {
-            throw new CancelledException();
-          }
-        };
+        ModifyPINGUI pinProvider = new CancelChangePINProvider();
       
         List<PINSpec> specs = signatureCard.getPINSpecs();
       
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/PIN.java b/smcc/src/test/java/at/gv/egiz/smcc/PIN.java
index ae883727..2cda0c2f 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/PIN.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/PIN.java
@@ -23,19 +23,23 @@ public class PIN {
   public static final int STATE_PIN_VERIFIED = 1;
   
   public static final int STATE_PIN_BLOCKED = -1;
+
+  public static final int STATE_PIN_NOTACTIVE = 2;
   
   public byte[] pin;
   
   public int kid;
   
-  public int state = STATE_RESET;
+  public int state; // = STATE_RESET;
   
-  public int kfpc = 10;
+  public int kfpc; // = 10;
 
-  public PIN(byte[] pin, int kid, int kfpc) {
+  //TODO also provde default constructor without state param
+  public PIN(byte[] pin, int kid, int kfpc, int state) {
     this.pin = pin;
     this.kid = kid;
     this.kfpc = kfpc;
+    this.state = state;
   }
 
 }
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/acos/A03ApplDEC.java b/smcc/src/test/java/at/gv/egiz/smcc/acos/A03ApplDEC.java
index 9fd96d73..f4ac5c35 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/acos/A03ApplDEC.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/acos/A03ApplDEC.java
@@ -40,7 +40,7 @@ public class A03ApplDEC extends ACOSApplDEC {
     putFile(new File(FID_EF_INFOBOX, EF_INFOBOX, FCI_EF_INFOBOX, KID_PIN_INF));
 
     try {
-      pins.put(KID_PIN_INF, new PIN("0000\0\0\0\0".getBytes("ASCII"), KID_PIN_INF, 10));
+      pins.put(KID_PIN_INF, new PIN("0000\0\0\0\0".getBytes("ASCII"), KID_PIN_INF, 10, PIN.STATE_RESET));
     } catch (UnsupportedEncodingException e) {
       throw new RuntimeException(e);
     }
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/acos/A03CardEmul.java b/smcc/src/test/java/at/gv/egiz/smcc/acos/A03CardEmul.java
index 58216b6b..7394bae7 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/acos/A03CardEmul.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/acos/A03CardEmul.java
@@ -24,13 +24,8 @@ import at.gv.egiz.smcc.CardEmul;
 public class A03CardEmul extends ACOSCardEmul {
 
   public A03CardEmul(A03ApplSIG applSIG, A03ApplDEC applDEC) {
+    channel = new A03CardChannelEmul(this);
     applications.add(applSIG);
     applications.add(applDEC);
   }
-
-  @Override
-  protected CardChannelEmul newCardChannel(CardEmul cardEmul) {
-    return new A03CardChannelEmul(this);
-  }
-
 }
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/acos/A03CardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/acos/A03CardTest.java
index 776c0370..3a8ac41c 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/acos/A03CardTest.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/acos/A03CardTest.java
@@ -22,15 +22,16 @@ import java.util.Arrays;
 
 import org.junit.Test;
 
-import at.gv.egiz.smcc.ACOSCard;
 import at.gv.egiz.smcc.CancelledException;
 import at.gv.egiz.smcc.CardEmul;
 import at.gv.egiz.smcc.CardNotSupportedException;
 import at.gv.egiz.smcc.CardTerminalEmul;
+import at.gv.egiz.smcc.pin.gui.ChangePINProvider;
 import at.gv.egiz.smcc.LockedException;
 import at.gv.egiz.smcc.NotActivatedException;
 import at.gv.egiz.smcc.PINFormatException;
 import at.gv.egiz.smcc.PINMgmtSignatureCard;
+import at.gv.egiz.smcc.pin.gui.SMCCTestPINProvider;
 import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.smcc.SignatureCard;
 import at.gv.egiz.smcc.SignatureCardException;
@@ -74,12 +75,12 @@ public class A03CardTest extends ACOSCardTest {
       char[] pin = defaultPin;
 
       for (int i = pinSpec.getMinLength(); i <= pinSpec.getMaxLength(); i++) {
-        signatureCard.verifyPIN(pinSpec, new TestPINProvider(pin));
+        signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
         char[] newPin = new char[i];
         Arrays.fill(newPin, '0');
         signatureCard
-            .changePIN(pinSpec, new TestChangePINProvider(pin, newPin));
-        signatureCard.verifyPIN(pinSpec, new TestPINProvider(newPin));
+            .changePIN(pinSpec, new ChangePINProvider(pin, newPin));
+        signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(newPin));
         pin = newPin;
       }
 
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/acos/A04CardEmul.java b/smcc/src/test/java/at/gv/egiz/smcc/acos/A04CardEmul.java
index 70925aa6..dd44d05b 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/acos/A04CardEmul.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/acos/A04CardEmul.java
@@ -24,14 +24,9 @@ import at.gv.egiz.smcc.CardEmul;
 public class A04CardEmul extends ACOSCardEmul {
 
   public A04CardEmul(A04ApplSIG applSIG, A04ApplDEC applDEC) {
+    channel = new A04CardChannelEmul(this);
     applications.add(applSIG);
     applications.add(applDEC);
   }
-
-  @Override
-  protected CardChannelEmul newCardChannel(CardEmul cardEmul) {
-    return new A04CardChannelEmul(this);
-  }
-
   
 }
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/acos/A04CardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/acos/A04CardTest.java
index d15e80d7..1cbea1b3 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/acos/A04CardTest.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/acos/A04CardTest.java
@@ -28,7 +28,6 @@ import java.util.Arrays;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import at.gv.egiz.smcc.ACOSCard;
 import at.gv.egiz.smcc.CancelledException;
 import at.gv.egiz.smcc.CardEmul;
 import at.gv.egiz.smcc.CardNotSupportedException;
@@ -41,7 +40,8 @@ import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.smcc.SignatureCard;
 import at.gv.egiz.smcc.SignatureCardException;
 import at.gv.egiz.smcc.SignatureCardFactory;
-import at.gv.egiz.smcc.CardTest.TestPINProvider;
+import at.gv.egiz.smcc.pin.gui.ChangePINProvider;
+import at.gv.egiz.smcc.pin.gui.SMCCTestPINProvider;
 
 public class A04CardTest extends ACOSCardTest {
 
@@ -88,8 +88,8 @@ public class A04CardTest extends ACOSCardTest {
         char[] newPin = new char[i];
         Arrays.fill(newPin, '0');
         signatureCard
-            .changePIN(pinSpec, new TestChangePINProvider(pin, newPin));
-        signatureCard.verifyPIN(pinSpec, new TestPINProvider(newPin));
+            .changePIN(pinSpec, new ChangePINProvider(pin, newPin));
+        signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(newPin));
         pin = newPin;
       }
 
@@ -111,7 +111,7 @@ public class A04CardTest extends ACOSCardTest {
     SignatureCard signatureCard = factory.createSignatureCard(card,
         new CardTerminalEmul(card));
 
-    TestPINProvider pinProvider = new TestPINProvider(pin);
+    SMCCTestPINProvider pinProvider = new SMCCTestPINProvider(pin);
 
     byte[] idlink = signatureCard.getInfobox("IdentityLink",
         pinProvider, null);
@@ -129,7 +129,7 @@ public class A04CardTest extends ACOSCardTest {
     
     SignatureCard signatureCard = createSignatureCard();
     
-    TestPINProvider pinProvider = new TestPINProvider(pin);
+    SMCCTestPINProvider pinProvider = new SMCCTestPINProvider(pin);
 
     byte[] idlink = signatureCard.getInfobox("IdentityLink",
         pinProvider, null);
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSApplDEC.java b/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSApplDEC.java
index 08979536..09a754f3 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSApplDEC.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSApplDEC.java
@@ -297,7 +297,7 @@ public abstract class ACOSApplDEC extends ACOSAppl {
     System.arraycopy(C_CH_EKEY, 0, EF_C_CH_EKEY, 0, C_CH_EKEY.length);
     putFile(new File(FID_EF_C_CH_EKEY, EF_C_CH_EKEY, FCI_EF_C_CH_EKEY));
     try {
-      pins.put(KID_PIN_DEC, new PIN("1234\0\0\0\0".getBytes("ASCII"), KID_PIN_DEC, 10));
+      pins.put(KID_PIN_DEC, new PIN("1234\0\0\0\0".getBytes("ASCII"), KID_PIN_DEC, 10, PIN.STATE_RESET));
     } catch (UnsupportedEncodingException e) {
       throw new RuntimeException(e);
     }
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSApplSIG.java b/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSApplSIG.java
index e476b434..6ab5903a 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSApplSIG.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSApplSIG.java
@@ -221,7 +221,7 @@ public abstract class ACOSApplSIG extends ACOSAppl {
     
     // PINs
     try {
-      pins.put(KID_PIN_SIG, new PIN(Arrays.copyOf("123456".getBytes("ASCII"), 8), KID_PIN_SIG, 3));
+      pins.put(KID_PIN_SIG, new PIN(Arrays.copyOf("123456".getBytes("ASCII"), 8), KID_PIN_SIG, 3, PIN.STATE_RESET));
     } catch (UnsupportedEncodingException e) {
       throw new RuntimeException(e);
     }
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSCardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSCardTest.java
index 56d1e4b2..4f012739 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSCardTest.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/acos/ACOSCardTest.java
@@ -16,26 +16,23 @@
 */
 package at.gv.egiz.smcc.acos;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
 import org.junit.Test;
 
-import at.gv.egiz.smcc.ACOSCard;
 import at.gv.egiz.smcc.CardEmul;
 import at.gv.egiz.smcc.CardNotSupportedException;
 import at.gv.egiz.smcc.CardTest;
 import at.gv.egiz.smcc.LockedException;
 import at.gv.egiz.smcc.NotActivatedException;
+import at.gv.egiz.smcc.pin.gui.SMCCTestPINProvider;
 import at.gv.egiz.smcc.SignatureCard;
 import at.gv.egiz.smcc.SignatureCardException;
 import at.gv.egiz.smcc.SignatureCard.KeyboxName;
@@ -60,7 +57,7 @@ public abstract class ACOSCardTest extends CardTest {
     appl.clearInfobox();
 
     byte[] idlink = signatureCard.getInfobox("IdentityLink",
-        new TestPINProvider(pin), null);
+        new SMCCTestPINProvider(pin), null);
     assertNull(idlink);
 
   }
@@ -76,7 +73,7 @@ public abstract class ACOSCardTest extends CardTest {
     ACOSApplDEC appl = (ACOSApplDEC) card.getApplication(ACOSAppl.AID_DEC);
     appl.setInfoboxHeader((byte) 0xFF);
 
-    signatureCard.getInfobox("IdentityLink", new TestPINProvider(pin), null);
+    signatureCard.getInfobox("IdentityLink", new SMCCTestPINProvider(pin), null);
 
   }
 
@@ -138,7 +135,7 @@ public abstract class ACOSCardTest extends CardTest {
 
     byte[] signature = signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
         .getBytes("ASCII")),
-        KeyboxName.SECURE_SIGNATURE_KEYPAIR, new TestPINProvider(pin), null);
+        KeyboxName.SECURE_SIGNATURE_KEYPAIR, new SMCCTestPINProvider(pin), null);
 
     assertNotNull(signature);
 
@@ -158,7 +155,7 @@ public abstract class ACOSCardTest extends CardTest {
 
     byte[] signature = signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
         .getBytes("ASCII")),
-        KeyboxName.CERITIFIED_KEYPAIR, new TestPINProvider(pin), null);
+        KeyboxName.CERITIFIED_KEYPAIR, new SMCCTestPINProvider(pin), null);
 
     assertNotNull(signature);
 
@@ -171,7 +168,7 @@ public abstract class ACOSCardTest extends CardTest {
 
     SignatureCard signatureCard = createSignatureCard();
 
-    TestPINProvider pinProvider = new TestPINProvider("000000".toCharArray());
+    SMCCTestPINProvider pinProvider = new SMCCTestPINProvider("000000".toCharArray());
 
     signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
         .getBytes("ASCII")), KeyboxName.SECURE_SIGNATURE_KEYPAIR,
@@ -186,7 +183,7 @@ public abstract class ACOSCardTest extends CardTest {
 
     SignatureCard signatureCard = createSignatureCard();
 
-    TestPINProvider pinProvider = new TestPINProvider("0000".toCharArray());
+    SMCCTestPINProvider pinProvider = new SMCCTestPINProvider("0000".toCharArray());
 
     signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
         .getBytes("ASCII")), KeyboxName.CERITIFIED_KEYPAIR,
@@ -204,7 +201,7 @@ public abstract class ACOSCardTest extends CardTest {
     ACOSApplSIG appl = (ACOSApplSIG) card.getApplication(ACOSAppl.AID_SIG);
     appl.setPin(ACOSApplSIG.KID_PIN_SIG, null);
 
-    TestPINProvider pinProvider = new TestPINProvider("000000".toCharArray());
+    SMCCTestPINProvider pinProvider = new SMCCTestPINProvider("000000".toCharArray());
 
     signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
         .getBytes("ASCII")), KeyboxName.SECURE_SIGNATURE_KEYPAIR,
@@ -222,7 +219,7 @@ public abstract class ACOSCardTest extends CardTest {
     ACOSApplDEC appl = (ACOSApplDEC) card.getApplication(ACOSAppl.AID_DEC);
     appl.setPin(ACOSApplDEC.KID_PIN_DEC, null);
 
-    TestPINProvider pinProvider = new TestPINProvider("0000".toCharArray());
+    SMCCTestPINProvider pinProvider = new SMCCTestPINProvider("0000".toCharArray());
 
     signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
         .getBytes("ASCII")), KeyboxName.CERITIFIED_KEYPAIR,
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/CancelChangePINProvider.java b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/CancelChangePINProvider.java
new file mode 100644
index 00000000..dffe7e29
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/CancelChangePINProvider.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.pin.gui;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+
+public class CancelChangePINProvider extends DummyChangePINGUI implements ModifyPINGUI {
+
+  public CancelChangePINProvider() {
+  }
+
+  @Override
+  public char[] provideCurrentPIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException {
+    throw new CancelledException("cancelled by cancelPINProvider");
+  }
+
+  @Override
+  public char[] provideNewPIN(PINSpec spec)
+          throws CancelledException, InterruptedException {
+    throw new CancelledException("cancelled by cancelPINProvider");
+  }
+
+}
\ No newline at end of file
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/CancelPINProvider.java b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/CancelPINProvider.java
new file mode 100644
index 00000000..77f19345
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/CancelPINProvider.java
@@ -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.
+ */
+package at.gv.egiz.smcc.pin.gui;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+
+public class CancelPINProvider extends DummyPINGUI implements PINGUI {
+
+  @Override
+  public char[] providePIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException {
+    throw new CancelledException("cancelled by cancelPINProvider");
+  }
+}
\ No newline at end of file
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/ChangePINProvider.java b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/ChangePINProvider.java
new file mode 100644
index 00000000..5eb8b9a1
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/ChangePINProvider.java
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.pin.gui;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+
+public class ChangePINProvider extends DummyChangePINGUI implements ModifyPINGUI {
+
+  int provided = 0;
+  char[] pin;
+  char[] oldPin;
+
+  public ChangePINProvider(char[] oldPin, char[] pin) {
+    this.pin = pin;
+    this.oldPin = oldPin;
+  }
+
+  public int getProvided() {
+    return provided;
+  }
+
+  @Override
+  public char[] provideCurrentPIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException {
+    provided++;
+    return oldPin;
+  }
+
+  @Override
+  public char[] provideNewPIN(PINSpec spec) {
+    return pin;
+  }
+
+}
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/DummyChangePINGUI.java b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/DummyChangePINGUI.java
new file mode 100644
index 00000000..fff89409
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/DummyChangePINGUI.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.pin.gui;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+
+public abstract class DummyChangePINGUI implements ModifyPINGUI {
+
+  @Override
+  public void validKeyPressed() {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public void correctionButtonPressed() {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public void allKeysCleared() {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public void finish() {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public void finishDirect() {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public void modifyPINDirect(PINSpec spec, int retries) throws CancelledException, InterruptedException {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public void enterCurrentPIN(PINSpec spec, int retries) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public void enterNewPIN(PINSpec spec) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public void confirmNewPIN(PINSpec spec) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+}
\ No newline at end of file
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/DummyPINGUI.java b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/DummyPINGUI.java
new file mode 100644
index 00000000..4d99b5c1
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/DummyPINGUI.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.pin.gui;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+
+public abstract class DummyPINGUI implements PINGUI {
+
+   @Override
+  public void enterPINDirect(PINSpec spec, int retries) throws CancelledException, InterruptedException {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public void enterPIN(PINSpec spec, int retries) throws CancelledException, InterruptedException {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public void validKeyPressed() {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public void correctionButtonPressed() {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
+  @Override
+  public void allKeysCleared() {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+}
\ No newline at end of file
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/InterruptPINProvider.java b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/InterruptPINProvider.java
new file mode 100644
index 00000000..5706b888
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/InterruptPINProvider.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.pin.gui;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+
+@SuppressWarnings("restriction")
+public class InterruptPINProvider extends DummyPINGUI implements PINGUI {
+
+  public InterruptPINProvider() {
+  }
+
+  @Override
+  public char[] providePIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException {
+    throw new InterruptedException("interrupted by cancelPINProvider");
+  }
+
+}
\ No newline at end of file
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/InvalidChangePINProvider.java b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/InvalidChangePINProvider.java
new file mode 100644
index 00000000..69c9f42a
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/InvalidChangePINProvider.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.pin.gui;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+
+public class InvalidChangePINProvider extends DummyChangePINGUI implements ModifyPINGUI {
+
+  int provided = 0;
+  int numWrongTries = 0;
+  char[] pin;
+  char[] oldPin;
+
+  /** emulate ChangePinProvider */
+  public InvalidChangePINProvider(char[] oldPin, char[] newPin, int numWrongTries) {
+    super();
+    this.pin = newPin;
+    this.oldPin = oldPin;
+    this.numWrongTries = numWrongTries;
+  }
+
+  @Override
+  public char[] provideCurrentPIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException {
+    if (provided >= numWrongTries) {
+      throw new CancelledException("Number of wrong tries reached: " + provided);
+    } else {
+      provided++;
+      return oldPin;
+    }
+  }
+
+  public int getProvided() {
+    return provided;
+  }
+
+  @Override
+  public char[] provideNewPIN(PINSpec spec) {
+    return pin;
+  }
+}
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/InvalidPINProvider.java b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/InvalidPINProvider.java
new file mode 100644
index 00000000..db01fd0d
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/InvalidPINProvider.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.pin.gui;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+
+public class InvalidPINProvider extends DummyPINGUI implements PINGUI {
+
+  int provided = 0;
+  int numWrongTries = 0;
+  char[] pin;
+
+  public InvalidPINProvider(char[] pin, int numWrongTries) {
+    super();
+    this.pin = pin;
+    this.numWrongTries = numWrongTries;
+  }
+
+  @Override
+  public char[] providePIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException {
+    if (provided >= numWrongTries) {
+      throw new CancelledException("Number of wrong tries reached: " + provided);
+    } else {
+      provided++;
+      return pin;
+    }
+  }
+
+  public int getProvided() {
+    return provided;
+  }
+}
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/SMCCTestPINProvider.java b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/SMCCTestPINProvider.java
new file mode 100644
index 00000000..dffc90d7
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/pin/gui/SMCCTestPINProvider.java
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.pin.gui;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+
+public class SMCCTestPINProvider extends DummyPINGUI implements PINGUI {
+
+  public int provided = 0;
+  char[] pin;
+
+  public SMCCTestPINProvider(char[] pin) {
+    this.pin = pin;
+  }
+
+  @Override
+  public char[] providePIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException {
+    provided++;
+    return pin;
+  }
+
+  public int getProvided() {
+    return provided;
+  }
+
+ 
+}
\ No newline at end of file
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSAppl.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSAppl.java
index 2ca63eea..62528e6e 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSAppl.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSAppl.java
@@ -69,27 +69,4 @@ public abstract class STARCOSAppl extends AbstractAppl implements CardAppl {
       pin.next().state = PIN.STATE_RESET;
     }
   }
-  
-  public void setPin(int kid, char[] value) {
-    PIN pin = pins.get(kid);
-    if (pin != null) {
-      if (value == null) {
-        pin.pin = null;
-      } else {
-        byte[] b = new byte[8];
-        b[0] = (byte) (0x20 | value.length);
-        for(int i = 1, j = 0; i < b.length; i++) {
-          int h = ((j < value.length) 
-                  ? Character.digit(value[j++], 10) 
-                  : 0x0F);
-          int l = ((j < value.length) 
-                  ? Character.digit(value[j++], 10) 
-                  : 0x0F);
-          b[i] = (byte) ((h << 4) | l);
-        }
-        pin.pin = b;
-      }
-    }
-  }
-
 }
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSApplGewoehnlicheSignatur.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSApplGewoehnlicheSignatur.java
index cec305da..8741dd2d 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSApplGewoehnlicheSignatur.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSApplGewoehnlicheSignatur.java
@@ -16,7 +16,6 @@
 */
 package at.gv.egiz.smcc.starcos;
 
-import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
 import java.util.Random;
 
@@ -200,12 +199,18 @@ public class STARCOSApplGewoehnlicheSignatur extends STARCOSAppl {
   
 
   protected byte[] EF_C_X509_CH_AUT = new byte[2000];
-  
-  public STARCOSApplGewoehnlicheSignatur(STARCOSCardChannelEmul channel) {
+
+  protected byte[] dst;
+
+  public static final byte[] DST = new byte[] { (byte) 0x84, (byte) 0x03, (byte) 0x80, (byte) 0x02, (byte) 0x00, (byte) 0x89, (byte) 0x03, (byte) 0x13, (byte) 0x35, (byte) 0x10};
+  public static final byte[] DST_G3 = new byte[] { (byte) 0x84, (byte) 0x03, (byte) 0x80, (byte) 0x02, (byte) 0x00, (byte) 0x80, (byte) 0x01, (byte) 0x04 };
+
+  public STARCOSApplGewoehnlicheSignatur(STARCOSCardChannelEmul channel, byte[] dst) {
     super(channel);
     // Files
     System.arraycopy(C_X509_CH_AUT, 0, EF_C_X509_CH_AUT, 0, C_X509_CH_AUT.length);
     putFile(new File(FID_EF_C_X509_CH_AUT, EF_C_X509_CH_AUT, FCI_EF_C_X509_CH_AUT));
+    this.dst = dst;
   }
 
   @Override
@@ -240,12 +245,19 @@ public class STARCOSApplGewoehnlicheSignatur extends STARCOSAppl {
       case 0x81:
         // EXTERNAL AUTHENTICATE
       }
+    case 0xAA:
+      switch (command.getP1()) {
+      case 0x41: 
+        if (Arrays.equals(new byte[] {(byte) 0x80, (byte) 0x01, (byte) 0x10}, command.getData())) {
+          return new ResponseAPDU(new byte[] {(byte) 0x90, (byte) 0x00});
+        }
+      default:
+        return new ResponseAPDU(new byte[] {(byte) 0x6A, (byte) 0x80});
+      }
     case 0xB6:
       switch (command.getP1()) {
       case 0x41: {
         // PSO - COMPUTE DIGITAL SIGNATURE
-        byte[] dst = new byte[] { (byte) 0x84, (byte) 0x03, (byte) 0x80,
-            (byte) 0x02, (byte) 0x00, (byte) 0x89, (byte) 0x03, (byte) 0x13, (byte) 0x35, (byte) 0x10};
         if (Arrays.equals(dst, command.getData())) {
           securityEnv = command.getData();
           return new ResponseAPDU(new byte[] {(byte) 0x90, (byte) 0x00});
@@ -328,5 +340,10 @@ public class STARCOSApplGewoehnlicheSignatur extends STARCOSAppl {
     
   }
 
+  @Override
+  public void setPin(int kid, char[] value) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
   
 }
\ No newline at end of file
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSApplInfobox.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSApplInfobox.java
index b7835a43..c470351a 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSApplInfobox.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSApplInfobox.java
@@ -156,5 +156,10 @@ public class STARCOSApplInfobox extends STARCOSAppl {
     throw new CardException("Not supported.");
   }
 
+  @Override
+  public void setPin(int kid, char[] value) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
+
   
 }
\ No newline at end of file
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSApplSichereSignatur.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSApplSichereSignatur.java
index 9fb5ad37..4036ca41 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSApplSichereSignatur.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSApplSichereSignatur.java
@@ -213,16 +213,14 @@ public class STARCOSApplSichereSignatur extends STARCOSAppl {
 
   protected byte[] EF_C_X509_CH_DS = new byte[2000];
   
-  public STARCOSApplSichereSignatur(STARCOSCardChannelEmul channel) {
+  public STARCOSApplSichereSignatur(STARCOSCardChannelEmul channel, byte[] SS_pin, int pinState) {
     super(channel);
     // Files
     System.arraycopy(C_X509_CH_DS, 0, EF_C_X509_CH_DS, 0, C_X509_CH_DS.length);
     putFile(new File(FID_EF_C_X509_CH_DS, EF_C_X509_CH_DS, FCI_EF_C_X509_CH_DS));
     
     // PINs
-    pins.put(KID_PIN_SS, new PIN(new byte[] { (byte) 0x24, (byte) 0x12,
-        (byte) 0x34, (byte) 0x56, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
-        (byte) 0xFF }, KID_PIN_SS, 3));
+    pins.put(KID_PIN_SS, new PIN(SS_pin, KID_PIN_SS, 3, pinState));
   }
 
   @Override
@@ -344,4 +342,34 @@ public class STARCOSApplSichereSignatur extends STARCOSAppl {
   
   }
 
+  /**
+   * set and activate pin
+   * @param value if null, pin will be set to NOTACTIVE
+   */
+  @Override
+  public void setPin(int kid, char[] value) {
+    PIN pin = pins.get(kid);
+    if (pin != null) {
+      if (value == null) {
+//        pin.pin = null;
+        //TransportPIN
+//        pin.pin = new byte[] { (byte) 0x26, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff};
+        pin.state = PIN.STATE_PIN_NOTACTIVE;
+      } else {
+        byte[] b = new byte[8];
+        b[0] = (byte) (0x20 | value.length);
+        for(int i = 1, j = 0; i < b.length; i++) {
+          int h = ((j < value.length)
+                  ? Character.digit(value[j++], 10)
+                  : 0x0F);
+          int l = ((j < value.length)
+                  ? Character.digit(value[j++], 10)
+                  : 0x0F);
+          b[i] = (byte) ((h << 4) | l);
+        }
+        pin.pin = b;
+        pin.state = PIN.STATE_RESET;
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java
index 89030894..2e0c54eb 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java
@@ -16,7 +16,6 @@
 */
 package at.gv.egiz.smcc.starcos;
 
-import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
 import java.util.HashMap;
 
@@ -30,6 +29,8 @@ import at.gv.egiz.smcc.CardChannelEmul;
 import at.gv.egiz.smcc.CardEmul;
 import at.gv.egiz.smcc.File;
 import at.gv.egiz.smcc.PIN;
+import java.util.ArrayList;
+import java.util.List;
 
 @SuppressWarnings("restriction")
 public class STARCOSCardChannelEmul extends CardChannelEmul {
@@ -40,14 +41,13 @@ public class STARCOSCardChannelEmul extends CardChannelEmul {
    * 
    */
   protected CardEmul cardEmul;
-  
+
+  public final List<File> globalFiles = new ArrayList<File>();
   public final HashMap<Integer, PIN> globalPins = new HashMap<Integer, PIN>();
 
-  public STARCOSCardChannelEmul(CardEmul cardEmul) {
+  public STARCOSCardChannelEmul(CardEmul cardEmul, byte[] Glob_PIN, int PIN_STATE) {
     this.cardEmul = cardEmul;
-    globalPins.put(KID_PIN_Glob, new PIN(new byte[] { (byte) 0x24, (byte) 0x00,
-        (byte) 0x00, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
-        (byte) 0xFF }, KID_PIN_Glob, 10));
+    globalPins.put(KID_PIN_Glob, new PIN(Glob_PIN, KID_PIN_Glob, 10, PIN_STATE));
  }
 
   @Override
@@ -88,6 +88,21 @@ public class STARCOSCardChannelEmul extends CardChannelEmul {
           }
         }
         return new ResponseAPDU(new byte[] {(byte) 0x6A, (byte) 0x82});
+      } else if (globalFiles != null) {
+        if (command.getP2() != 0x04) {
+          throw new CardException("Not supported.");
+        }
+        for (File file : globalFiles) {
+          if (Arrays.equals(fid, file.fid)) {
+            currentFile = file;
+            byte[] response = new byte[file.fcx.length + 2];
+            System.arraycopy(file.fcx, 0, response, 0, file.fcx.length);
+            response[file.fcx.length] = (byte) 0x90;
+            response[file.fcx.length + 1] = (byte) 0x00;
+            return new ResponseAPDU(response);
+          }
+        }
+        return new ResponseAPDU(new byte[] {(byte) 0x6A, (byte) 0x82});
       } else {
         throw new CardException("Not supported.");
       }
@@ -121,6 +136,23 @@ public class STARCOSCardChannelEmul extends CardChannelEmul {
     
   }
   
+  protected ResponseAPDU cmdREAD_RECORD(CommandAPDU command) throws CardException {
+    if (command.getINS() != 0xB2) {
+      throw new IllegalArgumentException("INS has to be 0xB2");
+    }
+    if (currentFile == null) {
+      return new ResponseAPDU(new byte[]{ (byte) 0x69, (byte) 0x86 });
+    }
+    if (command.getP1() != 0x01 || command.getP2() != 0x04) {
+      throw new CardException("Not implemented.");
+    }
+    byte[] response = new byte[currentFile.file.length + 2];
+    System.arraycopy(currentFile.file, 0, response, 0, currentFile.file.length);
+    response[currentFile.file.length] = (byte) 0x90;
+    response[currentFile.file.length + 1] = (byte) 0x00;
+    return new ResponseAPDU(response);
+  }
+
   protected ResponseAPDU cmdREAD_BINARY(CommandAPDU command) throws CardException {
 
     if (command.getINS() != 0xB0) {
@@ -192,6 +224,10 @@ public class STARCOSCardChannelEmul extends CardChannelEmul {
       case 0xB0:
         return cmdREAD_BINARY(command);
       
+      // READ RECORD
+      case 0xB2:
+        return cmdREAD_RECORD(command);
+
       // VERIFY
       case 0x20:
         return cmdVERIFY(command);
@@ -248,9 +284,15 @@ public class STARCOSCardChannelEmul extends CardChannelEmul {
     }
     
     if (pin != null) {
-  
-      if (reference.length == 0) {
-        return new ResponseAPDU(new byte[] { (byte) 0x63, (byte) (pin.kfpc | 0xC0)});
+
+      if (reference == null || reference.length == 0) {
+        if (pin.state == PIN.STATE_PIN_NOTACTIVE) {
+          return new ResponseAPDU(new byte[] { (byte) 0x69, (byte) 0x84 });
+        } else if (pin.state == PIN.STATE_PIN_BLOCKED) {
+          return new ResponseAPDU(new byte[] { (byte) 0x63, (byte) 0xc0 });
+        } else {
+          return new ResponseAPDU(new byte[] { (byte) 0x63, (byte) (pin.kfpc | 0xC0)});
+        }
       }
       
       if (reference.length != 8) {
@@ -264,7 +306,7 @@ public class STARCOSCardChannelEmul extends CardChannelEmul {
   
         case PIN.STATE_RESET:
           pin.state = PIN.STATE_PIN_VERIFIED;
-          
+
         default:
           pin.kfpc = 10;
           return new ResponseAPDU(new byte[] { (byte) 0x90, (byte) 0x00 });
@@ -321,7 +363,20 @@ public class STARCOSCardChannelEmul extends CardChannelEmul {
         return new ResponseAPDU(new byte[] {(byte) 0x67, (byte) 0x00});
       }
       
-      response = verifyPin(0xFF & command.getP2(), data);
+      PIN pin;
+      if (currentAppl != null) {
+        pin = currentAppl.pins.get(command.getP2());
+      } else {
+        pin = globalPins.get(command.getP2());
+      }
+      if (pin.state == PIN.STATE_PIN_NOTACTIVE) {
+        pin.pin = data;
+        pin.state = PIN.STATE_RESET;
+        response = new ResponseAPDU(new byte[] { (byte) 0x90, (byte) 0x00 });
+      } else {
+        // P1 == 0x01 not allowed on active pin (?)
+        response = new ResponseAPDU(new byte[] { (byte) 0x6A, (byte) 0x86});
+      }
 
     } else if (command.getP1() == 0x00) {
       
@@ -330,21 +385,22 @@ public class STARCOSCardChannelEmul extends CardChannelEmul {
       }
   
       response = verifyPin(0xFF & command.getP2(), Arrays.copyOf(data, 8));
-    
+
+      if (response.getSW() == 0x9000) {
+        PIN pin;
+        if (currentAppl != null) {
+          pin = currentAppl.pins.get(command.getP2());
+        } else {
+          pin = globalPins.get(command.getP2());
+        }
+        pin.pin = Arrays.copyOfRange(data, 8, 16);
+        pin.state = PIN.STATE_PIN_VERIFIED;
+      }
+
     } else {
       return new ResponseAPDU(new byte[] { (byte) 0x6A, (byte) 0x81 });
     }
      
-    if (response.getSW() == 0x9000) {
-      PIN pin;
-      if (currentAppl != null) {
-        pin = currentAppl.pins.get(command.getP2());
-      } else {
-        pin = globalPins.get(command.getP2());
-      }
-      pin.pin = Arrays.copyOfRange(data, 8, 16);
-    }
-
     return response;
     
   }
@@ -353,7 +409,10 @@ public class STARCOSCardChannelEmul extends CardChannelEmul {
     PIN pin = globalPins.get(kid);
     if (pin != null) {
       if (value == null) {
-        pin.pin = null;
+//        pin.pin = null;
+        //TransportPIN
+//        pin.pin = new byte[] { (byte) 0x24, (byte) 0x12, (byte) 0x34, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff};
+        pin.state = PIN.STATE_PIN_NOTACTIVE;
       } else {
         byte[] b = new byte[8];
         b[0] = (byte) (0x20 | value.length);
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardEmul.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardEmul.java
index 7b2f3fbe..5963fb63 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardEmul.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardEmul.java
@@ -21,30 +21,34 @@ import javax.smartcardio.ATR;
 
 import at.gv.egiz.smcc.CardChannelEmul;
 import at.gv.egiz.smcc.CardEmul;
+import at.gv.egiz.smcc.PIN;
 
 @SuppressWarnings("restriction")
 public class STARCOSCardEmul extends CardEmul {
-  
+
+  public static byte[] DEFAULT_SS_PIN = new byte[] { (byte) 0x26, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff};
+  public static byte[] DEFAULT_Glob_PIN = new byte[] { (byte) 0x24, (byte) 0x00, (byte) 0x00, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff};
+
   protected static ATR ATR = new ATR(new byte[] {
       (byte) 0x3b, (byte) 0xbd, (byte) 0x18, (byte) 0x00, (byte) 0x81, (byte) 0x31, (byte) 0xfe, (byte) 0x45, 
       (byte) 0x80, (byte) 0x51, (byte) 0x02, (byte) 0x67, (byte) 0x05, (byte) 0x18, (byte) 0xb1, (byte) 0x02, 
       (byte) 0x02, (byte) 0x02, (byte) 0x01, (byte) 0x81, (byte) 0x05, (byte) 0x31
   });
-  
+
   public STARCOSCardEmul() {
-    applications.add(new STARCOSApplSichereSignatur((STARCOSCardChannelEmul) channel));
+    this(DEFAULT_SS_PIN, DEFAULT_Glob_PIN, PIN.STATE_RESET);
+  }
+
+  public STARCOSCardEmul(byte[] SS_PIN, byte[] Glob_PIN, int PIN_STATE) {
+    channel = new STARCOSCardChannelEmul(this, Glob_PIN, PIN_STATE);
+    applications.add(new STARCOSApplSichereSignatur((STARCOSCardChannelEmul) channel, SS_PIN, PIN_STATE));
     applications.add(new STARCOSApplInfobox((STARCOSCardChannelEmul) channel));
-    applications.add(new STARCOSApplGewoehnlicheSignatur((STARCOSCardChannelEmul) channel));
+    applications.add(new STARCOSApplGewoehnlicheSignatur((STARCOSCardChannelEmul) channel,
+            STARCOSApplGewoehnlicheSignatur.DST));
   }
 
   @Override
   public ATR getATR() {
     return ATR;
   }
-
-  @Override
-  protected CardChannelEmul newCardChannel(CardEmul cardEmul) {
-    return new STARCOSCardChannelEmul(this);
-  }
-
 }
\ No newline at end of file
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardTest.java
index b7dc9a0c..154884d4 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardTest.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardTest.java
@@ -22,12 +22,9 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
-import javax.smartcardio.CardChannel;
 
 import org.junit.Test;
 
@@ -36,25 +33,20 @@ import at.gv.egiz.smcc.CardEmul;
 import at.gv.egiz.smcc.CardNotSupportedException;
 import at.gv.egiz.smcc.CardTerminalEmul;
 import at.gv.egiz.smcc.CardTest;
+import at.gv.egiz.smcc.pin.gui.ChangePINProvider;
+import at.gv.egiz.smcc.pin.gui.InvalidChangePINProvider;
+import at.gv.egiz.smcc.pin.gui.InvalidPINProvider;
 import at.gv.egiz.smcc.LockedException;
 import at.gv.egiz.smcc.NotActivatedException;
+import at.gv.egiz.smcc.PIN;
 import at.gv.egiz.smcc.PINFormatException;
 import at.gv.egiz.smcc.PINMgmtSignatureCard;
 import at.gv.egiz.smcc.PINSpec;
-import at.gv.egiz.smcc.STARCOSCard;
 import at.gv.egiz.smcc.SignatureCard;
 import at.gv.egiz.smcc.SignatureCardException;
 import at.gv.egiz.smcc.SignatureCardFactory;
-import at.gv.egiz.smcc.CardTest.TestChangePINProvider;
-import at.gv.egiz.smcc.CardTest.TestPINProvider;
-import at.gv.egiz.smcc.PINProvider;
+import at.gv.egiz.smcc.pin.gui.SMCCTestPINProvider;
 import at.gv.egiz.smcc.SignatureCard.KeyboxName;
-import at.gv.egiz.smcc.acos.A03ApplDEC;
-import at.gv.egiz.smcc.acos.A04ApplDEC;
-import at.gv.egiz.smcc.acos.A04ApplSIG;
-import at.gv.egiz.smcc.acos.ACOSAppl;
-import at.gv.egiz.smcc.acos.ACOSApplDEC;
-import at.gv.egiz.smcc.acos.ACOSApplSIG;
 import org.junit.Ignore;
 
 public class STARCOSCardTest extends CardTest {
@@ -69,7 +61,17 @@ public class STARCOSCardTest extends CardTest {
     assertTrue(signatureCard instanceof PINMgmtSignatureCard);
     return signatureCard;
   }
-  
+
+  protected SignatureCard createSignatureCard(byte[] SS_PIN, byte[] Glob_PIN, int pinState)
+      throws CardNotSupportedException {
+    SignatureCardFactory factory = SignatureCardFactory.getInstance();
+    STARCOSCardEmul card = new STARCOSCardEmul(SS_PIN, Glob_PIN, pinState);
+    SignatureCard signatureCard = factory.createSignatureCard(card,
+        new CardTerminalEmul(card));
+    assertTrue(signatureCard instanceof PINMgmtSignatureCard);
+    return signatureCard;
+  }
+
   @Test
   public void testGetInfoboxIdentityLinkEmpty() throws SignatureCardException,
       InterruptedException, CardNotSupportedException {
@@ -82,7 +84,7 @@ public class STARCOSCardTest extends CardTest {
     appl.clearInfobox();
 
     byte[] idlink = signatureCard.getInfobox("IdentityLink",
-        new TestPINProvider(pin), null);
+        new SMCCTestPINProvider(pin), null);
     assertNull(idlink);
 
   }
@@ -98,10 +100,10 @@ public class STARCOSCardTest extends CardTest {
     STARCOSApplInfobox appl = (STARCOSApplInfobox) card.getApplication(STARCOSAppl.AID_Infobox);
     appl.setInfoboxHeader((byte) 0xFF);
 
-    signatureCard.getInfobox("IdentityLink", new TestPINProvider(pin), null);
+    signatureCard.getInfobox("IdentityLink", new SMCCTestPINProvider(pin), null);
 
   }
- 
+
   @Test
   public void testGetCerts() throws SignatureCardException,
       InterruptedException, CardNotSupportedException {
@@ -145,7 +147,7 @@ public class STARCOSCardTest extends CardTest {
     signatureCard.getCertificate(KeyboxName.CERITIFIED_KEYPAIR);
 
   }
-  
+
   @Test
   public void testSignSichereSignatur() throws SignatureCardException,
       InterruptedException, CardNotSupportedException,
@@ -160,7 +162,7 @@ public class STARCOSCardTest extends CardTest {
 
     byte[] signature = signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
         .getBytes("ASCII")),
-        KeyboxName.SECURE_SIGNATURE_KEYPAIR, new TestPINProvider(pin), null);
+        KeyboxName.SECURE_SIGNATURE_KEYPAIR, new SMCCTestPINProvider(pin), null);
 
     assertNotNull(signature);
 
@@ -180,12 +182,12 @@ public class STARCOSCardTest extends CardTest {
 
     byte[] signature = signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
         .getBytes("ASCII")),
-        KeyboxName.CERITIFIED_KEYPAIR, new TestPINProvider(pin), null);
+        KeyboxName.CERITIFIED_KEYPAIR, new SMCCTestPINProvider(pin), null);
 
     assertNotNull(signature);
 
   }
-  
+
   @Test(expected = LockedException.class)
   public void testSignSichereSignaturInvalidPin() throws SignatureCardException,
       InterruptedException, CardNotSupportedException,
@@ -193,7 +195,7 @@ public class STARCOSCardTest extends CardTest {
 
     SignatureCard signatureCard = createSignatureCard();
 
-    TestPINProvider pinProvider = new TestPINProvider("000000".toCharArray());
+    SMCCTestPINProvider pinProvider = new SMCCTestPINProvider("000000".toCharArray());
 
     signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
         .getBytes("ASCII")), KeyboxName.SECURE_SIGNATURE_KEYPAIR,
@@ -208,7 +210,7 @@ public class STARCOSCardTest extends CardTest {
 
     SignatureCard signatureCard = createSignatureCard();
 
-    TestPINProvider pinProvider = new TestPINProvider("1234".toCharArray());
+    SMCCTestPINProvider pinProvider = new SMCCTestPINProvider("1234".toCharArray());
 
     signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
         .getBytes("ASCII")), KeyboxName.CERITIFIED_KEYPAIR,
@@ -221,12 +223,9 @@ public class STARCOSCardTest extends CardTest {
       InterruptedException, CardNotSupportedException,
       NoSuchAlgorithmException, IOException {
 
-    SignatureCard signatureCard = createSignatureCard();
-    CardEmul card = (CardEmul) signatureCard.getCard();
-    STARCOSApplSichereSignatur appl = (STARCOSApplSichereSignatur) card.getApplication(STARCOSApplSichereSignatur.AID_SichereSignatur);
-    appl.setPin(STARCOSApplSichereSignatur.KID_PIN_SS, null);
+    SignatureCard signatureCard = createSignatureCard(null, null, PIN.STATE_PIN_BLOCKED);
 
-    TestPINProvider pinProvider = new TestPINProvider("000000".toCharArray());
+    SMCCTestPINProvider pinProvider = new SMCCTestPINProvider("000000".toCharArray());
     assertTrue(pinProvider.getProvided() <= 0);
 
     signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
@@ -240,68 +239,79 @@ public class STARCOSCardTest extends CardTest {
       InterruptedException, CardNotSupportedException,
       NoSuchAlgorithmException, IOException {
 
-    SignatureCard signatureCard = createSignatureCard();
-    CardEmul card = (CardEmul) signatureCard.getCard();
-    STARCOSCardChannelEmul channel = (STARCOSCardChannelEmul) card.getBasicChannel();
-    channel.setPin(STARCOSCardChannelEmul.KID_PIN_Glob, null);
-
-    TestPINProvider pinProvider = new TestPINProvider("0000".toCharArray());
+    SignatureCard signatureCard = createSignatureCard(null, null, PIN.STATE_PIN_BLOCKED);
+    
+    SMCCTestPINProvider pinProvider = new SMCCTestPINProvider("0000".toCharArray());
 
     signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
         .getBytes("ASCII")), KeyboxName.CERITIFIED_KEYPAIR,
         pinProvider, null);
 
   }
-  
+
   @Test
   public void testChangePin() throws CardNotSupportedException,
       LockedException, NotActivatedException, CancelledException,
       PINFormatException, SignatureCardException, InterruptedException {
 
-    char[] defaultPin = "123456".toCharArray();
-
-    PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard();
-    CardEmul card = (CardEmul) signatureCard.getCard();
-    STARCOSCardChannelEmul channel = (STARCOSCardChannelEmul) card.getBasicChannel();
-    channel.setPin(STARCOSCardChannelEmul.KID_PIN_Glob, defaultPin);
-    STARCOSApplSichereSignatur appl = (STARCOSApplSichereSignatur) card.getApplication(STARCOSApplSichereSignatur.AID_SichereSignatur);
-    appl.setPin(STARCOSApplSichereSignatur.KID_PIN_SS, defaultPin);
+    // set all initial pins to DEFAULT_SS_PIN (123456)
+    PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard(
+            STARCOSCardEmul.DEFAULT_SS_PIN, STARCOSCardEmul.DEFAULT_SS_PIN, PIN.STATE_RESET);
     
     for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
 
-      char[] pin = defaultPin;
+      char[] pin = "123456".toCharArray();
 
       for (int i = pinSpec.getMinLength(); i <= pinSpec.getMaxLength(); i++) {
-        signatureCard.verifyPIN(pinSpec, new TestPINProvider(pin));
+        signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
         char[] newPin = new char[i];
         Arrays.fill(newPin, '0');
         signatureCard
-            .changePIN(pinSpec, new TestChangePINProvider(pin, newPin));
-        signatureCard.verifyPIN(pinSpec, new TestPINProvider(newPin));
+            .changePIN(pinSpec, new ChangePINProvider(pin, newPin));
+        signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(newPin));
         pin = newPin;
       }
     }
   }
 
   @Test
-  public void testVerifyInvalidPin() throws CardNotSupportedException,
+  @Override
+  public void testActivatePin() throws CardNotSupportedException,
       LockedException, NotActivatedException, CancelledException,
       PINFormatException, SignatureCardException, InterruptedException {
 
-    char[] defaultPin = "123456".toCharArray();
+    PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard(
+            null, null, PIN.STATE_PIN_NOTACTIVE);
+
+    for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
+
+      char[] pin = "1234567890".substring(0, pinSpec.getMinLength()).toCharArray();
+
+      boolean notActive = false;
+      try {
+        signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
+      } catch (NotActivatedException ex) {
+        notActive = true;
+      }
+      assertTrue(notActive);
+
+      signatureCard.activatePIN(pinSpec, new ChangePINProvider(null, pin));
+      signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
+    }
+  }
+
+  @Test
+  public void testVerifyInvalidPin() throws CardNotSupportedException,
+      LockedException, NotActivatedException, CancelledException,
+      PINFormatException, SignatureCardException, InterruptedException {
 
     PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard();
-    CardEmul card = (CardEmul) signatureCard.getCard();
-    STARCOSCardChannelEmul channel = (STARCOSCardChannelEmul) card.getBasicChannel();
-    channel.setPin(STARCOSCardChannelEmul.KID_PIN_Glob, defaultPin);
-    STARCOSApplSichereSignatur appl = (STARCOSApplSichereSignatur) card.getApplication(STARCOSApplSichereSignatur.AID_SichereSignatur);
-    appl.setPin(STARCOSApplSichereSignatur.KID_PIN_SS, defaultPin);
 
     for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
 
       char[] invalidPin = "999999".toCharArray();
       int numInvalidTries = 2;
-      TestInvalidPINProvider invalidPinProvider = new TestInvalidPINProvider(invalidPin, numInvalidTries);
+      InvalidPINProvider invalidPinProvider = new InvalidPINProvider(invalidPin, numInvalidTries);
       try {
         signatureCard.verifyPIN(pinSpec, invalidPinProvider);
       } catch (CancelledException ex) {
@@ -315,21 +325,15 @@ public class STARCOSCardTest extends CardTest {
   public void testChangeInvalidPin() throws CardNotSupportedException,
       LockedException, NotActivatedException, CancelledException,
       PINFormatException, SignatureCardException, InterruptedException {
-    char[] defaultPin = "123456".toCharArray();
 
     PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard();
-    CardEmul card = (CardEmul) signatureCard.getCard();
-    STARCOSCardChannelEmul channel = (STARCOSCardChannelEmul) card.getBasicChannel();
-    channel.setPin(STARCOSCardChannelEmul.KID_PIN_Glob, defaultPin);
-    STARCOSApplSichereSignatur appl = (STARCOSApplSichereSignatur) card.getApplication(STARCOSApplSichereSignatur.AID_SichereSignatur);
-    appl.setPin(STARCOSApplSichereSignatur.KID_PIN_SS, defaultPin);
-
+    
     for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
 
       char[] invalidPin = "999999".toCharArray();
       int numInvalidTries = 2;
-      TestInvalidChangePINProvider invalidPinProvider =
-              new TestInvalidChangePINProvider(invalidPin, defaultPin, numInvalidTries);
+      InvalidChangePINProvider invalidPinProvider =
+              new InvalidChangePINProvider(invalidPin, invalidPin, numInvalidTries);
 
       try {
         signatureCard.changePIN(pinSpec, invalidPinProvider);
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardChannelEmul.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardChannelEmul.java
new file mode 100644
index 00000000..dc6836ae
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardChannelEmul.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.starcos;
+
+import at.gv.egiz.smcc.CardEmul;
+import at.gv.egiz.smcc.File;
+import at.gv.egiz.smcc.PIN;
+
+/**
+ *
+ * @author clemens
+ */
+public class STARCOSG3CardChannelEmul extends STARCOSCardChannelEmul {
+
+  public STARCOSG3CardChannelEmul(CardEmul cardEmul, byte[] Glob_PIN, int PIN_STATE) {
+    super(cardEmul, Glob_PIN, PIN_STATE);
+
+    // G3 version file
+    byte[] versionFileFID = new byte[]{(byte) 0x00, (byte) 0x32};
+    byte[] versionFile = new byte[]{
+      (byte) 0xa5, (byte) 0x0e, (byte) 0x53, (byte) 0x02, (byte) 0x01, (byte) 0x20, (byte) 0x54, (byte) 0x08,
+      (byte) 0x01, (byte) 0x01, (byte) 0x03, (byte) 0x01, (byte) 0x04, (byte) 0x01, (byte) 0x70, (byte) 0x01};
+    byte[] versionFileFCX = new byte[]{
+      (byte) 0x62, (byte) 0x1a, (byte) 0x80, (byte) 0x02, (byte) 0x00, (byte) 0x14, (byte) 0x82, (byte) 0x05,
+      (byte) 0x44, (byte) 0x41, (byte) 0x00, (byte) 0x14, (byte) 0x01, (byte) 0x83, (byte) 0x02, (byte) 0x00,
+      (byte) 0x32, (byte) 0x88, (byte) 0x01, (byte) 0xd8, (byte) 0x8a, (byte) 0x01, (byte) 0x05, (byte) 0xa1,
+      (byte) 0x03, (byte) 0x8b, (byte) 0x01, (byte) 0x03};
+
+    globalFiles.add(new File(versionFileFID, versionFile, versionFileFCX));
+
+  }
+ }
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardEmul.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardEmul.java
new file mode 100644
index 00000000..7583b3ad
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardEmul.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.smcc.starcos;
+
+import at.gv.egiz.smcc.CardEmul;
+import javax.smartcardio.ATR;
+
+import at.gv.egiz.smcc.PIN;
+
+@SuppressWarnings("restriction")
+public class STARCOSG3CardEmul extends CardEmul {
+
+  public static byte[] TRANSPORT_SS_PIN = new byte[] { (byte) 0x26, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff};
+  public static byte[] TRANSPORT_Glob_PIN = new byte[] { (byte) 0x24, (byte) 0x12, (byte) 0x34, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff};
+
+  public static byte[] DEFAULT_SS_PIN = TRANSPORT_SS_PIN;
+  public static byte[] DEFAULT_Glob_PIN = new byte[] { (byte) 0x24, (byte) 0x00, (byte) 0x00, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff};
+
+  protected static ATR ATR = new ATR(new byte[] {
+      (byte) 0x3b, (byte) 0xbd, (byte) 0x18, (byte) 0x00, (byte) 0x81, (byte) 0x31, (byte) 0xfe, (byte) 0x45,
+      (byte) 0x80, (byte) 0x51, (byte) 0x02, (byte) 0x67, (byte) 0x05, (byte) 0x18, (byte) 0xb1, (byte) 0x02,
+      (byte) 0x02, (byte) 0x02, (byte) 0x01, (byte) 0x81, (byte) 0x05, (byte) 0x31
+  });
+
+  public STARCOSG3CardEmul(byte[] SS_PIN, byte[] Glob_PIN, int PIN_STATE){
+    channel = new STARCOSG3CardChannelEmul(this, Glob_PIN, PIN_STATE);
+    applications.add(new STARCOSApplSichereSignatur((STARCOSCardChannelEmul) channel,
+            SS_PIN, PIN_STATE));
+    applications.add(new STARCOSApplInfobox((STARCOSCardChannelEmul) channel));
+    applications.add(new STARCOSApplGewoehnlicheSignatur((STARCOSCardChannelEmul) channel,
+            STARCOSApplGewoehnlicheSignatur.DST_G3));
+  }
+
+
+  public STARCOSG3CardEmul() {
+    this(DEFAULT_SS_PIN, DEFAULT_Glob_PIN, PIN.STATE_RESET);
+  }
+
+  @Override
+  public ATR getATR() {
+    return ATR;
+  }
+}
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardTest.java
new file mode 100644
index 00000000..06744c82
--- /dev/null
+++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardTest.java
@@ -0,0 +1,119 @@
+/*
+* 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.
+*/
+package at.gv.egiz.smcc.starcos;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+
+
+import org.junit.Test;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.CardEmul;
+import at.gv.egiz.smcc.CardNotSupportedException;
+import at.gv.egiz.smcc.CardTerminalEmul;
+import at.gv.egiz.smcc.CardTest;
+import at.gv.egiz.smcc.pin.gui.ChangePINProvider;
+import at.gv.egiz.smcc.LockedException;
+import at.gv.egiz.smcc.NotActivatedException;
+import at.gv.egiz.smcc.PIN;
+import at.gv.egiz.smcc.PINFormatException;
+import at.gv.egiz.smcc.PINMgmtSignatureCard;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.SignatureCard;
+import at.gv.egiz.smcc.SignatureCardException;
+import at.gv.egiz.smcc.SignatureCardFactory;
+import at.gv.egiz.smcc.pin.gui.SMCCTestPINProvider;
+import org.junit.Ignore;
+
+public class STARCOSG3CardTest extends CardTest {
+
+  @Override
+  protected SignatureCard createSignatureCard()
+      throws CardNotSupportedException {
+    SignatureCardFactory factory = SignatureCardFactory.getInstance();
+    STARCOSG3CardEmul card = new STARCOSG3CardEmul();
+    SignatureCard signatureCard = factory.createSignatureCard(card,
+        new CardTerminalEmul(card));
+    assertTrue(signatureCard instanceof PINMgmtSignatureCard);
+    return signatureCard;
+  }
+
+  protected SignatureCard createSignatureCard(byte[] SS_PIN, byte[] Glob_PIN, int pinState)
+      throws CardNotSupportedException {
+    SignatureCardFactory factory = SignatureCardFactory.getInstance();
+    STARCOSG3CardEmul card = new STARCOSG3CardEmul(SS_PIN, Glob_PIN, pinState);
+    SignatureCard signatureCard = factory.createSignatureCard(card,
+        new CardTerminalEmul(card));
+    assertTrue(signatureCard instanceof PINMgmtSignatureCard);
+    return signatureCard;
+  }
+
+  @Test
+  public void testChangePin() throws CardNotSupportedException,
+      LockedException, NotActivatedException, CancelledException,
+      PINFormatException, SignatureCardException, InterruptedException {
+
+    PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard(
+            STARCOSG3CardEmul.DEFAULT_SS_PIN, STARCOSG3CardEmul.DEFAULT_SS_PIN, PIN.STATE_RESET);
+    
+    for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
+
+      char[] pin = "123456".toCharArray();
+
+      for (int i = pinSpec.getMinLength(); i <= pinSpec.getMaxLength(); i++) {
+        signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
+        char[] newPin = new char[i];
+        Arrays.fill(newPin, '0');
+        signatureCard
+            .changePIN(pinSpec, new ChangePINProvider(pin, newPin));
+        signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(newPin));
+        pin = newPin;
+      }
+    }
+  }
+
+  @Test
+  @Override
+  public void testActivatePin() throws CardNotSupportedException,
+      LockedException, NotActivatedException, CancelledException,
+      PINFormatException, SignatureCardException, InterruptedException {
+
+    PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard(
+            STARCOSG3CardEmul.TRANSPORT_SS_PIN, STARCOSG3CardEmul.TRANSPORT_SS_PIN, PIN.STATE_PIN_NOTACTIVE);
+    
+    for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
+
+      char[] pin = "123456789".substring(0, pinSpec.getMinLength()).toCharArray();
+      char[] transportPIN = "123456".toCharArray();
+
+      boolean notActive = false;
+      try {
+        signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
+      } catch (NotActivatedException ex) {
+        notActive = true;
+      }
+      assertTrue(notActive);
+
+      signatureCard.activatePIN(pinSpec, new ChangePINProvider(transportPIN, pin));
+      signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
+    }
+  }
+
+  
+}
diff --git a/smccSTAL/src/main/java/META-INF/MANIFEST.MF b/smccSTAL/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e949512..00000000
--- a/smccSTAL/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/AbstractPINProvider.java b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/AbstractPINProvider.java
new file mode 100644
index 00000000..00738188
--- /dev/null
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/AbstractPINProvider.java
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.pin.gui;
+
+import at.gv.egiz.smcc.pin.gui.PINProvider;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * common super class providing action listener for all PIN GUIs
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public abstract class AbstractPINProvider implements ActionListener {
+
+  protected static final Log log = LogFactory.getLog(AbstractPINProvider.class);
+
+  protected String action;
+  protected boolean actionPerformed;
+
+  protected synchronized void waitForAction() throws InterruptedException {
+    try {
+      while (!actionPerformed) {
+        this.wait();
+      }
+    } catch (InterruptedException e) {
+      log.error("[" + Thread.currentThread().getName() + "] interrupt in waitForAction");
+      throw e;
+    }
+    actionPerformed = false;
+  }
+
+  private synchronized void actionPerformed() {
+    actionPerformed = true;
+    notify();//All();
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    log.debug("[" + Thread.currentThread().getName() + "] action performed - " + e.getActionCommand());
+    action = e.getActionCommand();
+    actionPerformed();
+  }
+}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINGUI.java b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINGUI.java
new file mode 100644
index 00000000..81db0e90
--- /dev/null
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINGUI.java
@@ -0,0 +1,136 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.pin.gui;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.bku.smccstal.SecureViewer;
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.pin.gui.PINGUI;
+import at.gv.egiz.stal.signedinfo.SignedInfoType;
+import java.security.DigestException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * The number of retries is not fixed and there is no way (?) to obtain this value.
+ * A PINProvider should therefore maintain an internal retry counter or flag
+ * to decide whether or not to warn the user (num retries passed in providePIN).
+ *
+ * Therefore PINProvider objects should not be reused.
+ *
+ * (ACOS: reload counter: between 0 and 15, where 15 meens deactivated)
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class SignPINGUI extends SignPINProvider implements PINGUI {
+
+  protected static final Log log = LogFactory.getLog(SignPINGUI.class);
+
+  private boolean retry = false;
+
+  public SignPINGUI(BKUGUIFacade gui, SecureViewer viewer, SignedInfoType signedInfo) {
+    super(gui, viewer, signedInfo);
+  }
+
+  @Override
+  public void enterPINDirect(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException {
+    if (retry) {
+      gui.showEnterPINDirect(spec, retries);
+    } else {
+      showSignatureData(spec);
+      gui.showEnterPINDirect(spec, -1);
+      retry = true;
+    }
+  }
+
+  @Override
+  public void enterPIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException {
+    if (retry) {
+      gui.showEnterPIN(spec, retries);
+    } else {
+      showSignatureData(spec);
+      gui.showEnterPIN(spec, -1);
+      retry = true;
+    }
+  }
+
+  private void showSignatureData(PINSpec spec)
+          throws CancelledException, InterruptedException {
+
+    gui.showSignatureDataDialog(spec,
+            this, "enterPIN",
+            this, "cancel",
+            this, "secureViewer");
+
+    do {
+      log.trace("[" + Thread.currentThread().getName() + "] wait for action");
+      waitForAction();
+      log.trace("[" + Thread.currentThread().getName() + "] received action " + action);
+
+      if ("secureViewer".equals(action)) {
+        try {
+          viewer.displayDataToBeSigned(signedInfo, this, "signatureData");
+        } catch (DigestException ex) {
+          log.error("Bad digest value: " + ex.getMessage());
+          gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH,
+                  new Object[]{ex.getMessage()},
+                  this, "error");
+        } catch (Exception ex) {
+          log.error("Could not display hashdata inputs: " +
+                  ex.getMessage());
+          gui.showErrorDialog(BKUGUIFacade.ERR_DISPLAY_HASHDATA,
+                  new Object[]{ex.getMessage()},
+                  this, "error");
+        }
+      } else if ("signatureData".equals(action)) {
+        gui.showSignatureDataDialog(spec,
+                this, "enterPIN",
+                this, "cancel",
+                this, "secureViewer");
+      } else if ("enterPIN".equals(action)) {
+        return;
+      } else if ("cancel".equals(action) ||
+              "error".equals(action)) {
+        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                BKUGUIFacade.MESSAGE_WAIT);
+        throw new CancelledException(spec.getLocalizedName() +
+                " entry cancelled");
+      } else {
+        log.error("unknown action command " + action);
+      }
+    } while (true);
+  }
+
+  @Override
+  public void validKeyPressed() {
+    gui.validKeyPressed();
+  }
+
+  @Override
+  public void correctionButtonPressed() {
+    gui.correctionButtonPressed();
+  }
+
+  @Override
+  public void allKeysCleared() {
+    gui.allKeysCleared();
+  }
+
+}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINProvider.java b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINProvider.java
new file mode 100644
index 00000000..fc1d39af
--- /dev/null
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINProvider.java
@@ -0,0 +1,105 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.pin.gui;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.bku.smccstal.SecureViewer;
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.pin.gui.PINProvider;
+import at.gv.egiz.stal.signedinfo.SignedInfoType;
+import java.security.DigestException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * The number of retries is not fixed and there is no way (?) to obtain this value.
+ * A PINProvider should therefore maintain an internal retry counter or flag
+ * to decide whether or not to warn the user (num retries passed in providePIN).
+ *
+ * Therefore PINProvider objects should not be reused.
+ *
+ * (ACOS: reload counter: between 0 and 15, where 15 meens deactivated)
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class SignPINProvider extends AbstractPINProvider implements PINProvider {
+
+  protected static final Log log = LogFactory.getLog(SignPINProvider.class);
+
+  protected BKUGUIFacade gui;
+  protected SecureViewer viewer;
+  protected SignedInfoType signedInfo;
+  private boolean retry = false;
+
+  public SignPINProvider(BKUGUIFacade gui, SecureViewer viewer, SignedInfoType signedInfo) {
+    this.gui = gui;
+    this.viewer = viewer;
+    this.signedInfo = signedInfo;
+  }
+
+  @Override
+  public char[] providePIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException {
+
+    gui.showSignaturePINDialog(spec, (retry) ? retries : -1,
+            this, "sign",
+            this, "cancel",
+            this, "secureViewer");
+
+    do {
+      log.trace("[" + Thread.currentThread().getName() + "] wait for action");
+      waitForAction();
+      log.trace("[" + Thread.currentThread().getName() + "] received action " + action);
+
+      if ("secureViewer".equals(action)) {
+        try {
+          viewer.displayDataToBeSigned(signedInfo, this, "pinEntry");
+        } catch (DigestException ex) {
+          log.error("Bad digest value: " + ex.getMessage());
+          gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH,
+                  new Object[]{ex.getMessage()},
+                  this, "error");
+        } catch (Exception ex) {
+          log.error("Could not display hashdata inputs: " +
+                  ex.getMessage());
+          gui.showErrorDialog(BKUGUIFacade.ERR_DISPLAY_HASHDATA,
+                  new Object[]{ex.getMessage()},
+                  this, "error");
+        }
+      } else if ("sign".equals(action)) {
+        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                BKUGUIFacade.MESSAGE_WAIT);
+        retry = true;
+        return gui.getPin();
+      } else if ("pinEntry".equals(action)) {
+        gui.showSignaturePINDialog(spec, (retry) ? retries : -1,
+                this, "sign",
+                this, "cancel",
+                this, "secureViewer");
+      } else if ("cancel".equals(action) ||
+              "error".equals(action)) {
+        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+                BKUGUIFacade.MESSAGE_WAIT);
+        throw new CancelledException(spec.getLocalizedName() +
+                " entry cancelled");
+      } else {
+        log.error("unknown action command " + action);
+      }
+    } while (true);
+  }
+}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINGUI.java b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINGUI.java
new file mode 100644
index 00000000..dc21492e
--- /dev/null
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINGUI.java
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.pin.gui;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.pin.gui.PINGUI;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * The number of retries is not fixed and there is no way (?) to obtain this value.
+ * A PINProvider should therefore maintain an internal retry counter or flag
+ * to decide whether or not to warn the user (num retries passed in providePIN).
+ *
+ * Therefore PINProvider objects should not be reused.
+ *
+ * (ACOS: reload counter: between 0 and 15, where 15 meens deactivated)
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class VerifyPINGUI extends VerifyPINProvider implements PINGUI {
+
+  protected static final Log log = LogFactory.getLog(VerifyPINGUI.class);
+
+  private boolean retry = false;
+
+  public VerifyPINGUI(BKUGUIFacade gui) {
+    super(gui);
+  }
+
+  @Override
+  public void enterPINDirect(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException {    
+    gui.showEnterPINDirect(spec, (retry) ? retries : -1);
+    retry = true;
+  }
+
+  @Override
+  public void enterPIN(PINSpec spec, int retries) {
+    gui.showEnterPIN(spec, (retry) ? retries : -1);
+    retry = true;
+  }
+
+
+  @Override
+  public void validKeyPressed() {
+    gui.validKeyPressed();
+  }
+
+  @Override
+  public void correctionButtonPressed() {
+    gui.correctionButtonPressed();
+  }
+
+  @Override
+  public void allKeysCleared() {
+    gui.allKeysCleared();
+  }
+
+}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINProvider.java b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINProvider.java
new file mode 100644
index 00000000..fda1e402
--- /dev/null
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINProvider.java
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.pin.gui;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.pin.gui.PINProvider;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * The number of retries is not fixed and there is no way (?) to obtain this value.
+ * A PINProvider should therefore maintain an internal retry counter or flag
+ * to decide whether or not to warn the user (num retries passed in providePIN).
+ *
+ * Therefore PINProvider objects should not be reused.
+ *
+ * (ACOS: reload counter: between 0 and 15, where 15 meens deactivated)
+ *
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
+ */
+public class VerifyPINProvider extends AbstractPINProvider implements PINProvider {
+
+  protected static final Log log = LogFactory.getLog(VerifyPINProvider.class);
+
+  protected BKUGUIFacade gui;
+  private boolean retry = false;
+
+  public VerifyPINProvider(BKUGUIFacade gui) {
+    this.gui = gui;
+  }
+
+  @Override
+  public char[] providePIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException {
+
+    gui.showVerifyPINDialog(spec, (retry) ? retries : -1,
+            this, "verify",
+            this, "cancel");
+
+    log.trace("[" + Thread.currentThread().getName() + "] wait for action");
+    waitForAction();
+    log.trace("[" + Thread.currentThread().getName() + "] received action " + action);
+
+    if ("cancel".equals(action)) {
+      gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+              BKUGUIFacade.MESSAGE_WAIT);
+      throw new CancelledException(spec.getLocalizedName() +
+              " entry cancelled");
+    }
+    
+    gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+            BKUGUIFacade.MESSAGE_WAIT);
+    retry = true;
+    return gui.getPin();
+  }
+}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java
deleted file mode 100644
index bc52c955..00000000
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractPINProvider.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.smccstal;
-
-import at.gv.egiz.smcc.PINProvider;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public abstract class AbstractPINProvider implements PINProvider, ActionListener {
-
-  protected static final Log log = LogFactory.getLog(AbstractPINProvider.class);
-
-  protected boolean retry = false;
-
-  protected String action;
-
-  protected boolean actionPerformed;
-
-//  protected void waitForAction() throws InterruptedException {
-//    super.wait();
-//  }
-
-  protected synchronized void waitForAction() throws InterruptedException {
-    try {
-      while (!actionPerformed) {
-        this.wait();
-      }
-    } catch (InterruptedException e) {
-      log.error("[" + Thread.currentThread().getName() + "] interrupt in waitForAction");
-      throw e;
-    }
-    actionPerformed = false;
-  }
-
-  private synchronized void actionPerformed() {
-    actionPerformed = true;
-    notify();//All();
-  }
-
-  @Override
-  public void actionPerformed(ActionEvent e) {
-    log.debug("[" + Thread.currentThread().getName() + "] action performed - " + e.getActionCommand());
-    action = e.getActionCommand();
-    actionPerformed();
-  }
-}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
index 32e990c5..b34ab862 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
@@ -17,14 +17,13 @@
 package at.gv.egiz.bku.smccstal;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.bku.pin.gui.VerifyPINGUI;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import at.gv.egiz.smcc.CancelledException;
 import at.gv.egiz.smcc.LockedException;
 import at.gv.egiz.smcc.NotActivatedException;
-import at.gv.egiz.smcc.PINProvider;
-import at.gv.egiz.smcc.PINSpec;
 import at.gv.egiz.smcc.SignatureCard;
 import at.gv.egiz.smcc.SignatureCardException;
 import at.gv.egiz.stal.ErrorResponse;
@@ -49,8 +48,7 @@ public class InfoBoxReadRequestHandler extends AbstractRequestHandler {
           newSTALMessage("Message.RequestCaption", "Message.IdentityLink");
           log.debug("Handling identitylink infobox");
           byte[] resp = card.getInfobox(infoBox.getInfoboxIdentifier(),
-                  new PINProviderFactory(card.getReader(), gui)
-                  .getCardPINProvider(),
+                  new VerifyPINGUI(gui),
                   infoBox.getDomainIdentifier());
           if (resp == null) {
             log.info("Infobox doesn't contain any data. Assume card is not activated.");
@@ -97,8 +95,7 @@ public class InfoBoxReadRequestHandler extends AbstractRequestHandler {
           log.warn("Unknown infobox identifier: "
               + infoBox.getInfoboxIdentifier() + " trying generic request");
           byte[] resp = card.getInfobox(infoBox.getInfoboxIdentifier(),
-                  new PINProviderFactory(card.getReader(), gui)
-                  .getCardPINProvider(),
+                  new VerifyPINGUI(gui),
                   infoBox.getDomainIdentifier());
           if (resp == null) {
             return new ErrorResponse(6001);
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java
deleted file mode 100644
index e5afe0ae..00000000
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/PINProviderFactory.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.smccstal;
-
-import at.gv.egiz.bku.gui.BKUGUIFacade;
-import at.gv.egiz.smcc.CancelledException;
-import at.gv.egiz.smcc.ccid.CCID;
-import at.gv.egiz.smcc.PINProvider;
-import at.gv.egiz.smcc.PINSpec;
-import at.gv.egiz.stal.signedinfo.SignedInfoType;
-import java.security.DigestException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * don't reuse the instance if the card reader might have changed!
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class PINProviderFactory {
-
-  protected static final Log log = LogFactory.getLog(PINProviderFactory.class);
-
-  protected CCID reader;
-  protected BKUGUIFacade gui;
-
-  /**
-   * don't reuse the instance if the card reader might have changed!
-   * @param reader
-   * @param gui
-   */
-  public PINProviderFactory(CCID reader, BKUGUIFacade gui) {
-    log.trace("PINProviderFactory for " + reader.getName());
-    this.reader = reader;
-    this.gui = gui;
-  }
-
-
-  
-//  public static PINProviderFactory getInstance(SignatureCard forCard,
-//          BKUGUIFacade gui) {
-//    if (forCard.getReader().hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT) ||
-//            forCard.getReader().hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
-//      return new PinpadPINProviderFactory(gui);
-//    } else {
-//      return new SoftwarePINProviderFactory(gui);
-//    }
-//  }
-
-  /**
-   * don't reuse the instance if the card reader might have changed!
-   * @param reader
-   * @param gui
-   * @return
-   */
-//  public static PINProviderFactory getInstance(CCID reader, BKUGUIFacade gui) {
-//    log.trace("PINProviderFactory for " + reader.getName());
-//    return new PINProviderFactory(reader, gui);
-//  }
-
-  public PINProvider getSignaturePINProvider(SecureViewer viewer,
-          SignedInfoType signedInfo) {
-    if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_START) ||
-            reader.hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
-      log.debug("pinpad signature-pin provider");
-      return new PinpadSignaturePinProvider(viewer, signedInfo);
-    } else {
-      log.debug("software signature-pin provider");
-      return new SoftwareSignaturePinProvider(viewer, signedInfo);
-    }
-  }
-
-  public PINProvider getCardPINProvider() {
-    if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_START) ||
-            reader.hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
-      log.debug("pinpad card-pin provider");
-      return new PinpadCardPinProvider();
-    } else {
-      log.debug("software card-pin provider");
-      return new SoftwareCardPinProvider();
-    }
-  }
-
-  class SoftwareSignaturePinProvider extends AbstractPINProvider {
-
-    protected SecureViewer viewer;
-    protected SignedInfoType signedInfo;
-
-    private SoftwareSignaturePinProvider(SecureViewer viewer,
-            SignedInfoType signedInfo) {
-      this.viewer = viewer;
-      this.signedInfo = signedInfo;
-    }
-
-    @Override
-    public char[] providePIN(PINSpec spec, int retries)
-            throws CancelledException, InterruptedException {
-
-      gui.showSignaturePINDialog(spec, (retry) ? retries : -1,
-              this, "sign",
-              this, "cancel",
-              this, "secureViewer");
-
-      do {
-        log.debug("[" + Thread.currentThread().getName() + "] wait for action");
-        waitForAction();
-        log.debug("[" + Thread.currentThread().getName() + "] received action");
-
-        if ("secureViewer".equals(action)) {
-          try {
-            viewer.displayDataToBeSigned(signedInfo, this, "pinEntry");
-          } catch (DigestException ex) {
-            log.error("Bad digest value: " + ex.getMessage());
-            gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH,
-                    new Object[]{ex.getMessage()},
-                    this, "error");
-          } catch (Exception ex) {
-            log.error("Could not display hashdata inputs: " +
-                    ex.getMessage());
-            gui.showErrorDialog(BKUGUIFacade.ERR_DISPLAY_HASHDATA,
-                    new Object[]{ex.getMessage()},
-                    this, "error");
-          }
-        } else if ("sign".equals(action)) {
-          gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
-                BKUGUIFacade.MESSAGE_WAIT);
-          retry = true;
-          return gui.getPin();
-        } else if ("pinEntry".equals(action)) {
-          gui.showSignaturePINDialog(spec, (retry) ? retries : -1,
-                  this, "sign",
-                  this, "cancel",
-                  this, "secureViewer");
-        } else if ("cancel".equals(action) ||
-                "error".equals(action)) {
-          gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
-                BKUGUIFacade.MESSAGE_WAIT);
-          throw new CancelledException(spec.getLocalizedName() +
-                  " entry cancelled");
-        } else {
-          log.error("unknown action command " + action);
-        }
-      } while (true);
-    }
-  }
-
-  class SoftwareCardPinProvider extends AbstractPINProvider {
-
-    private SoftwareCardPinProvider() {
-    }
-
-    @Override
-    public char[] providePIN(PINSpec spec, int retries)
-            throws CancelledException, InterruptedException {
-
-      gui.showCardPINDialog(spec, (retry) ? retries : -1,
-              this, "ok",
-              this, "cancel");
-
-      log.debug("[" + Thread.currentThread().getName() + "] wait for action");
-      waitForAction();
-
-      gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
-              BKUGUIFacade.MESSAGE_WAIT);
-
-      if ("cancel".equals(action)) {
-        throw new CancelledException(spec.getLocalizedName() +
-                  " entry cancelled");
-      }
-      retry = true;
-      return gui.getPin();
-    }
-  }
-
-    class PinpadSignaturePinProvider extends AbstractPINProvider {
-
-//    protected BKUGUIFacade gui;
-    protected SecureViewer viewer;
-    protected ViewerThread viewerThread;
-    protected SignedInfoType signedInfo;
-
-
-    private PinpadSignaturePinProvider(SecureViewer viewer,
-            SignedInfoType signedInfo) {
-      this.viewer = viewer;
-      this.signedInfo = signedInfo;
-    }
-
-    protected class ViewerThread extends Thread {
-
-      PINSpec pinSpec;
-      int retries;
-
-      public ViewerThread(PINSpec pinSpec, int retries) {
-        this.pinSpec = pinSpec;
-        this.retries = retries;
-      }
-
-      @Override
-      public void run() {
-
-        try {
-
-          gui.showPinpadSignaturePINDialog(pinSpec, retries,
-              PinpadSignaturePinProvider.this, "secureViewer");
-
-          while (true) {
-            log.debug("[" + Thread.currentThread().getName() + "] wait for action");
-            waitForAction();
-            log.debug("[" + Thread.currentThread().getName() + "] received action");
-
-            if ("secureViewer".equals(action)) {
-              viewer.displayDataToBeSigned(signedInfo,
-                      PinpadSignaturePinProvider.this, "pinEntry");
-            } else if ("pinEntry".equals(action)) {
-              gui.showPinpadSignaturePINDialog(pinSpec, retries,
-                      PinpadSignaturePinProvider.this, "secureViewer");
-            } else {
-              log.error("unsupported action command: " + action);
-            }
-          }
-
-        } catch (DigestException ex) {
-          log.error("Bad digest value: " + ex.getMessage());
-          gui.showErrorDialog(BKUGUIFacade.ERR_INVALID_HASH,
-                  new Object[]{ex.getMessage()});
-        } catch (InterruptedException ex) {
-          log.info("pinpad secure viewer thread interrupted");
-        } catch (Exception ex) {
-          log.error("Could not display hashdata inputs: " +
-                  ex.getMessage());
-          gui.showErrorDialog(BKUGUIFacade.ERR_DISPLAY_HASHDATA,
-                  new Object[]{ex.getMessage()});
-        }
-      }
-    }
-
-    @Override
-    public char[] providePIN(PINSpec spec, int retries)
-            throws CancelledException, InterruptedException {
-
-      if (viewerThread != null) {
-        updateViewerThread(retries);
-      } else {
-        viewerThread = new ViewerThread(spec, -1);
-        viewerThread.start();
-      }
-//      if (viewerThread != null) {
-//        log.trace("interrupt old secure viewer thread");
-//        viewerThread.interrupt();
-//      }
-//      viewerThread = new ViewerThread(spec, (retry) ? retries : -1);
-//      log.trace("start new secure viewer thread");
-//      viewerThread.start();
-
-      retry = true;
-      return null;
-    }
-
-    private synchronized void updateViewerThread(int retries) {
-      log.trace("update viewer thread");
-      viewerThread.retries = retries;
-      action = "pinEntry";
-      actionPerformed = true;
-      notify();
-    }
-
-
-//    @Override
-//    protected void finalize() throws Throwable {
-//      if (viewerThread != null) {
-//        viewerThread.interrupt();
-//      }
-//      log.info("finalizing Pinpad SignaturePinProvider");
-//      super.finalize();
-//    }
-  }
-
-  class PinpadCardPinProvider extends AbstractPINProvider {
-
-    private PinpadCardPinProvider() {
-    }
-
-    @Override
-    public char[] providePIN(PINSpec spec, int retries)
-            throws CancelledException, InterruptedException {
-
-      showPinpadPINDialog(retries, spec);
-      retry = true;
-      return null;
-
-    }
-
-    private void showPinpadPINDialog(int retries, PINSpec pinSpec) {
-      String title, message;
-      Object[] params;
-      if (retry) {
-        title = BKUGUIFacade.TITLE_RETRY;
-        message = BKUGUIFacade.MESSAGE_RETRIES;
-        params = new Object[]{String.valueOf(retries)};
-      } else {
-        title = BKUGUIFacade.TITLE_CARDPIN;
-        message = BKUGUIFacade.MESSAGE_ENTERPIN_PINPAD;
-        String pinSize = String.valueOf(pinSpec.getMinLength());
-        if (pinSpec.getMinLength() != pinSpec.getMaxLength()) {
-          pinSize += "-" + pinSpec.getMaxLength();
-        }
-        params = new Object[]{pinSpec.getLocalizedName(), pinSize};
-      }
-      gui.showMessageDialog(title, message, params);
-    }
-  }
-}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index 58d7b305..5b436d16 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -17,6 +17,7 @@
 package at.gv.egiz.bku.smccstal;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.bku.pin.gui.SignPINGUI;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -78,8 +79,7 @@ public class SignRequestHandler extends AbstractRequestHandler {
                 KeyboxName kb = SignatureCard.KeyboxName.getKeyboxName(signReq.getKeyIdentifier());
 
                 byte[] resp = card.createSignature(new ByteArrayInputStream(signReq.getSignedInfo()), kb,
-                        new PINProviderFactory(card.getReader(), gui)
-                        .getSignaturePINProvider(secureViewer, si.getValue()), signatureMethod);
+                        new SignPINGUI(gui, secureViewer, si.getValue()), signatureMethod);
                 if (resp == null) {
                     return new ErrorResponse(6001);
                 }
diff --git a/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java b/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
index 16d3efa9..bf57b0a6 100644
--- a/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
+++ b/smccSTAL/src/test/java/at/gv/egiz/smcc/AbstractSMCCSTALTest.java
@@ -16,7 +16,7 @@ import org.junit.Test;
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.smccstal.AbstractSMCCSTAL;
 import at.gv.egiz.bku.smccstal.SMCCSTALRequestHandler;
-import at.gv.egiz.smcc.ccid.CCID;
+import at.gv.egiz.smcc.pin.gui.PINGUI;
 import at.gv.egiz.stal.ErrorResponse;
 import at.gv.egiz.stal.InfoboxReadRequest;
 import at.gv.egiz.stal.InfoboxReadResponse;
@@ -39,7 +39,7 @@ public class AbstractSMCCSTALTest extends AbstractSMCCSTAL implements
 
     @Override
     public byte[] createSignature(InputStream input, KeyboxName keyboxName,
-        PINProvider provider, String alg) throws SignatureCardException {
+        PINGUI provider, String alg) throws SignatureCardException {
       // TODO Auto-generated method stub
       return null;
     }
@@ -58,7 +58,7 @@ public class AbstractSMCCSTALTest extends AbstractSMCCSTAL implements
     }
 
     @Override
-    public byte[] getInfobox(String infobox, PINProvider provider,
+    public byte[] getInfobox(String infobox, PINGUI provider,
         String domainId) throws SignatureCardException {
       // TODO Auto-generated method stub
       return null;
@@ -87,13 +87,6 @@ public class AbstractSMCCSTALTest extends AbstractSMCCSTAL implements
       // TODO Auto-generated method stub
       
     }
-
-    @Override
-    public CCID getReader() {
-      // TODO Auto-generated method stub
-      return null;
-    }
-
    };
     return false;
   }
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINGUI.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINGUI.java
new file mode 100644
index 00000000..26a24609
--- /dev/null
+++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINGUI.java
@@ -0,0 +1,88 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.pin.gui;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade.DIALOG;
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.pin.gui.ModifyPINGUI;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class ManagementPINGUI extends ManagementPINProvider implements ModifyPINGUI {
+
+  protected static final Log log = LogFactory.getLog(ManagementPINGUI.class);
+
+  private boolean retry = false;
+
+  public ManagementPINGUI(PINManagementGUIFacade gui, DIALOG type) {
+    super(gui, type);
+  }
+
+  @Override
+  public void modifyPINDirect(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException {    
+    gui.showModifyPINDirect(type, spec, (retry) ? retries : -1);
+    retry = true;
+  }
+
+  @Override
+  public void finishDirect() {
+    gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT, BKUGUIFacade.MESSAGE_WAIT);
+  }
+
+  @Override
+  public void enterCurrentPIN(PINSpec spec, int retries) {
+    gui.showEnterCurrentPIN(type, spec, (retry) ? retries : -1);
+    retry = true;
+  }
+
+  @Override
+  public void enterNewPIN(PINSpec spec) {
+    gui.showEnterNewPIN(type, spec);
+    retry = true;
+  }
+
+  @Override
+  public void confirmNewPIN(PINSpec spec) {
+    gui.showConfirmNewPIN(type, spec);
+    retry = true;
+  }
+
+
+  @Override
+  public void validKeyPressed() {
+    gui.validKeyPressed();
+  }
+
+  @Override
+  public void correctionButtonPressed() {
+    gui.correctionButtonPressed();
+  }
+
+  @Override
+  public void allKeysCleared() {
+    gui.allKeysCleared();
+  }
+
+  @Override
+  public void finish() {
+    gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT, BKUGUIFacade.MESSAGE_WAIT);
+  }
+}
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINProvider.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINProvider.java
new file mode 100644
index 00000000..8d842d13
--- /dev/null
+++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINProvider.java
@@ -0,0 +1,89 @@
+/*
+ * 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.
+ */
+package at.gv.egiz.bku.pin.gui;
+
+import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.bku.gui.PINManagementGUIFacade;
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.pin.gui.ModifyPINProvider;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class ManagementPINProvider extends AbstractPINProvider implements ModifyPINProvider {
+
+  protected static final Log log = LogFactory.getLog(ManagementPINProvider.class);
+  protected PINManagementGUIFacade gui;
+  protected PINManagementGUIFacade.DIALOG type;
+  private boolean retry = false;
+
+  public ManagementPINProvider(PINManagementGUIFacade gui, PINManagementGUIFacade.DIALOG type) {
+    this.gui = gui;
+    this.type = type;
+  }
+
+  @Override
+  public char[] provideCurrentPIN(PINSpec spec, int retries)
+          throws CancelledException, InterruptedException {
+
+    gui.showPINDialog(type, spec, (retry) ? retries : -1,
+            this, "change",
+            this, "cancel");
+
+    log.trace("[" + Thread.currentThread().getName() + "] wait for action");
+    waitForAction();
+    log.trace("[" + Thread.currentThread().getName() + "] received action " + action);
+
+    gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+            BKUGUIFacade.MESSAGE_WAIT);
+
+    if ("cancel".equals(action)) {
+      throw new CancelledException(spec.getLocalizedName() +
+              " entry cancelled");
+    }
+    retry = true;
+    return gui.getOldPin();
+  }
+
+  @Override
+  public char[] provideNewPIN(PINSpec spec)
+          throws CancelledException, InterruptedException {
+    
+    char[] pin = gui.getPin();
+    if (pin != null) {
+      // change pin dialog also returns new pin
+      return pin;
+    }
+
+    gui.showPINDialog(type, spec, -1,
+            this, "activate",
+            this, "cancel");
+
+    log.trace("[" + Thread.currentThread().getName() + "] wait for action");
+    waitForAction();
+    log.trace("[" + Thread.currentThread().getName() + "] received action " + action);
+
+    gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+              BKUGUIFacade.MESSAGE_WAIT);
+
+    if ("cancel".equals(action)) {
+      throw new CancelledException(spec.getLocalizedName() +
+              " entry cancelled");
+    }
+    return gui.getPin();
+  }
+}
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/ManagementPINProviderFactory.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/ManagementPINProviderFactory.java
deleted file mode 100644
index 493733b8..00000000
--- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/ManagementPINProviderFactory.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * 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.
- */
-
-package at.gv.egiz.bku.smccstal;
-
-import at.gv.egiz.bku.gui.BKUGUIFacade;
-import at.gv.egiz.smcc.ChangePINProvider;
-import at.gv.egiz.bku.gui.PINManagementGUIFacade;
-import at.gv.egiz.bku.smccstal.AbstractPINProvider;
-import at.gv.egiz.bku.smccstal.PINProviderFactory;
-import at.gv.egiz.smcc.CancelledException;
-import at.gv.egiz.smcc.ccid.CCID;
-import at.gv.egiz.smcc.PINProvider;
-import at.gv.egiz.smcc.PINSpec;
-import at.gv.egiz.smcc.SignatureCard;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class ManagementPINProviderFactory extends PINProviderFactory {
-
-  public ManagementPINProviderFactory(CCID reader, PINManagementGUIFacade gui) {
-    super(reader, gui);
-  }
-  
-//  public static ManagementPINProviderFactory getInstance(SignatureCard forCard,
-//          PINManagementGUIFacade gui) {
-//    if (forCard.getReader().hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
-//      return new PinpadPINProviderFactory(gui);
-//
-//    } else {
-//      return new SoftwarePINProviderFactory(gui);
-//    }
-//  }
-
-  public PINProvider getVerifyPINProvider() {
-    if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_START)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.VERIFY);
-    } else if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.VERIFY);
-    } else {
-      return new SoftwareGenericPinProvider(PINManagementGUIFacade.DIALOG.VERIFY);
-    }
-  }
-
-  public PINProvider getActivatePINProvider() {
-    if (reader.hasFeature(CCID.FEATURE_MODIFY_PIN_START)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.ACTIVATE);
-    } else if (reader.hasFeature(CCID.FEATURE_MODIFY_PIN_DIRECT)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.ACTIVATE);
-    } else {
-      return new SoftwareGenericPinProvider(PINManagementGUIFacade.DIALOG.ACTIVATE);
-    }
-  }
-
-  public ChangePINProvider getChangePINProvider() {
-    if (reader.hasFeature(CCID.FEATURE_MODIFY_PIN_START)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.CHANGE);
-    } else if (reader.hasFeature(CCID.FEATURE_MODIFY_PIN_DIRECT)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.CHANGE);
-    } else {
-      return new ChangePinProvider();
-    }
-  }
-
-  public PINProvider getUnblockPINProvider() {
-    if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_START)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.UNBLOCK);
-    } else if (reader.hasFeature(CCID.FEATURE_VERIFY_PIN_DIRECT)) {
-      return new PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG.UNBLOCK);
-    } else {
-      return new SoftwareGenericPinProvider(PINManagementGUIFacade.DIALOG.UNBLOCK);
-    }
-  }
-
-  class PinpadGenericPinProvider extends AbstractPINProvider
-          implements ChangePINProvider {
-
-    protected PINManagementGUIFacade.DIALOG type;
-
-    private PinpadGenericPinProvider(PINManagementGUIFacade.DIALOG type) {
-      this.type = type;
-    }
-
-    @Override
-    public char[] providePIN(PINSpec spec, int retries)
-            throws CancelledException, InterruptedException {
-
-      showPinpadPINDialog(retries, spec);
-      retry = true;
-      return null;
-    }
-
-    /**
-     * do not call this method without calling providePIN()
-     * (no message is displayed)
-     * @param spec
-     * @param retries
-     * @return
-     */
-    @Override
-    public char[] provideOldPIN(PINSpec spec, int retries) {
-      return null;
-    }
-
-    private void showPinpadPINDialog(int retries, PINSpec pinSpec) {
-      String title, message;
-      Object[] params;
-      if (retry) {
-        if (retries == 1) {
-          message = BKUGUIFacade.MESSAGE_LAST_RETRY_PINPAD;
-        } else {
-          message = BKUGUIFacade.MESSAGE_RETRIES_PINPAD;
-        }
-        title = BKUGUIFacade.TITLE_RETRY;
-        params = new Object[]{String.valueOf(retries)};
-      } else if (type == PINManagementGUIFacade.DIALOG.VERIFY) {
-        title = PINManagementGUIFacade.TITLE_VERIFY_PIN;
-        message = BKUGUIFacade.MESSAGE_ENTERPIN_PINPAD;
-        params = new Object[]{pinSpec.getLocalizedName(), pinSpec.getLocalizedLength()};
-      } else if (type == PINManagementGUIFacade.DIALOG.ACTIVATE) {
-        title = PINManagementGUIFacade.TITLE_ACTIVATE_PIN;
-        message = PINManagementGUIFacade.MESSAGE_ACTIVATEPIN_PINPAD;
-        params = new Object[]{pinSpec.getLocalizedName(), pinSpec.getLocalizedLength()};
-      } else if (type == PINManagementGUIFacade.DIALOG.CHANGE) {
-        title = PINManagementGUIFacade.TITLE_CHANGE_PIN;
-        message = PINManagementGUIFacade.MESSAGE_CHANGEPIN_PINPAD;
-        params = new Object[]{pinSpec.getLocalizedName(), pinSpec.getLocalizedLength()};
-      } else { //if (type == DIALOG.UNBLOCK) {
-        title = PINManagementGUIFacade.TITLE_UNBLOCK_PIN;
-        message = PINManagementGUIFacade.MESSAGE_UNBLOCKPIN_PINPAD;
-        params = new Object[]{pinSpec.getLocalizedName(), pinSpec.getLocalizedLength()};
-      }
-      gui.showMessageDialog(title, message, params);
-    }
-  }
-
-
-  class SoftwareGenericPinProvider extends AbstractPINProvider {
-
-//    protected PINManagementGUIFacade gui;
-    protected PINManagementGUIFacade.DIALOG type;
-
-    private SoftwareGenericPinProvider(PINManagementGUIFacade.DIALOG type) {
-      this.type = type;
-    }
-
-    @Override
-    public char[] providePIN(PINSpec spec, int retries)
-            throws CancelledException, InterruptedException {
-
-      ((PINManagementGUIFacade) gui).showPINDialog(type, spec,
-              (retry) ? retries : -1,
-              this, "exec",
-              this, "back");
-
-      waitForAction();
-
-      if ("exec".equals(action)) {
-        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
-                BKUGUIFacade.MESSAGE_WAIT);
-        retry = true;
-        return gui.getPin();
-      } else if ("back".equals(action)) {
-        throw new CancelledException();
-      } else {
-        log.error("unsupported command " + action);
-        throw new CancelledException();
-      }
-    }
-  }
-
-  class ChangePinProvider extends AbstractPINProvider
-          implements ChangePINProvider {
-
-//    protected PINManagementGUIFacade gui;
-
-    private char[] oldPin;
-    private char[] newPin;
-
-    private ChangePinProvider() {
-    }
-
-    @Override
-    public char[] providePIN(PINSpec spec, int retries)
-            throws CancelledException, InterruptedException {
-      if (newPin == null) {
-        getPINs(spec, retries);
-      }
-      char[] pin = newPin;
-      newPin = null;
-      return pin;
-    }
-
-    @Override
-    public char[] provideOldPIN(PINSpec spec, int retries)
-            throws CancelledException, InterruptedException {
-      if (oldPin == null) {
-        getPINs(spec, retries);
-      }
-      char[] pin = oldPin;
-      oldPin = null;
-      return pin;
-    }
-
-    private void getPINs(PINSpec spec, int retries)
-            throws InterruptedException, CancelledException {
-
-      ((PINManagementGUIFacade) gui).showPINDialog(
-              PINManagementGUIFacade.DIALOG.CHANGE, spec,
-              (retry) ? retries : -1,
-              this, "exec",
-              this, "back");
-
-      waitForAction();
-
-      if ("exec".equals(action)) {
-        gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
-                BKUGUIFacade.MESSAGE_WAIT);
-        retry = true;
-        oldPin = ((PINManagementGUIFacade) gui).getOldPin();
-        newPin = gui.getPin();
-      } else if ("back".equals(action)) {
-        throw new CancelledException();
-      } else {
-        log.error("unsupported command " + action);
-        throw new CancelledException();
-      }
-    }
-  }
-}
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PINManagementRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PINManagementRequestHandler.java
index bfeb90b0..0d49afd0 100644
--- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PINManagementRequestHandler.java
+++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PINManagementRequestHandler.java
@@ -23,9 +23,11 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
+import at.gv.egiz.bku.gui.PINManagementGUI;
 import at.gv.egiz.bku.gui.PINManagementGUIFacade;
 import at.gv.egiz.bku.gui.PINManagementGUIFacade.STATUS;
-import at.gv.egiz.bku.smccstal.AbstractRequestHandler;
+import at.gv.egiz.bku.pin.gui.ManagementPINGUI;
+import at.gv.egiz.bku.pin.gui.VerifyPINGUI;
 import at.gv.egiz.smcc.CancelledException;
 import at.gv.egiz.smcc.LockedException;
 import at.gv.egiz.smcc.NotActivatedException;
@@ -96,40 +98,15 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
             throw new NullPointerException("no PIN selected for activation/change");
           }
 
-          ManagementPINProviderFactory ppfac =
-                  new ManagementPINProviderFactory(card.getReader(), gui);
-
           try {
             if ("activate_enterpin".equals(actionCommand)) {
-              log.info("activate " + selectedPIN.getLocalizedName());
-              ((PINMgmtSignatureCard) card).activatePIN(selectedPIN,
-                      ppfac.getActivatePINProvider());
-              updatePINState(selectedPIN, STATUS.ACTIV);
-              gui.showMessageDialog(PINManagementGUIFacade.TITLE_ACTIVATE_SUCCESS,
-                      PINManagementGUIFacade.MESSAGE_ACTIVATE_SUCCESS,
-                      new Object[] {selectedPIN.getLocalizedName()},
-                      BKUGUIFacade.BUTTON_OK, this, "ok");
-              waitForAction();
+              activatePIN(selectedPIN);
             } else if ("change_enterpin".equals(actionCommand)) {
-              log.info("change " + selectedPIN.getLocalizedName());
-              ((PINMgmtSignatureCard) card).changePIN(selectedPIN, 
-                      ppfac.getChangePINProvider());
-              updatePINState(selectedPIN, STATUS.ACTIV);
-              gui.showMessageDialog(PINManagementGUIFacade.TITLE_CHANGE_SUCCESS,
-                      PINManagementGUIFacade.MESSAGE_CHANGE_SUCCESS,
-                      new Object[] {selectedPIN.getLocalizedName()},
-                      BKUGUIFacade.BUTTON_OK, this, "ok");
-              waitForAction();
-
+              changePIN(selectedPIN);
             } else if ("unblock_enterpuk".equals(actionCommand)) {
-              log.info("unblock " + selectedPIN.getLocalizedName());
-              ((PINMgmtSignatureCard) card).unblockPIN(selectedPIN,
-                      ppfac.getUnblockPINProvider());
+              unblockPIN(selectedPIN);
             } else if ("verify_enterpin".equals(actionCommand)) {
-              log.info("verify " + selectedPIN.getLocalizedName());
-              ((PINMgmtSignatureCard) card).verifyPIN(selectedPIN,
-                      ppfac.getVerifyPINProvider());
-              updatePINState(selectedPIN, STATUS.ACTIV);
+              verifyPIN(selectedPIN);
             }
           } catch (CancelledException ex) {
             log.trace("cancelled");
@@ -154,29 +131,17 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
                     new Object[] {selectedPIN.getLocalizedName()},
                     this, null);
             waitForAction();
-          } catch (PINConfirmationException ex) {
-            log.error("confirmation pin does not match new " + selectedPIN.getLocalizedName());
-            gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_CONFIRMATION,
-                    new Object[] {selectedPIN.getLocalizedName()},
-                    this, null);
-            waitForAction();
+
+            // inner loop for pinConfirmation and pinFormat ex
+//          } catch (PINConfirmationException ex) {
+//          } catch (PINFormatException ex) {
+
           } catch (PINOperationAbortedException ex) {
             log.error("pin operation aborted without further details");
             gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_OPERATION_ABORTED,
                     new Object[] {selectedPIN.getLocalizedName()},
                     this, null);
             waitForAction();
-          } catch (PINFormatException ex) {
-            log.error("wrong format of new " + selectedPIN.getLocalizedName());
-//            updatePINStatus(selectedPIN, STATUS.NOT_ACTIV);
-            String pinSize = String.valueOf(selectedPIN.getMinLength());
-            if (selectedPIN.getMinLength() != selectedPIN.getMaxLength()) {
-                pinSize += "-" + selectedPIN.getMaxLength();
-            }
-            gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_FORMAT,
-                    new Object[] {selectedPIN.getLocalizedName(), pinSize},
-                    this, null);
-            waitForAction();
           }
         } // end if
 
@@ -206,6 +171,157 @@ public class PINManagementRequestHandler extends AbstractRequestHandler {
     }
   }
 
+  private void activatePIN(PINSpec selectedPIN)
+          throws InterruptedException, SignatureCardException, GetPINStatusException {
+
+    log.info("activate " + selectedPIN.getLocalizedName());
+    ManagementPINGUI pinGUI = new ManagementPINGUI((PINManagementGUI) gui,
+            PINManagementGUIFacade.DIALOG.ACTIVATE);
+
+    boolean reentry;
+    do {
+      try {
+        reentry = false;
+        ((PINMgmtSignatureCard) card).activatePIN(selectedPIN, pinGUI);
+      } catch (PINConfirmationException ex) {
+        reentry = true;
+        log.error("confirmation pin does not match new " + selectedPIN.getLocalizedName());
+        gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_CONFIRMATION,
+                new Object[] {selectedPIN.getLocalizedName()},
+                this, null);
+        waitForAction();
+      } catch (PINFormatException ex) {
+        reentry = true;
+        log.error("wrong format of new " + selectedPIN.getLocalizedName());
+        String pinSize = String.valueOf(selectedPIN.getMinLength());
+        if (selectedPIN.getMinLength() != selectedPIN.getMaxLength()) {
+            pinSize += "-" + selectedPIN.getMaxLength();
+        }
+        gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_FORMAT,
+                new Object[] {selectedPIN.getLocalizedName(), pinSize},
+                this, null);
+        waitForAction();
+      }
+    } while (reentry);
+
+    updatePINState(selectedPIN, STATUS.ACTIV);
+    gui.showMessageDialog(PINManagementGUIFacade.TITLE_ACTIVATE_SUCCESS,
+            PINManagementGUIFacade.MESSAGE_ACTIVATE_SUCCESS,
+            new Object[]{selectedPIN.getLocalizedName()},
+            BKUGUIFacade.BUTTON_OK, this, "ok");
+    waitForAction();
+  }
+
+  private void verifyPIN(PINSpec selectedPIN)
+          throws InterruptedException, SignatureCardException, GetPINStatusException {
+
+    log.info("verify " + selectedPIN.getLocalizedName());
+    VerifyPINGUI pinGUI = new VerifyPINGUI(gui);
+
+    boolean reentry;
+    do {
+      try {
+        reentry = false;
+        ((PINMgmtSignatureCard) card).verifyPIN(selectedPIN, pinGUI);
+      } catch (PINFormatException ex) {
+        reentry = true;
+        log.error("wrong format of new " + selectedPIN.getLocalizedName());
+        String pinSize = String.valueOf(selectedPIN.getMinLength());
+        if (selectedPIN.getMinLength() != selectedPIN.getMaxLength()) {
+            pinSize += "-" + selectedPIN.getMaxLength();
+        }
+        gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_FORMAT,
+                new Object[] {selectedPIN.getLocalizedName(), pinSize},
+                this, null);
+        waitForAction();
+      }
+    } while (reentry);
+
+    updatePINState(selectedPIN, STATUS.ACTIV);
+  }
+
+  private void changePIN(PINSpec selectedPIN)
+          throws SignatureCardException, GetPINStatusException, InterruptedException {
+
+    log.info("change " + selectedPIN.getLocalizedName());
+    ManagementPINGUI pinGUI = new ManagementPINGUI((PINManagementGUI) gui,
+            PINManagementGUIFacade.DIALOG.CHANGE);
+
+    boolean reentry;
+    do {
+      try {
+        reentry = false;
+        ((PINMgmtSignatureCard) card).changePIN(selectedPIN, pinGUI);
+      } catch (PINConfirmationException ex) {
+        reentry = true;
+        log.error("confirmation pin does not match new " + selectedPIN.getLocalizedName());
+        gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_CONFIRMATION,
+                new Object[] {selectedPIN.getLocalizedName()},
+                this, null);
+        waitForAction();
+      } catch (PINFormatException ex) {
+        reentry = true;
+        log.error("wrong format of new " + selectedPIN.getLocalizedName());
+        String pinSize = String.valueOf(selectedPIN.getMinLength());
+        if (selectedPIN.getMinLength() != selectedPIN.getMaxLength()) {
+            pinSize += "-" + selectedPIN.getMaxLength();
+        }
+        gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_FORMAT,
+                new Object[] {selectedPIN.getLocalizedName(), pinSize},
+                this, null);
+        waitForAction();
+      }
+    } while (reentry);
+
+    updatePINState(selectedPIN, STATUS.ACTIV);
+    gui.showMessageDialog(PINManagementGUIFacade.TITLE_CHANGE_SUCCESS,
+            PINManagementGUIFacade.MESSAGE_CHANGE_SUCCESS,
+            new Object[]{selectedPIN.getLocalizedName()},
+            BKUGUIFacade.BUTTON_OK, this, "ok");
+    waitForAction();
+  }
+
+  private void unblockPIN(PINSpec selectedPIN)
+          throws SignatureCardException, GetPINStatusException, InterruptedException {
+
+    log.info("unblock " + selectedPIN.getLocalizedName());
+    ManagementPINGUI pinGUI = new ManagementPINGUI((PINManagementGUI) gui,
+            PINManagementGUIFacade.DIALOG.UNBLOCK);
+
+    boolean reentry;
+    do {
+      try {
+        reentry = false;
+        ((PINMgmtSignatureCard) card).unblockPIN(selectedPIN, pinGUI);
+      } catch (PINConfirmationException ex) {
+        reentry = true;
+        log.error("confirmation pin does not match new " + selectedPIN.getLocalizedName());
+        gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_CONFIRMATION,
+                new Object[] {selectedPIN.getLocalizedName()},
+                this, null);
+        waitForAction();
+      } catch (PINFormatException ex) {
+        reentry = true;
+        log.error("wrong format of new " + selectedPIN.getLocalizedName());
+        String pinSize = String.valueOf(selectedPIN.getMinLength());
+        if (selectedPIN.getMinLength() != selectedPIN.getMaxLength()) {
+            pinSize += "-" + selectedPIN.getMaxLength();
+        }
+        gui.showErrorDialog(PINManagementGUIFacade.ERR_PIN_FORMAT,
+                new Object[] {selectedPIN.getLocalizedName(), pinSize},
+                this, null);
+        waitForAction();
+      }
+    } while (reentry);
+
+    updatePINState(selectedPIN, STATUS.ACTIV);
+    gui.showMessageDialog(PINManagementGUIFacade.TITLE_UNBLOCK_SUCCESS,
+            PINManagementGUIFacade.MESSAGE_UNBLOCK_SUCCESS,
+            new Object[]{selectedPIN.getLocalizedName()},
+            BKUGUIFacade.BUTTON_OK, this, "ok");
+    waitForAction();
+  }
+
   @Override
   public boolean requireCard() {
     return true;
-- 
cgit v1.2.3


From dbffe94889d61a98733103b43ed30e53cdefd6ac Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 5 Jan 2010 12:18:12 +0000
Subject: [maven-release-plugin] prepare release mocca-1.2.10

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@567 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 14 +++++++-------
 BKUAppletExt/pom.xml    | 16 ++++++++--------
 BKUCertificates/pom.xml |  4 ++--
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUFonts/pom.xml        |  4 ++--
 BKUGuiExt/pom.xml       |  8 ++++----
 BKUHelp/pom.xml         |  4 ++--
 BKULocal/pom.xml        | 26 +++++++++++++-------------
 BKUOnline/pom.xml       | 28 ++++++++++++++--------------
 BKUViewer/pom.xml       |  8 ++++----
 BKUWebStart/pom.xml     |  6 +++---
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  4 ++--
 pom.xml                 | 10 +++++-----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 smccSTALExt/pom.xml     |  4 ++--
 utils/pom.xml           |  4 ++--
 21 files changed, 93 insertions(+), 93 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 402aea02..aaeb5907 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.10-SNAPSHOT</version>
+  <version>1.2.10</version>
   <build>
     <plugins>
       <plugin>
@@ -118,27 +118,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 95ebcab5..05493cb1 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.10-SNAPSHOT</version>
+        <version>1.2.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.10-SNAPSHOT</version>
+            <version>1.2.10</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.10-SNAPSHOT</version>
+            <version>1.2.10</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.10-SNAPSHOT</version>
+            <version>1.2.10</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.10-SNAPSHOT</version>
+            <version>1.2.10</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.10-SNAPSHOT</version>
+            <version>1.2.10</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.10-SNAPSHOT</version>
+            <version>1.2.10</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 7d6cdc82..83a9e7d2 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
-  <version>1.2-SNAPSHOT</version>
+  <version>1.2</version>
   <name>BKU Certificates</name>
 
   <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 88bb48c1..58a3b1f0 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.10-SNAPSHOT</version>
+        <version>1.2.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.10-SNAPSHOT</version>
+            <version>1.2.10</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.10-SNAPSHOT</version>
+            <version>1.2.10</version>
             <scope>compile</scope>
         </dependency>
         <!-- see BKUFonts.pom
diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml
index 40d38a3d..7e7e58c6 100644
--- a/BKUFonts/pom.xml
+++ b/BKUFonts/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUFonts</artifactId>
-  <version>1.2-SNAPSHOT</version>
+  <version>1.2</version>
   <name>BKU Fonts</name>
   <description>
     This module is used in validator(s) and viewer and is a direct dependency of
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 1d918331..2ddbbe54 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.10-SNAPSHOT</version>
+  <version>1.2.10</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index f526dccc..c0345b5b 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.2.10-SNAPSHOT</version>
+  <version>1.2.10</version>
   <name>BKU Help</name>
   <build>
     <resources>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 3b1e6873..667d952f 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.10-SNAPSHOT</version>
+		<version>1.2.10</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.10-SNAPSHOT</version>
+	<version>1.2.10</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -72,42 +72,42 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.10-SNAPSHOT</version>
+			<version>1.2.10</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.10-SNAPSHOT</version>
+			<version>1.2.10</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.10-SNAPSHOT</version>
+			<version>1.2.10</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.10-SNAPSHOT</version>
+			<version>1.2.10</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index ec8ca282..574c9be8 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.10-SNAPSHOT</version>
+  <version>1.2.10</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -28,22 +28,22 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2-SNAPSHOT</version>
+      <version>1.2</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -67,13 +67,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -117,13 +117,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
       <scope>provided</scope>
     </dependency>
     <!--
@@ -143,9 +143,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 5e6d6778..b0f19e19 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.10-SNAPSHOT</version>
+		<version>1.2.10</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.10-SNAPSHOT</version>
+	<version>1.2.10</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.10-SNAPSHOT</version>
+			<version>1.2.10</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -42,7 +42,7 @@
 	 <dependency>
 	  <groupId>at.gv.egiz</groupId>
 	  <artifactId>BKUFonts</artifactId>
-	  <version>1.2-SNAPSHOT</version>
+	  <version>1.2</version>
 	 </dependency>
 	</dependencies>
 </project>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 9592235b..adc6aa15 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.10-SNAPSHOT</version>
+  <version>1.2.10</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -230,7 +230,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCertificates</artifactId>
-      <version>1.2-SNAPSHOT</version>
+      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 965eff0e..db8668a0 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.10-SNAPSHOT</version>
+        <version>1.2.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 4a88f02e..0129b1ee 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.10-SNAPSHOT</version>
+  <version>1.2.10</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 845349b6..b7a4779f 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.10-SNAPSHOT</version>
+        <version>1.2.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.10-SNAPSHOT</version>
+            <version>1.2.10</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index c4f44f8a..ac23030f 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.10-SNAPSHOT</version>
+  <version>1.2.10</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.10-SNAPSHOT</version>
+      <version>1.2.10</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 5e0702e4..a1cc05a9 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.10-SNAPSHOT</version>
+		<version>1.2.10</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.10-SNAPSHOT</version>
+	<version>1.2.10</version>
 
 	<build>
 		<plugins>
diff --git a/pom.xml b/pom.xml
index 2b1cbad4..ce79e8d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.10-SNAPSHOT</version>
+  <version>1.2.10</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -48,9 +48,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -250,7 +250,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.10-SNAPSHOT</version>
+        <version>1.2.10</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 2222e62d..e0ed2e05 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.10-SNAPSHOT</version>
+  <version>1.2.10</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index bdc9e5bc..0dea9300 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.10-SNAPSHOT</version>
+        <version>1.2.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.10-SNAPSHOT</version>
+            <version>1.2.10</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.10-SNAPSHOT</version>
+            <version>1.2.10</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.10-SNAPSHOT</version>
+            <version>1.2.10</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index 201735eb..9280747c 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10-SNAPSHOT</version>
+    <version>1.2.10</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.10-SNAPSHOT</version>
+  <version>1.2.10</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index fc44d3c8..d3a1c8b7 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.10-SNAPSHOT</version>
+		<version>1.2.10</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.10-SNAPSHOT</version>
+	<version>1.2.10</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From 73065b1be0f839c09e8ca481a20f398167404ce4 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 5 Jan 2010 12:21:05 +0000
Subject: [maven-release-plugin] prepare for next development iteration

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@569 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 14 +++++++-------
 BKUAppletExt/pom.xml    | 16 ++++++++--------
 BKUCertificates/pom.xml |  4 ++--
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUFonts/pom.xml        |  4 ++--
 BKUGuiExt/pom.xml       |  8 ++++----
 BKUHelp/pom.xml         |  4 ++--
 BKULocal/pom.xml        | 26 +++++++++++++-------------
 BKUOnline/pom.xml       | 28 ++++++++++++++--------------
 BKUViewer/pom.xml       |  8 ++++----
 BKUWebStart/pom.xml     |  6 +++---
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  4 ++--
 pom.xml                 | 10 +++++-----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 smccSTALExt/pom.xml     |  4 ++--
 utils/pom.xml           |  4 ++--
 21 files changed, 93 insertions(+), 93 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index aaeb5907..199f8128 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.10</version>
+  <version>1.2.11-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -118,27 +118,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 05493cb1..122751c5 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.10</version>
+        <version>1.2.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.10</version>
+            <version>1.2.11-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.10</version>
+            <version>1.2.11-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.10</version>
+            <version>1.2.11-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.10</version>
+            <version>1.2.11-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.10</version>
+            <version>1.2.11-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.10</version>
+            <version>1.2.11-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 83a9e7d2..0c1af135 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
-  <version>1.2</version>
+  <version>1.3-SNAPSHOT</version>
   <name>BKU Certificates</name>
 
   <build>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 58a3b1f0..8d478954 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.10</version>
+        <version>1.2.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.10</version>
+            <version>1.2.11-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.10</version>
+            <version>1.2.11-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <!-- see BKUFonts.pom
diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml
index 7e7e58c6..80993800 100644
--- a/BKUFonts/pom.xml
+++ b/BKUFonts/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUFonts</artifactId>
-  <version>1.2</version>
+  <version>1.3-SNAPSHOT</version>
   <name>BKU Fonts</name>
   <description>
     This module is used in validator(s) and viewer and is a direct dependency of
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 2ddbbe54..0fd6db27 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.10</version>
+  <version>1.2.11-SNAPSHOT</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index c0345b5b..755feab8 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.2.10</version>
+  <version>1.2.11-SNAPSHOT</version>
   <name>BKU Help</name>
   <build>
     <resources>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 667d952f..179fb176 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.10</version>
+		<version>1.2.11-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.10</version>
+	<version>1.2.11-SNAPSHOT</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10/BKULocal</url>
+		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
+		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
+		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -72,42 +72,42 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.10</version>
+			<version>1.2.11-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.10</version>
+			<version>1.2.11-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.10</version>
+			<version>1.2.11-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.10</version>
+			<version>1.2.11-SNAPSHOT</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 574c9be8..c7dc5c58 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.10</version>
+  <version>1.2.11-SNAPSHOT</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -28,22 +28,22 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2</version>
+      <version>1.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -67,13 +67,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -117,13 +117,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <!--
@@ -143,9 +143,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10/BKUOnline</url>
+    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
+    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index b0f19e19..9d91ad52 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.10</version>
+		<version>1.2.11-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.10</version>
+	<version>1.2.11-SNAPSHOT</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.10</version>
+			<version>1.2.11-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -42,7 +42,7 @@
 	 <dependency>
 	  <groupId>at.gv.egiz</groupId>
 	  <artifactId>BKUFonts</artifactId>
-	  <version>1.2</version>
+	  <version>1.3-SNAPSHOT</version>
 	 </dependency>
 	</dependencies>
 </project>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index adc6aa15..bcc40ac5 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.10</version>
+  <version>1.2.11-SNAPSHOT</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
@@ -230,7 +230,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCertificates</artifactId>
-      <version>1.2</version>
+      <version>1.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
diff --git a/STAL/pom.xml b/STAL/pom.xml
index db8668a0..8e0c66d9 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.10</version>
+        <version>1.2.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index 0129b1ee..b3c5b1a2 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.10</version>
+  <version>1.2.11-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index b7a4779f..664b2d4e 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.10</version>
+        <version>1.2.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.10</version>
+            <version>1.2.11-SNAPSHOT</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index ac23030f..f03244eb 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.10</version>
+  <version>1.2.11-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.10</version>
+      <version>1.2.11-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index a1cc05a9..a8eeff98 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.10</version>
+		<version>1.2.11-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.10</version>
+	<version>1.2.11-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/pom.xml b/pom.xml
index ce79e8d3..e7453380 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.10</version>
+  <version>1.2.11-SNAPSHOT</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -48,9 +48,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.10</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -250,7 +250,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.10</version>
+        <version>1.2.11-SNAPSHOT</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index e0ed2e05..f3cfb60d 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.10</version>
+  <version>1.2.11-SNAPSHOT</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 0dea9300..6bb0ea28 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.10</version>
+        <version>1.2.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.10</version>
+            <version>1.2.11-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.10</version>
+            <version>1.2.11-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.10</version>
+            <version>1.2.11-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index 9280747c..f6d4ea50 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.10</version>
+    <version>1.2.11-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.10</version>
+  <version>1.2.11-SNAPSHOT</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index d3a1c8b7..1c3d33e8 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.10</version>
+		<version>1.2.11-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.10</version>
+	<version>1.2.11-SNAPSHOT</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3


From d592f2a95096d4f234a24564b794c712359756fb Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 19 Jan 2010 12:10:37 +0000
Subject: clear pin after use bugfix correction/backspace button pinpadPinGUI

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@581 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java   | 35 +++++++++++++++-------
 .../at/gv/egiz/smcc/reader/DefaultCardReader.java  | 19 ++++++++----
 2 files changed, 38 insertions(+), 16 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 3fc631c3..e005836c 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -41,6 +41,8 @@ import java.text.MessageFormat;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.swing.GroupLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -55,6 +57,8 @@ import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -93,7 +97,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
     protected JLabel switchFocusDummyLabel; 
     /** remember the pinfield to return to worker */
     protected JPasswordField pinField;
-    protected JPasswordField pinpadPINField;
+    protected Document pinpadPIN;
 
     protected int buttonSize;
     
@@ -600,9 +604,10 @@ public class BKUGUIImpl implements BKUGUIFacade {
         String pinName = getMessage(LABEL_PIN);
         pinLabel.setText(MessageFormat.format(pinName, new Object[]{pinSpec.getLocalizedName()}));
 
-        pinpadPINField = new JPasswordField();
+        JPasswordField pinpadPINField = new JPasswordField();
         pinpadPINField.setText("");
         pinpadPINField.setEnabled(false);
+        pinpadPIN = pinpadPINField.getDocument();
 
         JLabel pinsizeLabel = new JLabel();
         pinsizeLabel.setFont(pinsizeLabel.getFont().deriveFont(pinsizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, pinsizeLabel.getFont().getSize()-2));
@@ -850,9 +855,11 @@ public class BKUGUIImpl implements BKUGUIFacade {
   public void correctionButtonPressed() {
     log.debug("[" + Thread.currentThread().getName() + "] correction button pressed");
 
-    if (pinpadPINField != null) {
-      String maskedPIN = pinpadPINField.getText();
-      pinpadPINField.setText(maskedPIN.substring(0, maskedPIN.length() - 1));
+    if (pinpadPIN != null) {
+      try {
+        pinpadPIN.remove(0, 1);
+      } catch (BadLocationException ex) {
+      }
     }
   }
 
@@ -860,8 +867,11 @@ public class BKUGUIImpl implements BKUGUIFacade {
   public void allKeysCleared() {
     log.debug("[" + Thread.currentThread().getName() + "] all keys cleared");
 
-    if (pinpadPINField != null) {
-      pinpadPINField.setText("");
+    if (pinpadPIN != null) {
+      try {
+        pinpadPIN.remove(0, pinpadPIN.getLength());
+      } catch (BadLocationException ex) {
+      }
     }
   }
 
@@ -869,8 +879,11 @@ public class BKUGUIImpl implements BKUGUIFacade {
   public void validKeyPressed() {
     log.debug("[" + Thread.currentThread().getName() + "] valid key pressed");
 
-    if (pinpadPINField != null) {
-      pinpadPINField.setText(pinpadPINField.getText() + '*');
+    if (pinpadPIN != null) {
+      try {
+        pinpadPIN.insertString(0, "*", null);
+      } catch (BadLocationException ex) {
+      }
     }
   }
 
@@ -1265,8 +1278,8 @@ public class BKUGUIImpl implements BKUGUIFacade {
     @Override
     public char[] getPin() {
         if (pinField != null) {
-          char[] pin = pinField.getPassword();
-          pinField = null;
+          char[] pin = pinField.getPassword(); //returns a copy
+          pinField = null; //garbage collect original pin (make sure to clear char[] after use)
           return pin;
         }
         return null;
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/reader/DefaultCardReader.java b/smcc/src/main/java/at/gv/egiz/smcc/reader/DefaultCardReader.java
index 45ea7a5a..6bf4a7de 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/reader/DefaultCardReader.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/reader/DefaultCardReader.java
@@ -35,6 +35,7 @@ import at.gv.egiz.smcc.VerifyAPDUSpec;
 import at.gv.egiz.smcc.pin.gui.ModifyPINGUI;
 import at.gv.egiz.smcc.pin.gui.PINGUI;
 import at.gv.egiz.smcc.util.ISO7816Utils;
+import java.util.Arrays;
 
 /**
  *
@@ -61,7 +62,10 @@ public class DefaultCardReader implements CardReader {
         throws SignatureCardException, CardException, InterruptedException {
 
     log.debug("VERIFY");
-    return channel.transmit(ISO7816Utils.createVerifyAPDU(apduSpec, pinGUI.providePIN(pinSpec, retries)));
+    char[] pin = pinGUI.providePIN(pinSpec, retries);
+    ResponseAPDU response = channel.transmit(ISO7816Utils.createVerifyAPDU(apduSpec, pin));
+    Arrays.fill(pin, '0');
+    return response;
   }
 
   @Override
@@ -69,9 +73,12 @@ public class DefaultCardReader implements CardReader {
           ModifyPINGUI pinGUI, PINSpec pinSpec, int retries)
         throws SignatureCardException, CardException, InterruptedException {
     log.debug("MODIFY (CHANGE_REFERENCE_DATA)");
-    char[] oldPin = pinGUI.provideCurrentPIN(pinSpec, retries);
-    char[] newPin = pinGUI.provideNewPIN(pinSpec);
-    return channel.transmit(ISO7816Utils.createChangeReferenceDataAPDU(apduSpec, oldPin, newPin));
+    char[] oldPIN = pinGUI.provideCurrentPIN(pinSpec, retries);
+    char[] newPIN = pinGUI.provideNewPIN(pinSpec);
+    ResponseAPDU response = channel.transmit(ISO7816Utils.createChangeReferenceDataAPDU(apduSpec, oldPIN, newPIN));
+    Arrays.fill(oldPIN, '0');
+    Arrays.fill(newPIN, '0');
+    return response;
   }
 
   @Override
@@ -80,7 +87,9 @@ public class DefaultCardReader implements CardReader {
         throws SignatureCardException, CardException, InterruptedException {
     log.debug("MODIFY (NEW_REFERENCE_DATA)");
     char[] newPIN = pinGUI.provideNewPIN(pinSpec);
-    return channel.transmit(ISO7816Utils.createNewReferenceDataAPDU(apduSpec, newPIN));
+    ResponseAPDU response = channel.transmit(ISO7816Utils.createNewReferenceDataAPDU(apduSpec, newPIN));
+    Arrays.fill(newPIN, '0');
+    return response;
   }
 
   @Override
-- 
cgit v1.2.3


From b2d6b1c93152bf94d25e992815d97d2322941de6 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 19 Jan 2010 16:07:11 +0000
Subject: [maven-release-plugin]  copy for tag mocca-1.2.11

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/tags/mocca-1.2.11@587 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUApplet/pom.xml       | 14 +++++++-------
 BKUAppletExt/pom.xml    | 16 ++++++++--------
 BKUCertificates/pom.xml |  2 +-
 BKUCommonGUI/pom.xml    |  8 ++++----
 BKUFonts/pom.xml        |  4 ++--
 BKUGuiExt/pom.xml       |  8 ++++----
 BKUHelp/pom.xml         |  4 ++--
 BKULocal/pom.xml        | 26 +++++++++++++-------------
 BKUOnline/pom.xml       | 26 +++++++++++++-------------
 BKUViewer/pom.xml       |  8 ++++----
 BKUWebStart/pom.xml     |  4 ++--
 STAL/pom.xml            |  4 ++--
 STALExt/pom.xml         |  6 +++---
 STALService/pom.xml     |  6 +++---
 STALXService/pom.xml    |  8 ++++----
 bkucommon/pom.xml       |  4 ++--
 pom.xml                 | 10 +++++-----
 smcc/pom.xml            |  4 ++--
 smccSTAL/pom.xml        | 10 +++++-----
 smccSTALExt/pom.xml     |  4 ++--
 utils/pom.xml           |  4 ++--
 21 files changed, 90 insertions(+), 90 deletions(-)

(limited to 'BKUCommonGUI')

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 199f8128..35707336 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.2.11-SNAPSHOT</version>
+  <version>1.2.11</version>
   <build>
     <plugins>
       <plugin>
@@ -118,27 +118,27 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smcc</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
      <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUCommonGUI</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 1440fc76..64236425 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,44 +2,44 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUAppletExt</artifactId>
     <name>BKU Applet Extension</name>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALExt</artifactId>
-            <version>1.2.11-SNAPSHOT</version>
+            <version>1.2.11</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALXService</artifactId>
-            <version>1.2.11-SNAPSHOT</version>
+            <version>1.2.11</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTAL</artifactId>
-            <version>1.2.11-SNAPSHOT</version>
+            <version>1.2.11</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.2.11-SNAPSHOT</version>
+            <version>1.2.11</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUGuiExt</artifactId>
-            <version>1.2.11-SNAPSHOT</version>
+            <version>1.2.11</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smccSTALExt</artifactId>
-            <version>1.2.11-SNAPSHOT</version>
+            <version>1.2.11</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 56a4b69a..acd70cff 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 8d478954..b0ac6418 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,23 +2,23 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUCommonGUI</artifactId>
     <name>BKU GUI</name>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.11-SNAPSHOT</version>
+            <version>1.2.11</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.11-SNAPSHOT</version>
+            <version>1.2.11</version>
             <scope>compile</scope>
         </dependency>
         <!-- see BKUFonts.pom
diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml
index 80993800..4404ba52 100644
--- a/BKUFonts/pom.xml
+++ b/BKUFonts/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUFonts</artifactId>
-  <version>1.3-SNAPSHOT</version>
+  <version>1.3</version>
   <name>BKU Fonts</name>
   <description>
     This module is used in validator(s) and viewer and is a direct dependency of
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 0fd6db27..73e9df63 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,22 +3,22 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.2.11-SNAPSHOT</version>
+  <version>1.2.11</version>
   <name>BKU GUI Extension</name>
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTAL</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 755feab8..7122df96 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.2.11-SNAPSHOT</version>
+  <version>1.2.11</version>
   <name>BKU Help</name>
   <build>
     <resources>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index 179fb176..a04ea5ff 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.11-SNAPSHOT</version>
+		<version>1.2.11</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.2.11-SNAPSHOT</version>
+	<version>1.2.11</version>
 
 	<scm>
-		<developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
-		<connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
-		<url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+		<developerConnection>scm:svn:svn+ssh://clemenso@svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKULocal</developerConnection>
+		<connection>scm:svn:svn+ssh://clemenso@svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKULocal</connection>
+		<url>scm:svn:svn+ssh://clemenso@svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKULocal</url>
 	</scm>
   <build>
     <plugins>
@@ -72,42 +72,42 @@
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>STAL</artifactId>
-			<version>1.2.11-SNAPSHOT</version>
+			<version>1.2.11</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.11-SNAPSHOT</version>
+			<version>1.2.11</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smcc</artifactId>
-			<version>1.2.11-SNAPSHOT</version>
+			<version>1.2.11</version>
 		</dependency>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>smccSTAL</artifactId>
-			<version>1.2.11-SNAPSHOT</version>
+			<version>1.2.11</version>
 		</dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUGuiExt</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>smccSTALExt</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 9309c42a..d0d50f30 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>BKU Online</name>
-  <version>1.2.11-SNAPSHOT</version>
+  <version>1.2.11</version>
 
   <pluginRepositories>
     <pluginRepository>
@@ -28,12 +28,12 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUViewer</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
     <dependency>
       <artifactId>BKUCertificates</artifactId>
@@ -43,7 +43,7 @@
     <dependency>
       <artifactId>BKUHelp</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -67,13 +67,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALService</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STALXService</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -117,13 +117,13 @@
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUApplet</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
       <scope>provided</scope>
     </dependency>
     <!--
@@ -143,9 +143,9 @@
 
   </dependencies>
   <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+    <developerConnection>scm:svn:svn+ssh://clemenso@svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKUOnline</developerConnection>
+    <connection>scm:svn:svn+ssh://clemenso@svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKUOnline</connection>
+    <url>scm:svn:svn+ssh://clemenso@svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKUOnline</url>
   </scm>
   <build>
     <plugins>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 9d91ad52..fb9c8d40 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.11-SNAPSHOT</version>
+		<version>1.2.11</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.2.11-SNAPSHOT</version>
+	<version>1.2.11</version>
 	<description />
 	<dependencies>
 		<dependency>
 			<groupId>at.gv.egiz</groupId>
 			<artifactId>bkucommon</artifactId>
-			<version>1.2.11-SNAPSHOT</version>
+			<version>1.2.11</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -42,7 +42,7 @@
 	 <dependency>
 	  <groupId>at.gv.egiz</groupId>
 	  <artifactId>BKUFonts</artifactId>
-	  <version>1.3-SNAPSHOT</version>
+	  <version>1.3</version>
 	 </dependency>
 	</dependencies>
 </project>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 81b6c395..02e65f53 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUWebStart</artifactId>
   <packaging>jar</packaging>
   <name>BKU Web Start</name>
-  <version>1.2.11-SNAPSHOT</version>
+  <version>1.2.11</version>
   <url>http://mocca.egovlabs.gv.at/</url>
   <description>Bürgerkartenumgebung</description>
   
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 8e0c66d9..66d6567f 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STAL</artifactId>
     <name>STAL</name>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
     <dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index b3c5b1a2..bd5f9b46 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALExt</artifactId>
   <name>STAL Extension</name>
-  <version>1.2.11-SNAPSHOT</version>
+  <version>1.2.11</version>
   <description />
   <dependencies>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>STAL</artifactId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 664b2d4e..6c25bbe2 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
     <description />
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.11-SNAPSHOT</version>
+            <version>1.2.11</version>
         </dependency>
         <!--dependency>
         	<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index f03244eb..402f40c6 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>STALXService</artifactId>
   <name>STAL-X Service</name>
-  <version>1.2.11-SNAPSHOT</version>
+  <version>1.2.11</version>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <artifactId>STALService</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
     <dependency>
       <artifactId>STALExt</artifactId>
       <groupId>at.gv.egiz</groupId>
-      <version>1.2.11-SNAPSHOT</version>
+      <version>1.2.11</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index a8eeff98..2ac6c5fc 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.11-SNAPSHOT</version>
+		<version>1.2.11</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.2.11-SNAPSHOT</version>
+	<version>1.2.11</version>
 
 	<build>
 		<plugins>
diff --git a/pom.xml b/pom.xml
index e7453380..2af28943 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>bku</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.11-SNAPSHOT</version>
+  <version>1.2.11</version>
   <name>BKU</name>
   <url>http://bku.egiz.gv.at</url>
   <modules>
@@ -48,9 +48,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+    <connection>scm:svn:svn://clemenso@svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11</connection>
+    <developerConnection>scm:svn:svn+ssh://clemenso@svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11</developerConnection>
+    <url>svn://clemenso@svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
@@ -250,7 +250,7 @@
       <dependency>
         <groupId>at.gv.egiz</groupId>
         <artifactId>BKUWebStart</artifactId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.11</version>
         <type>zip</type>
       </dependency>
     </dependencies>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index f3cfb60d..1a2a8566 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.2.11-SNAPSHOT</version>
+  <version>1.2.11</version>
   <url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 6bb0ea28..1913c3e0 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.2.11-SNAPSHOT</version>
+        <version>1.2.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
 	  <build>
 	    <plugins>
 	      <plugin>
@@ -24,17 +24,17 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STAL</artifactId>
-            <version>1.2.11-SNAPSHOT</version>
+            <version>1.2.11</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>smcc</artifactId>
-            <version>1.2.11-SNAPSHOT</version>
+            <version>1.2.11</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUCommonGUI</artifactId>
-            <version>1.2.11-SNAPSHOT</version>
+            <version>1.2.11</version>
         </dependency>
         <dependency>
             <groupId>iaik</groupId>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index f6d4ea50..5e71d69d 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>bku</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.11-SNAPSHOT</version>
+    <version>1.2.11</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.2.11-SNAPSHOT</version>
+  <version>1.2.11</version>
   <name>smcc STAL Extension</name>
   <dependencies>
     <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 1c3d33e8..9c5e4fa0 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<artifactId>bku</artifactId>
 		<groupId>at.gv.egiz</groupId>
-		<version>1.2.11-SNAPSHOT</version>
+		<version>1.2.11</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>utils</artifactId>
 	<name>BKU Utils</name>
 	<packaging>jar</packaging>
-	<version>1.2.11-SNAPSHOT</version>
+	<version>1.2.11</version>
 	<url>http://bku.egiz.gv.at</url>
 	<build>
 		<plugins>
-- 
cgit v1.2.3