From 12dc2dc9fd0e2c264353eafe752bd077dd3a39ea Mon Sep 17 00:00:00 2001 From: wbauer Date: Mon, 22 Sep 2008 07:37:16 +0000 Subject: Changed STALFactory to return always a new instance git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@54 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../gv/egiz/bku/local/conf/SpringConfigurator.java | 1 + .../at/gv/egiz/bku/local/stal/SMCCSTALFactory.java | 55 ++++++++++----------- .../local/conf/certs/CACerts/IAIKTest_RootCA.cer | Bin 0 -> 880 bytes .../certs/certStore/IAIKTest_IntermediateCA.cer | Bin 0 -> 982 bytes .../gv/egiz/bku/local/conf/defaultConf.properties | 4 +- 5 files changed, 29 insertions(+), 31 deletions(-) create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/CACerts/IAIKTest_RootCA.cer create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/IAIKTest_IntermediateCA.cer (limited to 'BKULocal/src') diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/conf/SpringConfigurator.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/conf/SpringConfigurator.java index 9326d904..43dbf745 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/conf/SpringConfigurator.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/conf/SpringConfigurator.java @@ -128,6 +128,7 @@ public class SpringConfigurator extends Configurator implements if ((proxy == null) || (proxy.equals(""))) { log.info("No proxy configured"); } else { + log.info("Setting proxy to: "+proxy+":"+portString); System.setProperty("proxyHost", proxy); System.setProperty("proxyPort", portString); } 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 f9a8bef5..c1a69bd8 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 @@ -33,43 +33,40 @@ import at.gv.egiz.stal.STALFactory; public class SMCCSTALFactory implements STALFactory { private Locale locale; - private SMCCSTAL stal; - private JDialog dialog; @Override public STAL createSTAL() { - if (stal == null) { - ResourceBundle resourceBundle; - if (locale != null) { - resourceBundle = ResourceBundle.getBundle( - BKUApplet.RESOURCE_BUNDLE_BASE, locale); - } else { - resourceBundle = ResourceBundle - .getBundle(BKUApplet.RESOURCE_BUNDLE_BASE); - } - dialog = new JDialog(); - BKUGUIFacade gui = BKUGUIFactory.createGUI(); - gui.init(dialog.getContentPane(), locale.toString()); - stal = new SMCCSTAL(new BKUGuiProxy(dialog, gui), dialog, resourceBundle); - dialog.setPreferredSize(new Dimension(400, 200)); - dialog.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); - 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); + SMCCSTAL stal; + JDialog dialog; + ResourceBundle resourceBundle; + if (locale != null) { + resourceBundle = ResourceBundle.getBundle(BKUApplet.RESOURCE_BUNDLE_BASE, + locale); + } else { + resourceBundle = ResourceBundle.getBundle(BKUApplet.RESOURCE_BUNDLE_BASE); } + dialog = new JDialog(); + BKUGUIFacade gui = BKUGUIFactory.createGUI(); + gui.init(dialog.getContentPane(), locale.toString()); + stal = new SMCCSTAL(new BKUGuiProxy(dialog, gui), dialog, resourceBundle); + dialog.setPreferredSize(new Dimension(400, 200)); + dialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + 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) { + public void setLocale(Locale locale) { this.locale = locale; } } diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/CACerts/IAIKTest_RootCA.cer b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/CACerts/IAIKTest_RootCA.cer new file mode 100644 index 00000000..38c2de58 Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/CACerts/IAIKTest_RootCA.cer differ diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/IAIKTest_IntermediateCA.cer b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/IAIKTest_IntermediateCA.cer new file mode 100644 index 00000000..c3363a92 Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/certs/certStore/IAIKTest_IntermediateCA.cer differ diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/defaultConf.properties b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/defaultConf.properties index 31f55ed0..6d59ec21 100644 --- a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/defaultConf.properties +++ b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/defaultConf.properties @@ -52,8 +52,8 @@ SSL.disableAllChecks=false ValidateHashDataInputs=true -#HTTPProxyHost=localhost -#HTTPProxyPort=8888 +HTTPProxyHost= +HTTPProxyPort= -- cgit v1.2.3