From cb3c7d9dc04d77b20ff99bc6074f47db63f1cb7d Mon Sep 17 00:00:00 2001 From: mcentner Date: Tue, 9 Dec 2008 09:12:11 +0000 Subject: Added project STALExt. git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@237 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- STALExt/pom.xml | 20 +++++ STALExt/src/main/java/META-INF/MANIFEST.MF | 3 + .../at/gv/egiz/stal/ext/APDUScriptRequest.java | 72 +++++++++++++++++ .../at/gv/egiz/stal/ext/APDUScriptResponse.java | 91 ++++++++++++++++++++++ 4 files changed, 186 insertions(+) create mode 100644 STALExt/pom.xml create mode 100644 STALExt/src/main/java/META-INF/MANIFEST.MF create mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/APDUScriptRequest.java create mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/APDUScriptResponse.java (limited to 'STALExt') diff --git a/STALExt/pom.xml b/STALExt/pom.xml new file mode 100644 index 00000000..b62df5a2 --- /dev/null +++ b/STALExt/pom.xml @@ -0,0 +1,20 @@ + + + bku + at.gv.egiz + 1.0.2-SNAPSHOT + + 4.0.0 + at.gv.egiz + STALExt + STAL Extension + 1.0.2-SNAPSHOT + + + + at.gv.egiz + STAL + 1.0.2-SNAPSHOT + + + \ No newline at end of file diff --git a/STALExt/src/main/java/META-INF/MANIFEST.MF b/STALExt/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 00000000..5e949512 --- /dev/null +++ b/STALExt/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/APDUScriptRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/APDUScriptRequest.java new file mode 100644 index 00000000..8d738632 --- /dev/null +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/APDUScriptRequest.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.stal.ext; + +import java.util.List; + +import at.gv.egiz.stal.STALRequest;; + +public class APDUScriptRequest extends STALRequest { + + public static abstract class RequestScriptElement { + + } + + public static class Reset extends RequestScriptElement { + + } + + public static class Command extends RequestScriptElement { + + private int sequence; + + private byte[] commandAPDU; + + private byte[] expectedSW; + + public Command(int sequence, byte[] commandAPDU, byte[] expectedSW) { + this.sequence = sequence; + this.commandAPDU = commandAPDU; + this.expectedSW = expectedSW; + } + + public int getSequence() { + return sequence; + } + + public byte[] getCommandAPDU() { + return commandAPDU; + } + + public byte[] getExpectedSW() { + return expectedSW; + } + + } + + private List script; + + public APDUScriptRequest(List script) { + super(); + this.script = script; + } + + public List getScript() { + return script; + } + +} diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/APDUScriptResponse.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/APDUScriptResponse.java new file mode 100644 index 00000000..dd59f0bf --- /dev/null +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/APDUScriptResponse.java @@ -0,0 +1,91 @@ +/* +* 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 java.util.List; + +import at.gv.egiz.stal.STALResponse; + +public class APDUScriptResponse extends STALResponse { + + public static abstract class ResponseScriptElement { + + } + + public static class ATR extends ResponseScriptElement { + + private byte[] atr; + + public ATR(byte[] atr) { + this.atr = atr; + } + + public byte[] getAtr() { + return atr; + } + + } + + public static class Response extends ResponseScriptElement { + + public static final int RC_UNSPECIFIED = -1; + + private int sequence; + + private byte[] apdu; + + private byte[] sw; + + private int rc; + + public Response(int sequence, byte[] apdu, byte[] sw, int rc) { + this.sequence = sequence; + this.apdu = apdu; + this.sw = sw; + this.rc = rc; + } + + public int getSequence() { + return sequence; + } + + public byte[] getApdu() { + return apdu; + } + + public byte[] getSw() { + return sw; + } + + public int getRc() { + return rc; + } + + } + + private List script; + + public APDUScriptResponse(List script) { + super(); + this.script = script; + } + + public List getScript() { + return script; + } + +} -- cgit v1.2.3 From 3bd71fa980c1209975b8761bfc8f8dd8578e0801 Mon Sep 17 00:00:00 2001 From: clemenso Date: Tue, 20 Jan 2009 14:17:05 +0000 Subject: nothing git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@264 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- STALExt/src/main/java/at/gv/egiz/stal/ext/APDUScriptRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'STALExt') diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/APDUScriptRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/APDUScriptRequest.java index 8d738632..89e459ac 100644 --- a/STALExt/src/main/java/at/gv/egiz/stal/ext/APDUScriptRequest.java +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/APDUScriptRequest.java @@ -18,7 +18,7 @@ package at.gv.egiz.stal.ext; import java.util.List; -import at.gv.egiz.stal.STALRequest;; +import at.gv.egiz.stal.STALRequest; public class APDUScriptRequest extends STALRequest { -- cgit v1.2.3 From 4618f05e6a202ef2d502c78a4bd0dc13b9c0aea2 Mon Sep 17 00:00:00 2001 From: clemenso 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 'STALExt') 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz BKUApplet BKU Applet - 1.0.2-SNAPSHOT + 1.0.2 @@ -117,27 +117,27 @@ at.gv.egiz smcc - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz STAL - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz STALService - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz smccSTAL - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz BKUCommonGUI - 1.0.2-SNAPSHOT + 1.0.2 commons-logging 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz BKUCommonGUI BKU Common GUI - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz smcc - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz STAL - 1.0.2-SNAPSHOT + 1.0.2 compile 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz BKULocal war BKU Local - 1.0.2-SNAPSHOT + 1.0.1 - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKULocal @@ -56,22 +56,22 @@ at.gv.egiz STAL - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz bkucommon - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz smcc - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz smccSTAL - 1.0.2-SNAPSHOT + 1.0.2 org.springframework @@ -96,12 +96,12 @@ at.gv.egiz BKUApplet - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz BKUViewer - 1.0.2-SNAPSHOT + 1.0.2 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz.bku BKULocalApp BKU Local App - 1.0.2-SNAPSHOT + 1.0.1 @@ -76,13 +76,13 @@ at.gv.egiz BKULocal - 1.0.2-SNAPSHOT + 1.0.1 war utils at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 compile 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz BKUOnline war BKU Online - 1.0.2-SNAPSHOT + 1.0.2 @@ -24,12 +24,12 @@ at.gv.egiz bkucommon - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz BKUViewer - 1.0.2-SNAPSHOT + 1.0.2 commons-logging @@ -53,20 +53,20 @@ at.gv.egiz STALService - 1.0.2-SNAPSHOT + 1.0.2 compile at.gv.egiz BKUApplet - 1.0.2-SNAPSHOT + 1.0.2 provided at.gv.egiz STALService - 1.0.2-SNAPSHOT + 1.0.2 + 1.6 1.6 1.6 true @@ -86,8 +84,7 @@ + jaxws-maven-plugin org.codehaus.mojo @@ -109,8 +106,7 @@ + ${basedir}/src/main/assemblies/assembly-server.xml + 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz smcc smcc jar - 1.0.2-SNAPSHOT + 1.0.2 http://bku.egiz.gv.at 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz smccSTAL smcc STAL - 1.0.2-SNAPSHOT + 1.0.2 @@ -24,17 +24,17 @@ at.gv.egiz STAL - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz smcc - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz BKUCommonGUI - 1.0.2-SNAPSHOT + 1.0.2 iaik 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz utils BKU Utils jar - 1.0.2-SNAPSHOT + 1.0.2 http://bku.egiz.gv.at -- cgit v1.2.3 From ce598ba5142ff7673085dd90865f9323d69574be Mon Sep 17 00:00:00 2001 From: clemenso 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 'STALExt') 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 @@ bku at.gv.egiz - 1.0.2 + 1.0.2-SNAPSHOT 4.0.0 at.gv.egiz BKUApplet BKU Applet - 1.0.2 + 1.0.2-SNAPSHOT @@ -117,27 +117,27 @@ at.gv.egiz smcc - 1.0.2 + 1.0.2-SNAPSHOT at.gv.egiz STAL - 1.0.2 + 1.0.2-SNAPSHOT at.gv.egiz STALService - 1.0.2 + 1.0.2-SNAPSHOT at.gv.egiz smccSTAL - 1.0.2 + 1.0.2-SNAPSHOT at.gv.egiz BKUCommonGUI - 1.0.2 + 1.0.2-SNAPSHOT commons-logging 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 @@ bku at.gv.egiz - 1.0.2 + 1.0.2-SNAPSHOT 4.0.0 at.gv.egiz BKUCommonGUI BKU Common GUI - 1.0.2 + 1.0.2-SNAPSHOT at.gv.egiz smcc - 1.0.2 + 1.0.2-SNAPSHOT at.gv.egiz STAL - 1.0.2 + 1.0.2-SNAPSHOT compile 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 @@ bku at.gv.egiz - 1.0.2 + 1.0.2-SNAPSHOT 4.0.0 at.gv.egiz BKULocal war BKU Local - 1.0.1 + 1.0.2-SNAPSHOT - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKULocal - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKULocal - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/bku-1.0.2/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal @@ -56,22 +56,22 @@ at.gv.egiz STAL - 1.0.2 + 1.0.2-SNAPSHOT at.gv.egiz bkucommon - 1.0.2 + 1.0.2-SNAPSHOT at.gv.egiz smcc - 1.0.2 + 1.0.2-SNAPSHOT at.gv.egiz smccSTAL - 1.0.2 + 1.0.2-SNAPSHOT org.springframework @@ -96,12 +96,12 @@ at.gv.egiz BKUApplet - 1.0.2 + 1.0.2-SNAPSHOT at.gv.egiz BKUViewer - 1.0.2 + 1.0.2-SNAPSHOT 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 @@ bku at.gv.egiz - 1.0.2 + 1.0.2-SNAPSHOT 4.0.0 at.gv.egiz.bku BKULocalApp BKU Local App - 1.0.1 + 1.0.2-SNAPSHOT @@ -76,13 +76,13 @@ at.gv.egiz BKULocal - 1.0.1 + 1.0.2-SNAPSHOT war utils at.gv.egiz - 1.0.2 + 1.0.2-SNAPSHOT compile 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 @@ bku at.gv.egiz - 1.0.2 + 1.0.2-SNAPSHOT 4.0.0 at.gv.egiz BKUOnline war BKU Online - 1.0.2 + 1.0.2-SNAPSHOT @@ -24,12 +24,12 @@ at.gv.egiz bkucommon - 1.0.2 + 1.0.2-SNAPSHOT at.gv.egiz BKUViewer - 1.0.2 + 1.0.2-SNAPSHOT commons-logging @@ -53,20 +53,20 @@ at.gv.egiz STALService - 1.0.2 + 1.0.2-SNAPSHOT compile at.gv.egiz BKUApplet - 1.0.2 + 1.0.2-SNAPSHOT provided at.gv.egiz STALService - 1.0.2 + 1.0.2-SNAPSHOT + 1.6 1.6 1.6 true @@ -84,7 +86,8 @@ + jaxws-maven-plugin org.codehaus.mojo @@ -106,7 +109,8 @@ + ${basedir}/src/main/assemblies/assembly-server.xml + 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 @@ bku at.gv.egiz - 1.0.2 + 1.0.2-SNAPSHOT 4.0.0 at.gv.egiz smcc smcc jar - 1.0.2 + 1.0.2-SNAPSHOT http://bku.egiz.gv.at 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 @@ bku at.gv.egiz - 1.0.2 + 1.0.2-SNAPSHOT 4.0.0 at.gv.egiz smccSTAL smcc STAL - 1.0.2 + 1.0.2-SNAPSHOT @@ -24,17 +24,17 @@ at.gv.egiz STAL - 1.0.2 + 1.0.2-SNAPSHOT at.gv.egiz smcc - 1.0.2 + 1.0.2-SNAPSHOT at.gv.egiz BKUCommonGUI - 1.0.2 + 1.0.2-SNAPSHOT iaik 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 @@ bku at.gv.egiz - 1.0.2 + 1.0.2-SNAPSHOT 4.0.0 at.gv.egiz utils BKU Utils jar - 1.0.2 + 1.0.2-SNAPSHOT http://bku.egiz.gv.at -- cgit v1.2.3 From 3f673f19aa8c4aec3d40d98731de289cbb7e79c6 Mon Sep 17 00:00:00 2001 From: clemenso 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 'STALExt') 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz BKUApplet BKU Applet - 1.0.2-SNAPSHOT + 1.0.2 @@ -117,27 +117,27 @@ at.gv.egiz smcc - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz STAL - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz STALService - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz smccSTAL - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz BKUCommonGUI - 1.0.2-SNAPSHOT + 1.0.2 commons-logging 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz BKUCommonGUI BKU Common GUI - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz smcc - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz STAL - 1.0.2-SNAPSHOT + 1.0.2 compile 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz BKULocal war BKU Local - 1.0.2-SNAPSHOT + 1.0.1 - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal @@ -56,22 +56,22 @@ at.gv.egiz STAL - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz bkucommon - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz smcc - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz smccSTAL - 1.0.2-SNAPSHOT + 1.0.2 org.springframework @@ -96,12 +96,12 @@ at.gv.egiz BKUApplet - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz BKUViewer - 1.0.2-SNAPSHOT + 1.0.2 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz.bku BKULocalApp BKU Local App - 1.0.2-SNAPSHOT + 1.0.1 @@ -76,13 +76,13 @@ at.gv.egiz BKULocal - 1.0.2-SNAPSHOT + 1.0.1 war utils at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 compile 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz BKUOnline war BKU Online - 1.0.2-SNAPSHOT + 1.0.2 @@ -24,12 +24,12 @@ at.gv.egiz bkucommon - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz BKUViewer - 1.0.2-SNAPSHOT + 1.0.2 commons-logging @@ -53,20 +53,20 @@ at.gv.egiz STALService - 1.0.2-SNAPSHOT + 1.0.2 compile at.gv.egiz BKUApplet - 1.0.2-SNAPSHOT + 1.0.2 provided at.gv.egiz STALService - 1.0.2-SNAPSHOT + 1.0.2 + 1.6 1.6 1.6 true @@ -86,8 +84,7 @@ + jaxws-maven-plugin org.codehaus.mojo @@ -109,8 +106,7 @@ + ${basedir}/src/main/assemblies/assembly-server.xml + 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz smcc smcc jar - 1.0.2-SNAPSHOT + 1.0.2 http://bku.egiz.gv.at 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz smccSTAL smcc STAL - 1.0.2-SNAPSHOT + 1.0.2 @@ -24,17 +24,17 @@ at.gv.egiz STAL - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz smcc - 1.0.2-SNAPSHOT + 1.0.2 at.gv.egiz BKUCommonGUI - 1.0.2-SNAPSHOT + 1.0.2 iaik 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 @@ bku at.gv.egiz - 1.0.2-SNAPSHOT + 1.0.2 4.0.0 at.gv.egiz utils BKU Utils jar - 1.0.2-SNAPSHOT + 1.0.2 http://bku.egiz.gv.at -- cgit v1.2.3 From ce977ee25ede5535beaf72bd0555c0984d5741bf Mon Sep 17 00:00:00 2001 From: clemenso 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 'STALExt') 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 @@ bku at.gv.egiz - 1.0.2 + 1.0.3-SNAPSHOT 4.0.0 at.gv.egiz BKUApplet BKU Applet - 1.0.2 + 1.0.3-SNAPSHOT @@ -117,27 +117,27 @@ at.gv.egiz smcc - 1.0.2 + 1.0.3-SNAPSHOT at.gv.egiz STAL - 1.0.2 + 1.0.3-SNAPSHOT at.gv.egiz STALService - 1.0.2 + 1.0.3-SNAPSHOT at.gv.egiz smccSTAL - 1.0.2 + 1.0.3-SNAPSHOT at.gv.egiz BKUCommonGUI - 1.0.2 + 1.0.3-SNAPSHOT commons-logging 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 @@ bku at.gv.egiz - 1.0.2 + 1.0.3-SNAPSHOT 4.0.0 at.gv.egiz BKUCommonGUI BKU Common GUI - 1.0.2 + 1.0.3-SNAPSHOT at.gv.egiz smcc - 1.0.2 + 1.0.3-SNAPSHOT at.gv.egiz STAL - 1.0.2 + 1.0.3-SNAPSHOT compile 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 @@ bku at.gv.egiz - 1.0.2 + 1.0.3-SNAPSHOT 4.0.0 at.gv.egiz BKULocal war BKU Local - 1.0.1 + 1.0.3-SNAPSHOT - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.0.2/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal @@ -56,22 +56,22 @@ at.gv.egiz STAL - 1.0.2 + 1.0.3-SNAPSHOT at.gv.egiz bkucommon - 1.0.2 + 1.0.3-SNAPSHOT at.gv.egiz smcc - 1.0.2 + 1.0.3-SNAPSHOT at.gv.egiz smccSTAL - 1.0.2 + 1.0.3-SNAPSHOT org.springframework @@ -96,12 +96,12 @@ at.gv.egiz BKUApplet - 1.0.2 + 1.0.3-SNAPSHOT at.gv.egiz BKUViewer - 1.0.2 + 1.0.3-SNAPSHOT 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 @@ bku at.gv.egiz - 1.0.2 + 1.0.3-SNAPSHOT 4.0.0 at.gv.egiz.bku BKULocalApp BKU Local App - 1.0.1 + 1.0.3-SNAPSHOT @@ -76,13 +76,13 @@ at.gv.egiz BKULocal - 1.0.1 + 1.0.3-SNAPSHOT war utils at.gv.egiz - 1.0.2 + 1.0.3-SNAPSHOT compile 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 @@ bku at.gv.egiz - 1.0.2 + 1.0.3-SNAPSHOT 4.0.0 at.gv.egiz BKUOnline war BKU Online - 1.0.2 + 1.0.3-SNAPSHOT @@ -24,12 +24,12 @@ at.gv.egiz bkucommon - 1.0.2 + 1.0.3-SNAPSHOT at.gv.egiz BKUViewer - 1.0.2 + 1.0.3-SNAPSHOT commons-logging @@ -53,20 +53,20 @@ at.gv.egiz STALService - 1.0.2 + 1.0.3-SNAPSHOT compile at.gv.egiz BKUApplet - 1.0.2 + 1.0.3-SNAPSHOT provided at.gv.egiz STALService - 1.0.2 + 1.0.3-SNAPSHOT at.gv.egiz BKUApplet - 1.0.3-SNAPSHOT + 1.0.3 provided at.gv.egiz STALService - 1.0.3-SNAPSHOT + 1.0.3 at.gv.egiz BKUApplet - 1.0.3 + 1.0.4-SNAPSHOT provided at.gv.egiz STALService - 1.0.3 + 1.0.4-SNAPSHOT at.gv.egiz BKUApplet - 1.0.4-SNAPSHOT + 1.0.4 provided at.gv.egiz STALService - 1.0.4-SNAPSHOT + 1.0.4 at.gv.egiz BKUApplet - 1.0.4 + 1.0.5-SNAPSHOT provided at.gv.egiz STALService - 1.0.4 + 1.0.5-SNAPSHOT + META-INF\/ + + + + + copy_testapplet + + copy-dependencies + + + ${project.build.directory}/test-classes + at.gv.egiz,commons-logging,iaik + commons-logging,iaik_jce_me4se + true + @@ -80,30 +68,6 @@ true - - maven-dependency-plugin - - - copytestlibs - - copy - - - - - commons-logging - commons-logging - - - iaik - iaik_jce_me4se - - - ${project.build.directory}/test-libs - - - - @@ -132,9 +96,5 @@ BKUCommonGUI 1.0.5-SNAPSHOT - - commons-logging - commons-logging - \ No newline at end of file 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 6ac892ec..388f045f 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 @@ -22,7 +22,6 @@ import at.gv.egiz.stal.STALRequest; 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; @@ -31,13 +30,10 @@ 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 java.applet.AppletContext; import java.net.MalformedURLException; -import java.net.URL; import java.util.ArrayList; import java.util.List; import javax.xml.bind.JAXBElement; -import javax.xml.namespace.QName; import javax.xml.ws.WebServiceException; /** @@ -46,29 +42,19 @@ import javax.xml.ws.WebServiceException; */ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable { - protected AppletContext ctx; - protected AppletParameterProvider params; + protected BKUApplet applet; protected String sessionId; - protected STALPortType stalPort; + private ObjectFactory stalObjFactory = new ObjectFactory(); - private STALTranslator translator = new STALTranslator(); - public AppletBKUWorker(BKUGUIFacade gui, AppletContext ctx, - AppletParameterProvider paramProvider) { + public AppletBKUWorker(BKUApplet applet, BKUGUIFacade gui) { super(gui); - if (ctx == null) { - throw new NullPointerException("Applet context not provided"); - } - if (paramProvider == null) { - throw new NullPointerException("No applet parameters provided"); - } - this.ctx = ctx; - this.params = paramProvider; - - sessionId = params.getAppletParameter(BKUApplet.SESSION_ID); + this.applet = applet; + + sessionId = applet.getParameter(BKUApplet.SESSION_ID); if (sessionId == null) { sessionId = "TestSession"; - log.info("using dummy sessionId " + sessionId); + log.warn("using dummy sessionId " + sessionId); } } @@ -77,9 +63,11 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable { gui.showWelcomeDialog(); try { - stalPort = getSTALPort(); + STALPortType stalPort = applet.getSTALPort(); + STALTranslator stalTranslator = applet.getSTALTranslator(); - registerSignRequestHandler(stalPort, sessionId); + addRequestHandler(SignRequest.class, + new AppletHashDataDisplay(stalPort, sessionId)); GetNextRequestResponseType nextRequestResp = stalPort.connect(sessionId); @@ -111,7 +99,7 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable { List stalRequests = new ArrayList(); for (JAXBElement req : requests) { try { - stalRequests.add(translator.translate(req)); + stalRequests.add(stalTranslator.translate(req)); } catch (TranslationException ex) { log.error("Received unknown request from server STAL: " + ex.getMessage()); throw new RuntimeException(ex); @@ -123,7 +111,7 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable { List stalResponses = handleRequest(stalRequests); for (STALResponse stalResponse : stalResponses) { try { - responses.add(translator.translate(stalResponse)); + responses.add(stalTranslator.translate(stalResponse)); } catch (TranslationException ex) { log.error("Received unknown response from STAL: " + ex.getMessage()); throw new RuntimeException(ex); @@ -184,7 +172,7 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable { } } - sendRedirect(); + applet.sendRedirect(sessionId); } /** @@ -218,38 +206,4 @@ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable { log.error(e); } } - - protected void sendRedirect() { - try { - URL redirectURL = params.getURLParameter(BKUApplet.REDIRECT_URL, - sessionId); - String redirectTarget = params.getAppletParameter(BKUApplet.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) - } - } - - private STALPortType getSTALPort() throws MalformedURLException { - URL wsdlURL = params.getURLParameter(BKUApplet.WSDL_URL); - log.debug("STAL WSDL at " + wsdlURL); - QName endpointName = new QName(BKUApplet.STAL_WSDL_NS, - BKUApplet.STAL_SERVICE); - STALService stal = new STALService(wsdlURL, endpointName); - return stal.getSTALPort(); - } - - 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/AppletParameterProvider.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletParameterProvider.java deleted file mode 100644 index 42e2d6ff..00000000 --- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletParameterProvider.java +++ /dev/null @@ -1,57 +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.MalformedURLException; -import java.net.URL; - -/** - * - * @author Clemens Orthacker - */ -public interface AppletParameterProvider { - - /** - * Applet configuration parameters - * - * @param paramKey - * @return null if no parameter is provided for the given key - */ - String getAppletParameter(String paramKey); - - /** - * Get applet configuration parameter as (absolute) URL - * - * @param paramKey - * @return a URL - * @throws MalformedURLException if configured URL is invalid - * or no parameter is provided for the given key - */ - URL getURLParameter(String paramKey) throws MalformedURLException; - - /** - * Get applet configuration parameter as (absolute) URL - * - * @param paramKey - * @param sessionId adds the jsessionid to the URL - * @return a URL - * @throws MalformedURLException if configured URL is invalid - * or no parameter is provided for the given key - */ - URL getURLParameter(String paramKey, String sessionId) throws MalformedURLException; -} 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 5e60ed3e..d4b2018d 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,8 +16,10 @@ */ package at.gv.egiz.bku.online.applet; +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.stal.service.translator.STALTranslator; import java.net.MalformedURLException; import java.net.URL; import java.util.Locale; @@ -30,15 +32,18 @@ import org.apache.commons.logging.LogFactory; import at.gv.egiz.bku.gui.BKUGUIFacade; import at.gv.egiz.bku.gui.BKUGUIFactory; +import at.gv.egiz.stal.service.STALPortType; +import at.gv.egiz.stal.service.STALService; +import java.awt.Container; +import javax.xml.namespace.QName; /** * Note: all swing code is executed by the event dispatch thread (see * BKUGUIFacade) */ -public class BKUApplet extends JApplet implements AppletParameterProvider { +public class BKUApplet extends JApplet { private static Log log = LogFactory.getLog(BKUApplet.class); - /** * Applet parameter keys */ @@ -55,18 +60,15 @@ public class BKUApplet extends JApplet implements AppletParameterProvider { // 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 */ 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"; - /** * STAL */ @@ -81,17 +83,17 @@ public class BKUApplet extends JApplet implements AppletParameterProvider { public void init() { log.info("Welcome to MOCCA"); log.debug("Called init()"); - + HttpsURLConnection.setDefaultSSLSocketFactory(InternalSSLSocketFactory.getInstance()); - String locale = getAppletParameter(LOCALE); + String locale = getParameter(LOCALE); if (locale != null) { this.setLocale(new Locale(locale)); } - log.debug("setting locale to " + getLocale()); + log.debug("setting locale: " + getLocale()); BKUGUIFacade.Style guiStyle; - String guiStyleParam = getAppletParameter(GUI_STYLE); + String guiStyleParam = getParameter(GUI_STYLE); if ("advanced".equals(guiStyleParam)) { guiStyle = BKUGUIFacade.Style.advanced; } else if ("tiny".equals(guiStyleParam)) { @@ -99,30 +101,33 @@ public class BKUApplet extends JApplet implements AppletParameterProvider { } else { guiStyle = BKUGUIFacade.Style.simple; } - + log.debug("setting gui-style: " + guiStyle); + URL backgroundImgURL = null; try { - backgroundImgURL = getURLParameter(BACKGROUND_IMG); + 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"); } - + AbstractHelpListener helpListener = null; try { - URL helpURL = getURLParameter(HELP_URL); -// helpListener = new BrowserHelpListener(getAppletContext(), helpURL, getLocale()); - helpListener = new DefaultHelpListener(getAppletContext(), helpURL, getLocale()); + 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"); } - - BKUGUIFacade gui = BKUGUIFactory.createGUI(getContentPane(), - getLocale(), - guiStyle, - backgroundImgURL, + + BKUGUIFacade gui = createGUI(getContentPane(), getLocale(), + guiStyle, + backgroundImgURL, helpListener); - worker = new AppletBKUWorker(gui, getAppletContext(), this); + worker = new AppletBKUWorker(this, gui); } @Override @@ -145,15 +150,7 @@ public class BKUApplet extends JApplet implements AppletParameterProvider { log.debug("Called destroy()"); } - @Override - public String getAppletParameter(String paramKey) { - String param = getParameter(paramKey); - log.info("applet parameter: " + paramKey + ": " + param); - return param; - } - - @Override - public URL getURLParameter(String paramKey, String sessionId) throws MalformedURLException { + protected URL getURLParameter(String paramKey, String sessionId) throws MalformedURLException { String urlParam = getParameter(paramKey); if (urlParam != null) { URL codebase = getCodeBase(); @@ -173,15 +170,54 @@ public class BKUApplet extends JApplet implements AppletParameterProvider { } catch (MalformedURLException ex) { log.error("applet paremeter " + urlParam + " is not a valid URL: " + ex.getMessage()); throw ex; - } + } } else { log.error("applet paremeter " + urlParam + " not set"); throw new MalformedURLException(urlParam + " not set"); } } - - @Override - public URL getURLParameter(String paramKey) throws MalformedURLException { - return getURLParameter(paramKey, null); + + /** + * provides a means to for subclasses to inject a different GUI + */ + protected BKUGUIFacade createGUI(Container contentPane, + Locale locale, + Style guiStyle, + URL backgroundImgURL, + AbstractHelpListener helpListener) { + return BKUGUIFactory.createGUI(contentPane, + locale, + guiStyle, + backgroundImgURL, + helpListener); + } + + protected 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(); + } + + protected STALTranslator getSTALTranslator() { + return new STALTranslator(); + } + + protected void sendRedirect(String sessionId) { + try { + URL redirectURL = getURLParameter(REDIRECT_URL, sessionId); + String redirectTarget = getParameter(REDIRECT_TARGET); + if (redirectTarget == null) { + log.info("Done. Redirecting to " + redirectURL + " ..."); + getAppletContext().showDocument(redirectURL); + } else { + log.info("Done. Redirecting to " + redirectURL + " (target=" + redirectTarget + ") ..."); + getAppletContext().showDocument(redirectURL, redirectTarget); + } + } catch (MalformedURLException ex) { + log.warn("Failed to redirect: " + ex.getMessage(), ex); + // gui.showErrorDialog(errorMsg, okListener, actionCommand) + } } } diff --git a/BKUApplet/src/test/resources/appletTest.html b/BKUApplet/src/test/resources/appletTest.html index c8bd99d3..4a768f91 100644 --- a/BKUApplet/src/test/resources/appletTest.html +++ b/BKUApplet/src/test/resources/appletTest.html @@ -18,7 +18,7 @@ diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml index 0f5757b8..5fd142a2 100644 --- a/BKULocal/pom.xml +++ b/BKULocal/pom.xml @@ -9,7 +9,7 @@ BKULocal war BKU Local - 1.0.4-SNAPSHOT + 1.0.2-SNAPSHOT scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal 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 91d0aba0..61cc7c4c 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 @@ -22,7 +22,6 @@ 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.APDUScriptRequest; import java.util.List; import javax.swing.JDialog; diff --git a/BKULocalApp/pom.xml b/BKULocalApp/pom.xml index 52bc4e36..79a270d8 100644 --- a/BKULocalApp/pom.xml +++ b/BKULocalApp/pom.xml @@ -5,10 +5,10 @@ 1.0.5-SNAPSHOT 4.0.0 - at.gv.egiz.bku + at.gv.egiz BKULocalApp BKU Local App - 1.0.4-SNAPSHOT + 1.0.2-SNAPSHOT @@ -76,7 +76,7 @@ at.gv.egiz BKULocal - 1.0.4-SNAPSHOT + 1.0.2-SNAPSHOT war diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml index c82cfc1e..fc5f04fa 100644 --- a/BKUOnline/pom.xml +++ b/BKUOnline/pom.xml @@ -1,4 +1,4 @@ - + bku @@ -56,25 +56,20 @@ 1.0.5-SNAPSHOT compile - - - at.gv.egiz - BKUApplet - 1.0.5-SNAPSHOT - provided - - + at.gv.egiz STALService 1.0.5-SNAPSHOT - at.gv.egiz STALXService 1.0.2-SNAPSHOT - + @@ -102,10 +97,30 @@ com.sun.xml.stream 1.0.1 + + + at.gv.egiz + BKUApplet + 1.0.5-SNAPSHOT + provided + + + at.gv.egiz + BKUAppletExt + 1.0.2-SNAPSHOT + provided + + + iaik + iaik_jce_me4se + provided + + - - Tomcat60 - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline @@ -117,75 +132,31 @@ maven-dependency-plugin - copyapplet-dependencies + copy_applet copy-dependencies ${project.build.directory}/${project.build.finalName}/applet - - at.gv.egiz - BKUApplet - true + at.gv.egiz,commons-logging,iaik + BKUApplet,BKUAppletExt,commons-logging,iaik_jce_me4se true - - - - copyapplet - - copy - - - ${project.build.directory}/${project.build.finalName}/applet - - - commons-logging - commons-logging - - - iaik - iaik_jce_me4se - - + true - + maven-war-plugin 2.0.2 - - true - + true - - ${project.version}-r${buildNumber} - + ${project.version}-r${buildNumber} @@ -211,7 +182,7 @@ - jaxb-generate + jaxb-generate-stal @@ -245,4 +216,7 @@ - \ No newline at end of file + + Tomcat60 + + 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 d9be0981..c758bcee 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 @@ -133,6 +133,9 @@ public class BKURequestHandler extends SpringBKUServlet { .getFormData("appletHashDataDisplay"), charset); String localeFormParam = getStringFromStream(bindingProcessor .getFormData("locale"), charset); + String extension = getStringFromStream(bindingProcessor + .getFormData("appletExtension"), charset); + if (width != null) { try { log.trace("Found applet width parameter: " + width); 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 a617c61f..81b70b7c 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 @@ -19,19 +19,17 @@ package at.gv.egiz.stal.service.impl; import at.gv.egiz.stal.ErrorResponse; import at.gv.egiz.stal.HashDataInput; -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.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.stalx.service.translator.STALXTranslationHandler; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -71,10 +69,12 @@ public class STALRequestBrokerImpl implements STALRequestBroker { if (timeoutMillisec <= 0) timeoutMillisec = DEFAULT_TIMEOUT_MS; timeout = timeoutMillisec; -// translator.registerTranslationHandler(handler); requests = new ArrayList>(); responses = new ArrayList>(); hashDataInputs = new ArrayList(); + + // register handler for STAL-X + translator.registerTranslationHandler(new STALXTranslationHandler()); } /** 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 afeba9cb..a30c6bb2 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 @@ -18,6 +18,8 @@ package at.gv.egiz.stal.service.impl; //import at.buergerkarte.namespaces.cardchannel.service.CommandAPDUType; //import at.buergerkarte.namespaces.cardchannel.service.ScriptType; +import at.buergerkarte.namespaces.cardchannel.service.CommandAPDUType; +import at.buergerkarte.namespaces.cardchannel.service.ScriptType; import at.gv.egiz.bku.binding.BindingProcessor; import at.gv.egiz.bku.binding.BindingProcessorManager; import at.gv.egiz.bku.binding.Id; @@ -78,8 +80,10 @@ public class STALServiceImpl implements STALPortType { @Resource protected WebServiceContext wsContext; protected IdFactory idF = IdFactory.getInstance(); + /** JAXB ObjectFactories */ private at.gv.egiz.stal.service.types.ObjectFactory stalObjFactory = new at.gv.egiz.stal.service.types.ObjectFactory(); -// private at.buergerkarte.namespaces.cardchannel.service.ObjectFactory ccObjFactory = new at.buergerkarte.namespaces.cardchannel.service.ObjectFactory(); + /** don't confuse with at.buergerkarte.namespaces.cardchannel */ + private at.buergerkarte.namespaces.cardchannel.service.ObjectFactory ccObjFactory = new at.buergerkarte.namespaces.cardchannel.service.ObjectFactory(); @Override public GetNextRequestResponseType connect(String sessId) { @@ -331,12 +335,12 @@ public class STALServiceImpl implements STALPortType { if (responsesIn == null) { log.info("[TestSession] received CONNECT, return dummy requests "); -// ScriptType scriptT = ccObjFactory.createScriptType(); -// CommandAPDUType cmd = ccObjFactory.createCommandAPDUType(); -// cmd.setValue("TestSession CardChannelCMD 1234".getBytes()); -// scriptT.getResetOrCommandAPDUOrVerifyAPDU().add(cmd); -// reqs.add(ccObjFactory.createScript(scriptT)); - addDummyRequests(reqs); +// 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)); } 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(); diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java index 92559254..9caf950f 100644 --- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java +++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java @@ -47,11 +47,11 @@ public class STALXJAXBContextFactory implements JAXBContextFactory { } List classes = new ArrayList(); classes.addAll(classesToBind); -// Class ccOF = at.buergerkarte.namespaces.cardchannel.service.ObjectFactory.class; -// if (!classes.contains(ccOF)) { -// log.debug("adding " + ccOF + " to JAXBContext seed"); -// classes.add(ccOF); -// } + Class ccOF = at.buergerkarte.namespaces.cardchannel.service.ObjectFactory.class; + if (!classes.contains(ccOF)) { + log.debug("adding " + ccOF + " to JAXBContext seed"); + classes.add(ccOF); + } //TODO add typeReference? diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp index 3bf0ff40..ada48f22 100644 --- a/BKUOnline/src/main/webapp/applet.jsp +++ b/BKUOnline/src/main/webapp/applet.jsp @@ -39,6 +39,16 @@ String backgroundImg = (String) session.getAttribute("appletBackground"); String guiStyle = (String) session.getAttribute("appletGuiStyle"); String locale = (String) session.getAttribute("locale"); + + String appletClass, appletArchive; + //if (Boolean.parseBoolean((String) session.getAttribute("appletExtension"))) { + if ("activation".equals(guiStyle)) { + appletArchive = "BKUAppletExt.jar"; + appletClass = "at.gv.egiz.bku.online.applet.ext.BKUAppletExt.class"; + } else { + appletArchive = "BKUApplet.jar"; + appletClass = "at.gv.egiz.bku.online.applet.BKUApplet.class"; + } %>