diff options
24 files changed, 125 insertions, 28 deletions
@@ -68,8 +68,8 @@ <configuration>
<finalName>moa</finalName>
<descriptors>
- <!-- <descriptor>id/assembly-auth.xml</descriptor>
- <descriptor>id/assembly-proxy.xml</descriptor>-->
+ <descriptor>id/assembly-auth.xml</descriptor>-->
+ <!-- <descriptor>id/assembly-proxy.xml</descriptor>-->
<descriptor>spss/assembly.xml</descriptor>
<!-- <descriptor>spss/assembly-lib.xml</descriptor>-->
</descriptors>
@@ -243,13 +243,14 @@ <dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_jce_full</artifactId>
- <version>4.0_MOA</version>
+ <!-- <version>4.0_MOA</version>-->
+ <version>5.101</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_moa</artifactId>
- <version>1.33.1</version>
+ <version>1.5</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar Binary files differnew file mode 100644 index 000000000..fd0457332 --- /dev/null +++ b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar diff --git a/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar.lastUpdated b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar.lastUpdated new file mode 100644 index 000000000..42ff556c7 --- /dev/null +++ b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar.lastUpdated @@ -0,0 +1,22 @@ +#NOTE: This is an internal implementation file, its format can be changed without prior notice. +#Wed May 15 13:18:02 CEST 2013 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\handbook\\clients\\api/../../../../../repository/.lastUpdated=1368616682476 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\idserverlib/../../../repository/.lastUpdated=1368616682207 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\common/../repository/.lastUpdated=1368616681300 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverlib/../../../repository/.lastUpdated=1368616681996 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverws/../../../repository/.lastUpdated=1368616682060 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverws/../../../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\auth/../../../repository/.lastUpdated=1368616682416 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\auth/../../../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\handbook\\clients\\webservice/../../../../../repository/.lastUpdated=1368616682584 +http\://repo.maven.apache.org/maven2/.lastUpdated=1368616681623 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverlib/../../../repository/.error= +http\://repo.maven.apache.org/maven2/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\tools/../../../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\proxy/../../../repository/.lastUpdated=1368616682294 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\tools/../../../repository/.lastUpdated=1368616681780 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\proxy/../../../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\idserverlib/../../../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\handbook\\clients\\api/../../../../../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\common/../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\handbook\\clients\\webservice/../../../../../repository/.error= diff --git a/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar.md5 b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar.md5 new file mode 100644 index 000000000..9c56fb171 --- /dev/null +++ b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar.md5 @@ -0,0 +1 @@ +af60ce7b632e2f9871e0a66caf61d6f5
\ No newline at end of file diff --git a/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar.sha1 b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar.sha1 new file mode 100644 index 000000000..9f9892687 --- /dev/null +++ b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar.sha1 @@ -0,0 +1 @@ +219988809f988c415491cecf007663c838cba88e
\ No newline at end of file diff --git a/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom new file mode 100644 index 000000000..7ca126e32 --- /dev/null +++ b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom @@ -0,0 +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"> + <modelVersion>4.0.0</modelVersion> + <groupId>iaik.prod</groupId> + <artifactId>iaik_jce_full</artifactId> + <version>5.101</version> + <description>POM was created from install:install-file</description> +</project> diff --git a/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom.lastUpdated b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom.lastUpdated new file mode 100644 index 000000000..65ee40f75 --- /dev/null +++ b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom.lastUpdated @@ -0,0 +1,12 @@ +#NOTE: This is an internal implementation file, its format can be changed without prior notice. +#Wed May 15 13:18:07 CEST 2013 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\common/../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverws/../../../repository/.error= +http\://repo.maven.apache.org/maven2/.lastUpdated=1368616681271 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\proxy/../../../repository/.lastUpdated=1368616685249 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverws/../../../repository/.lastUpdated=1368616687679 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\auth/../../../repository/.error= +http\://repo.maven.apache.org/maven2/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\common/../repository/.lastUpdated=1368616680663 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\proxy/../../../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\auth/../../../repository/.lastUpdated=1368616687203 diff --git a/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom.md5 b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom.md5 new file mode 100644 index 000000000..554ae2add --- /dev/null +++ b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom.md5 @@ -0,0 +1 @@ +85210f5905c1b5b256c49ef421135393
\ No newline at end of file diff --git a/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom.sha1 b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom.sha1 new file mode 100644 index 000000000..ba732463f --- /dev/null +++ b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom.sha1 @@ -0,0 +1 @@ +e40fc538b46ef614833d2cc38349b32e3ee691c3
\ No newline at end of file diff --git a/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar Binary files differnew file mode 100644 index 000000000..f6864c9c2 --- /dev/null +++ b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar diff --git a/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar.lastUpdated b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar.lastUpdated new file mode 100644 index 000000000..39508d157 --- /dev/null +++ b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar.lastUpdated @@ -0,0 +1,22 @@ +#NOTE: This is an internal implementation file, its format can be changed without prior notice. +#Wed May 15 13:18:18 CEST 2013 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\handbook\\clients\\api/../../../../../repository/.lastUpdated=1368616698028 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\idserverlib/../../../repository/.lastUpdated=1368616697758 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\common/../repository/.lastUpdated=1368616696933 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverlib/../../../repository/.lastUpdated=1368616697582 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverws/../../../repository/.lastUpdated=1368616697635 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverws/../../../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\auth/../../../repository/.lastUpdated=1368616697964 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\auth/../../../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\handbook\\clients\\webservice/../../../../../repository/.lastUpdated=1368616698288 +http\://repo.maven.apache.org/maven2/.lastUpdated=1368616697395 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverlib/../../../repository/.error= +http\://repo.maven.apache.org/maven2/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\tools/../../../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\proxy/../../../repository/.lastUpdated=1368616697883 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\tools/../../../repository/.lastUpdated=1368616697505 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\proxy/../../../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\idserverlib/../../../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\handbook\\clients\\api/../../../../../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\common/../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\handbook\\clients\\webservice/../../../../../repository/.error= diff --git a/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar.md5 b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar.md5 new file mode 100644 index 000000000..83d2687ab --- /dev/null +++ b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar.md5 @@ -0,0 +1 @@ +991b90b2e379270abd9a7fbeb7820ac8
\ No newline at end of file diff --git a/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar.sha1 b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar.sha1 new file mode 100644 index 000000000..e8fb9d47f --- /dev/null +++ b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar.sha1 @@ -0,0 +1 @@ +dc87fadbd50c9549f96b238830526bf470a89201
\ No newline at end of file diff --git a/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.pom b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.pom new file mode 100644 index 000000000..5661eeda3 --- /dev/null +++ b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.pom @@ -0,0 +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"> + <modelVersion>4.0.0</modelVersion> + <groupId>iaik.prod</groupId> + <artifactId>iaik_moa</artifactId> + <version>1.5</version> + <description>POM was created from install:install-file</description> +</project> diff --git a/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.pom.lastUpdated b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.pom.lastUpdated new file mode 100644 index 000000000..728b1a824 --- /dev/null +++ b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.pom.lastUpdated @@ -0,0 +1,12 @@ +#NOTE: This is an internal implementation file, its format can be changed without prior notice. +#Wed May 15 13:18:20 CEST 2013 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\common/../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverws/../../../repository/.error= +http\://repo.maven.apache.org/maven2/.lastUpdated=1368616696896 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\proxy/../../../repository/.lastUpdated=1368616698745 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverws/../../../repository/.lastUpdated=1368616700109 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\auth/../../../repository/.error= +http\://repo.maven.apache.org/maven2/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\common/../repository/.lastUpdated=1368616696561 +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\proxy/../../../repository/.error= +file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\auth/../../../repository/.lastUpdated=1368616699566 diff --git a/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.pom.md5 b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.pom.md5 new file mode 100644 index 000000000..5c3ab00ad --- /dev/null +++ b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.pom.md5 @@ -0,0 +1 @@ +21650af41d52222d315568a424266fb6
\ No newline at end of file diff --git a/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.pom.sha1 b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.pom.sha1 new file mode 100644 index 000000000..3435065de --- /dev/null +++ b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.pom.sha1 @@ -0,0 +1 @@ +b24c98f538e82790db37b83e784919b68f652a82
\ No newline at end of file diff --git a/repository/iaik/prod/iaik_moa/maven-metadata-MOA.xml b/repository/iaik/prod/iaik_moa/maven-metadata-MOA.xml index 6190bccb0..2f997cbd7 100644 --- a/repository/iaik/prod/iaik_moa/maven-metadata-MOA.xml +++ b/repository/iaik/prod/iaik_moa/maven-metadata-MOA.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?><metadata> <groupId>iaik.prod</groupId> <artifactId>iaik_moa</artifactId> - <version>1.32</version> + <version>1.5</version> <versioning> <versions> <version>1.23</version> @@ -10,7 +10,8 @@ <version>1.27</version> <version>1.28</version> <version>1.29</version> + <version>1.32</version> </versions> - <lastUpdated>20090810074128</lastUpdated> + <lastUpdated>20130516074128</lastUpdated> </versioning> </metadata>
\ No newline at end of file diff --git a/repository/iaik/prod/iaik_moa/maven-metadata-local.xml b/repository/iaik/prod/iaik_moa/maven-metadata-local.xml index 44703a321..b7745401c 100644 --- a/repository/iaik/prod/iaik_moa/maven-metadata-local.xml +++ b/repository/iaik/prod/iaik_moa/maven-metadata-local.xml @@ -2,11 +2,11 @@ <metadata> <groupId>iaik.prod</groupId> <artifactId>iaik_moa</artifactId> - <version>1.32</version> + <version>1.5</version> <versioning> <versions> - <version>1.32</version> + <version>1.5</version> </versions> - <lastUpdated>20100618102247</lastUpdated> + <lastUpdated>20130515102247</lastUpdated> </versioning> </metadata> diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java index 4fcc5daa9..2dcffa014 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java @@ -30,6 +30,7 @@ import iaik.pki.pathvalidation.ChainingModes; import iaik.pki.revocation.RevocationSourceTypes; import iaik.server.modules.xml.BlackListEntry; import iaik.server.modules.xml.ExternalReferenceChecker; +import iaik.server.modules.xml.WhiteListEntry; import iaik.utils.RFC2253NameParser; import iaik.utils.RFC2253NameParserException; @@ -525,19 +526,19 @@ public class ConfigurationPartsBuilder { String host = getElementValue(permitExtElem, CONF + "IP", null); String port = getElementValue(permitExtElem, CONF + "Port", null); - // TODO WhiteListeEntry -// WhiteListEntry entry =null; + // WhiteListeEntry + WhiteListEntry entry =null; if (port == null) { -// entry = new WhiteListEntry(host, -1); + entry = new WhiteListEntry(host, -1); info("config.49", new Object[]{host}); } else { -// entry = new WhiteListEntry(host, new Integer(port).intValue()); + entry = new WhiteListEntry(host, new Integer(port).intValue()); info("config.49", new Object[]{host + ":" + port}); } -// -// // add entry to iaik-moa whitelist -// whiteListIaikMoa.add(entry); + + // add entry to iaik-moa whitelist + whiteListIaikMoa.add(entry); String array[] = new String[2]; @@ -548,8 +549,8 @@ public class ConfigurationPartsBuilder { } - // TODO set whitelist for iaik-moa -// ExternalReferenceChecker.setWhitelist(whiteListIaikMoa); + // set whitelist for iaik-moa + ExternalReferenceChecker.setWhitelist(whiteListIaikMoa); if(whitelist.isEmpty()) // no whitelisted uris given diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java index c979d8407..00f96f205 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java @@ -24,8 +24,8 @@ package at.gv.egovernment.moa.spss.server.invoke; -import iaik.IAIKException; -import iaik.IAIKRuntimeException; +import iaik.server.modules.IAIKException; +import iaik.server.modules.IAIKRuntimeException; import iaik.server.modules.cmsverify.CMSSignatureVerificationModule; import iaik.server.modules.cmsverify.CMSSignatureVerificationModuleFactory; import iaik.server.modules.cmsverify.CMSSignatureVerificationProfile; diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java index 348cb84aa..1136ff2f8 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java @@ -24,8 +24,8 @@ package at.gv.egovernment.moa.spss.server.invoke; -import iaik.IAIKException; -import iaik.IAIKRuntimeException; +import iaik.server.modules.IAIKException; +import iaik.server.modules.IAIKRuntimeException; import java.lang.reflect.Constructor; import java.util.HashMap; @@ -51,8 +51,8 @@ public class IaikExceptionMapper { /** The exception mapping, as an array. */ private static final Object[][] MESSAGES = { - { iaik.IAIKException.class, "9900", MOASystemException.class }, - { iaik.IAIKRuntimeException.class, "9901", MOASystemException.class }, + { iaik.server.modules.IAIKException.class, "9900", MOASystemException.class }, + { iaik.server.modules.IAIKRuntimeException.class, "9901", MOASystemException.class }, { iaik.server.modules.xmlsign.XMLSignatureCreationException.class, "2220", MOAApplicationException.class }, { iaik.server.modules.xmlsign.XMLSignatureCreationRuntimeException.class, "2220", MOAApplicationException.class }, { iaik.server.modules.xmlsign.InvalidKeyException.class, "2221", MOAApplicationException.class }, diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java index 8bebff974..7debb7b3a 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java @@ -24,8 +24,8 @@ package at.gv.egovernment.moa.spss.server.invoke; -import iaik.IAIKException; -import iaik.IAIKRuntimeException; +import iaik.server.modules.IAIKException; +import iaik.server.modules.IAIKRuntimeException; import iaik.server.modules.xml.DataObject; import iaik.server.modules.xml.XMLDataObject; import iaik.server.modules.xml.XMLSignature; diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java index 8a5b6f5b7..f3ac72520 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java @@ -24,10 +24,10 @@ package at.gv.egovernment.moa.spss.server.invoke; -import iaik.IAIKException; -import iaik.IAIKRuntimeException; import iaik.ixsil.exceptions.URIException; import iaik.ixsil.util.URI; +import iaik.server.modules.IAIKException; +import iaik.server.modules.IAIKRuntimeException; import iaik.server.modules.xml.DataObject; import iaik.server.modules.xml.XMLDataObject; import iaik.server.modules.xml.XMLSignature; |