From f928669b7f791f9077fb04cc9a90d1e01ac31344 Mon Sep 17 00:00:00 2001 From: clemenso Date: Fri, 28 Nov 2008 10:33:13 +0000 Subject: LocalBKUWorker git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@223 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../at/gv/egiz/bku/local/stal/LocalBKUWorker.java | 28 ++++++- .../gv/egiz/bku/local/stal/LocalSTALFactory.java | 97 ++++++++++++++++++++++ .../java/at/gv/egiz/bku/local/stal/SMCCSTAL.java | 40 --------- .../at/gv/egiz/bku/local/stal/SMCCSTALFactory.java | 97 ---------------------- .../src/main/webapp/WEB-INF/applicationContext.xml | 2 +- .../at/gv/egiz/bku/local/stal/TestSignRequest.java | 78 ++++++++--------- 6 files changed, 164 insertions(+), 178 deletions(-) create mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java delete mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTAL.java delete mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java 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 10fb3e60..57b159ad 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,6 +18,12 @@ 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.stal.QuitRequest; +import at.gv.egiz.stal.STALRequest; +import at.gv.egiz.stal.STALResponse; +import at.gv.egiz.stal.SignRequest; +import java.util.List; +import javax.swing.JDialog; /** * @@ -25,7 +31,27 @@ import at.gv.egiz.bku.smccstal.AbstractBKUWorker; */ public class LocalBKUWorker extends AbstractBKUWorker { - public LocalBKUWorker(BKUGUIFacade gui) { + private JDialog container; + + public LocalBKUWorker(BKUGUIFacade gui, JDialog container) { super(gui); + this.container = container; + addRequestHandler(SignRequest.class, new LocalSignRequestHandler()); + } + + @Override + public List handleRequest(List requestList) { + signatureCard = null; + List responses = super.handleRequest(requestList); + // container.setVisible(false); + return responses; + } + + @Override + public STALResponse handleRequest(STALRequest request) { + if (request instanceof QuitRequest) { + container.setVisible(false); + } + return null; } } 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 new file mode 100644 index 00000000..c2548cd5 --- /dev/null +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java @@ -0,0 +1,97 @@ +/* + * 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.stal; + +import java.awt.Dimension; +import java.awt.Toolkit; +import java.net.MalformedURLException; +import java.util.Locale; +import java.util.ResourceBundle; + +import javax.swing.JDialog; +import javax.swing.WindowConstants; + +import at.gv.egiz.bku.gui.BKUGUIFacade; +import at.gv.egiz.bku.gui.BKUGUIFactory; +import at.gv.egiz.bku.gui.DefaultHelpListener; +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 LocalSTALFactory implements STALFactory { + + protected static final Log log = LogFactory.getLog(LocalSTALFactory.class); + protected String helpURL; + protected Locale locale; + + @Override + public STAL createSTAL() { + + LocalBKUWorker stal; + JDialog dialog = new JDialog(); + if (locale != null) { + dialog.setLocale(locale); + } + DefaultHelpListener helpListener = null; + try { + if (helpURL != null) { +// 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"); + } + } catch (MalformedURLException ex) { + log.error("failed to configure help listener: " + ex.getMessage(), ex); + } + BKUGUIFacade gui = BKUGUIFactory.createGUI(dialog.getContentPane(), + dialog.getLocale(), + BKUGUIFacade.Style.advanced, + null, + helpListener); + stal = new LocalBKUWorker(new BKUGuiProxy(dialog, gui), dialog); + dialog.setPreferredSize(new Dimension(400, 200)); + dialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + dialog.setTitle("MOCCA"); + dialog.pack(); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + Dimension frameSize = dialog.getSize(); + if (frameSize.height > screenSize.height) { + frameSize.height = screenSize.height; + } + if (frameSize.width > screenSize.width) { + frameSize.width = screenSize.width; + } + dialog.setLocation((screenSize.width - frameSize.width) / 2, + (screenSize.height - frameSize.height) / 2); + return stal; + } + + @Override + 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/stal/SMCCSTAL.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTAL.java deleted file mode 100644 index 716050d6..00000000 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTAL.java +++ /dev/null @@ -1,40 +0,0 @@ -package at.gv.egiz.bku.local.stal; - -import java.util.List; - -import javax.swing.JDialog; - -import at.gv.egiz.bku.gui.BKUGUIFacade; -import at.gv.egiz.bku.smccstal.AbstractBKUWorker; -import at.gv.egiz.stal.QuitRequest; -import at.gv.egiz.stal.STALRequest; -import at.gv.egiz.stal.STALResponse; -import at.gv.egiz.stal.SignRequest; - -public class SMCCSTAL extends AbstractBKUWorker { - - private JDialog container; - - public SMCCSTAL(BKUGUIFacade gui, JDialog container) { - super(gui); - this.container = container; - addRequestHandler(SignRequest.class, new LocalSignRequestHandler()); - } - - @Override - public List handleRequest(List requestList) { - signatureCard = null; - List responses = super.handleRequest(requestList); - // container.setVisible(false); - return responses; - } - - @Override - public STALResponse handleRequest(STALRequest request) { - if (request instanceof QuitRequest) { - container.setVisible(false); - } - return null; - } - -} 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 deleted file mode 100644 index 3ae739d9..00000000 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java +++ /dev/null @@ -1,97 +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.local.stal; - -import java.awt.Dimension; -import java.awt.Toolkit; -import java.net.MalformedURLException; -import java.util.Locale; -import java.util.ResourceBundle; - -import javax.swing.JDialog; -import javax.swing.WindowConstants; - -import at.gv.egiz.bku.gui.BKUGUIFacade; -import at.gv.egiz.bku.gui.BKUGUIFactory; -import at.gv.egiz.bku.gui.DefaultHelpListener; -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 { - - protected static final Log log = LogFactory.getLog(SMCCSTALFactory.class); - protected String helpURL; - protected Locale locale; - - @Override - public STAL createSTAL() { - - SMCCSTAL stal; - JDialog dialog = new JDialog(); - if (locale != null) { - dialog.setLocale(locale); - } - DefaultHelpListener helpListener = null; - try { - if (helpURL != null) { -// 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"); - } - } catch (MalformedURLException ex) { - log.error("failed to configure help listener: " + ex.getMessage(), ex); - } - BKUGUIFacade gui = BKUGUIFactory.createGUI(dialog.getContentPane(), - dialog.getLocale(), - BKUGUIFacade.Style.advanced, - 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"); - dialog.pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - Dimension frameSize = dialog.getSize(); - if (frameSize.height > screenSize.height) { - frameSize.height = screenSize.height; - } - if (frameSize.width > screenSize.width) { - frameSize.width = screenSize.width; - } - dialog.setLocation((screenSize.width - frameSize.width) / 2, - (screenSize.height - frameSize.height) / 2); - return stal; - } - - @Override - 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/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml index 3191f82f..1d09aa7e 100644 --- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml +++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml @@ -18,7 +18,7 @@ - diff --git a/BKULocal/src/test/java/at/gv/egiz/bku/local/stal/TestSignRequest.java b/BKULocal/src/test/java/at/gv/egiz/bku/local/stal/TestSignRequest.java index 51e7ff7d..2108d2b3 100644 --- a/BKULocal/src/test/java/at/gv/egiz/bku/local/stal/TestSignRequest.java +++ b/BKULocal/src/test/java/at/gv/egiz/bku/local/stal/TestSignRequest.java @@ -14,42 +14,42 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package at.gv.egiz.bku.local.stal; - -import java.io.ByteArrayOutputStream; -import java.util.ArrayList; -import java.util.List; - -import org.junit.Ignore; - -import at.gv.egiz.bku.utils.StreamUtil; -import at.gv.egiz.smcc.SignatureCard; -import at.gv.egiz.stal.STALRequest; -import at.gv.egiz.stal.SignRequest; - -@Ignore -public class TestSignRequest { - - public void test() throws Exception { - ByteArrayOutputStream os = new ByteArrayOutputStream(); - StreamUtil.copyStream(getClass().getClassLoader().getResourceAsStream("at/gv/egiz/bku/local/stal/sigInfo.xml"), os); - byte[] signedInfo = os.toByteArray(); - SignRequest sr = new SignRequest(); - sr.setSignedInfo(signedInfo); - sr.setKeyIdentifier(SignatureCard.KeyboxName.SECURE_SIGNATURE_KEYPAIR.getKeyboxName()); - List reqList = new ArrayList(1); - reqList.add(sr); - System.out.println((new SMCCSTALFactory()).createSTAL().handleRequest(reqList)); - } - - public static void main(String[] args) { - TestSignRequest tsr = new TestSignRequest(); - try { - tsr.test(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - -} +package at.gv.egiz.bku.local.stal; + +import java.io.ByteArrayOutputStream; +import java.util.ArrayList; +import java.util.List; + +import org.junit.Ignore; + +import at.gv.egiz.bku.utils.StreamUtil; +import at.gv.egiz.smcc.SignatureCard; +import at.gv.egiz.stal.STALRequest; +import at.gv.egiz.stal.SignRequest; + +@Ignore +public class TestSignRequest { + + public void test() throws Exception { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + StreamUtil.copyStream(getClass().getClassLoader().getResourceAsStream("at/gv/egiz/bku/local/stal/sigInfo.xml"), os); + byte[] signedInfo = os.toByteArray(); + SignRequest sr = new SignRequest(); + sr.setSignedInfo(signedInfo); + sr.setKeyIdentifier(SignatureCard.KeyboxName.SECURE_SIGNATURE_KEYPAIR.getKeyboxName()); + List reqList = new ArrayList(1); + reqList.add(sr); + System.out.println((new LocalSTALFactory()).createSTAL().handleRequest(reqList)); + } + + public static void main(String[] args) { + TestSignRequest tsr = new TestSignRequest(); + try { + tsr.test(); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + +} -- cgit v1.2.3