summaryrefslogtreecommitdiff
path: root/BKULocal/src
diff options
context:
space:
mode:
Diffstat (limited to 'BKULocal/src')
-rw-r--r--BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java28
-rw-r--r--BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java (renamed from BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java)8
-rw-r--r--BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTAL.java40
-rw-r--r--BKULocal/src/main/webapp/WEB-INF/applicationContext.xml2
-rw-r--r--BKULocal/src/test/java/at/gv/egiz/bku/local/stal/TestSignRequest.java78
5 files changed, 71 insertions, 85 deletions
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<STALResponse> handleRequest(List<STALRequest> requestList) {
+ signatureCard = null;
+ List<STALResponse> 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/LocalSTALFactory.java
index 3ae739d9..c2548cd5 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/LocalSTALFactory.java
@@ -34,16 +34,16 @@ import java.net.URL;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-public class SMCCSTALFactory implements STALFactory {
+public class LocalSTALFactory implements STALFactory {
- protected static final Log log = LogFactory.getLog(SMCCSTALFactory.class);
+ protected static final Log log = LogFactory.getLog(LocalSTALFactory.class);
protected String helpURL;
protected Locale locale;
@Override
public STAL createSTAL() {
- SMCCSTAL stal;
+ LocalBKUWorker stal;
JDialog dialog = new JDialog();
if (locale != null) {
dialog.setLocale(locale);
@@ -64,7 +64,7 @@ public class SMCCSTALFactory implements STALFactory {
BKUGUIFacade.Style.advanced,
null,
helpListener);
- stal = new SMCCSTAL(new BKUGuiProxy(dialog, gui), dialog);
+ stal = new LocalBKUWorker(new BKUGuiProxy(dialog, gui), dialog);
dialog.setPreferredSize(new Dimension(400, 200));
dialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
dialog.setTitle("MOCCA");
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<STALResponse> handleRequest(List<STALRequest> requestList) {
- signatureCard = null;
- List<STALResponse> 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/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 @@
<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"
+ <bean id="STALFactory" class="at.gv.egiz.bku.local.stal.LocalSTALFactory"
scope="singleton">
<property name="helpURL" value="http://localhost:3495/help"/>
</bean>
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<STALRequest> reqList = new ArrayList<STALRequest>(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<STALRequest> reqList = new ArrayList<STALRequest>(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();
+ }
+ }
+
+}