aboutsummaryrefslogtreecommitdiff
path: root/moaSig/common/src
diff options
context:
space:
mode:
authorAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2016-03-14 16:29:03 +0100
committerAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2016-03-14 16:29:03 +0100
commit84293bd12f63b59852026cab02035fc9ebee626a (patch)
tree6a118418f618af68f5d884e2eb7eac2fb660a136 /moaSig/common/src
parent7510ab5173001711ecb5d6c8834878e7cce63ff9 (diff)
downloadmoa-sig-84293bd12f63b59852026cab02035fc9ebee626a.tar.gz
moa-sig-84293bd12f63b59852026cab02035fc9ebee626a.tar.bz2
moa-sig-84293bd12f63b59852026cab02035fc9ebee626a.zip
A lot of moa sig stuff
Diffstat (limited to 'moaSig/common/src')
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LogMsg.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LogMsg.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/Logger.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LoggingContext.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LoggingContext.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LoggingContextManager.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LoggingContextManager.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Base64Utils.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/Base64Utils.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/BoolUtils.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/BoolUtils.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/CollectionUtils.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/CollectionUtils.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/Constants.java)15
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DOMUtils.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java)13
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DateTimeUtils.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/DateTimeUtils.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Empty.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/Empty.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/EntityResolverChain.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/EntityResolverChain.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/FileUtils.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/FileUtils.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/KeyStoreUtils.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/KeyStoreUtils.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOADefaultHandler.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOADefaultHandler.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOAEntityResolver.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOAEntityResolver.java)6
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOAErrorHandler.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOAErrorHandler.java)6
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOATimer.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOATimer.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MessageProvider.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/MessageProvider.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Messages.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/Messages.java)4
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MiscUtil.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java)6
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/NodeIteratorAdapter.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/NodeIteratorAdapter.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/NodeListAdapter.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/NodeListAdapter.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/OutputXML2File.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/OutputXML2File.java)4
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/ResourceBundleChain.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/ResourceBundleChain.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/SSLUtils.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/SSLUtils.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StreamEntityResolver.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/StreamEntityResolver.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StreamUtils.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/StreamUtils.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StringUtils.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/StringUtils.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/URLDecoder.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/URLDecoder.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/URLEncoder.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/URLEncoder.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/XPathException.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/XPathException.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/XPathUtils.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java)2
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/ex/EgovUtilException.java (renamed from moaSig/common/src/main/java/at/gv/egovernment/moa/util/ex/EgovUtilException.java)2
-rw-r--r--moaSig/common/src/test/java/test/at/gv/egovernment/moa/MOATestCase.java5
-rw-r--r--moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DOMUtilsTest.java5
-rw-r--r--moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java3
-rw-r--r--moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java3
-rw-r--r--moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java5
-rw-r--r--moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java5
-rw-r--r--moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java6
-rw-r--r--moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java3
-rw-r--r--moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XPathUtilsTest.java3
43 files changed, 77 insertions, 69 deletions
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LogMsg.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LogMsg.java
index 51667f0..9eb84fa 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LogMsg.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LogMsg.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.logging;
+package at.gv.egovernment.moaspss.logging;
/**
* A unified message type to log messages from inside the MOA subsystem.
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/Logger.java
index 7cb2e7d..532a8be 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/Logger.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.logging;
+package at.gv.egovernment.moaspss.logging;
import java.util.HashMap;
import java.util.Map;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LoggingContext.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LoggingContext.java
index db4b93a..0fb0e7d 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LoggingContext.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LoggingContext.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.logging;
+package at.gv.egovernment.moaspss.logging;
/**
* Encapsulates contextual information (i.e. per request information) for
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LoggingContextManager.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LoggingContextManager.java
index f0d7b4c..b4cd294 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/logging/LoggingContextManager.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/logging/LoggingContextManager.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.logging;
+package at.gv.egovernment.moaspss.logging;
/**
* Provides each thread with a single instance of <code>LoggingContext</code>.
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Base64Utils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Base64Utils.java
index 66bf503..25a19bc 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Base64Utils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Base64Utils.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/BoolUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/BoolUtils.java
index 492aca9..56eab08 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/BoolUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/BoolUtils.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
/**
* Utility class for parsing XML schema boolean values.
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/CollectionUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/CollectionUtils.java
index 8597e1e..01a80ea 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/CollectionUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/CollectionUtils.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.util.Iterator;
import java.util.List;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Constants.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java
index 5fc0d4d..45e7d8a 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.util.HashMap;
@@ -381,6 +381,16 @@ public interface Constants {
public static final String XENC_SCHEMA_LOCATION =
SCHEMA_ROOT + "xenc-schema.xsd";
+ /* Prefix used for the XML Encryption XML namespace */
+ public static final String SAML2_METADATA_PREFIX = "md";
+
+ /* Prefix used for the XML Encryption XML namespace */
+ public static final String SAML2_METADATA_URI = "urn:oasis:names:tc:SAML:2.0:metadata";
+
+ /* Local location of the XML Encryption XML schema definition. */
+ public static final String SAML2_METADATA_SCHEMA_LOCATION =
+ SCHEMA_ROOT + "saml-schema-metadata-2.0.xsd";
+
/**
* Contains all namespaces and local schema locations for XML schema
* definitions relevant for MOA. For use in validating XML parsers.
@@ -413,7 +423,8 @@ public interface Constants {
+ (SAML2P_NS_URI + " " + SAML2P_SCHEMA_LOCATION + " ")
+ (STORK_NS_URI + " " + STORK_SCHEMA_LOCATION + " ")
+ (STORKP_NS_URI + " " + STORKP_SCHEMA_LOCATION + " ")
- + (XENC_NS_URI + " " + XENC_SCHEMA_LOCATION);
+ + (XENC_NS_URI + " " + XENC_SCHEMA_LOCATION + " ")
+ + (SAML2_METADATA_URI + " " + SAML2_METADATA_SCHEMA_LOCATION);
/** URN prefix for bPK and wbPK. */
public static final String URN_PREFIX = "urn:publicid:gv.at";
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DOMUtils.java
index 2b816ed..c5550ad 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DOMUtils.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -68,7 +68,7 @@ import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moaspss.logging.Logger;
/**
* Various utility functions for handling XML DOM trees.
@@ -246,7 +246,10 @@ public class DOMUtils {
parser.setFeature(CREATE_ENTITY_REF_NODES_FEATURE, false);
parser.setFeature(EXTERNAL_GENERAL_ENTITIES_FEATURE, false);
parser.setFeature(EXTERNAL_PARAMETER_ENTITIES_FEATURE, false);
-
+
+ //fix XXE problem
+ //parser.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+
if (validating) {
if (externalSchemaLocations != null) {
parser.setProperty(
@@ -270,10 +273,11 @@ public class DOMUtils {
// parse the document and return it
// if debug is enabled: use copy of strem (baStream) else use orig stream
+
if(null != baStream)
parser.parse(new InputSource(baStream));
else
- parser.parse(new InputSource(inputStream));
+ parser.parse(new InputSource(inputStream));
} catch(SAXException e) {
if(true == Logger.isDebugEnabled() && null != buffer) {
String xmlContent = new String(buffer);
@@ -519,7 +523,6 @@ public class DOMUtils {
parser.setFeature(EXTERNAL_GENERAL_ENTITIES_FEATURE, false);
parser.setFeature(DISALLOW_DOCTYPE_FEATURE, true);
-
if (externalSchemaLocations != null) {
parser.setProperty(
EXTERNAL_SCHEMA_LOCATION_PROPERTY,
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/DateTimeUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DateTimeUtils.java
index a2e0965..c199c29 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/DateTimeUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DateTimeUtils.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.io.StringWriter;
import java.text.DateFormat;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Empty.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Empty.java
index 533b39b..9c678d4 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Empty.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Empty.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
/**
* @author <a href="mailto:thomas.knall@iaik.tugraz.at">Thomas Knall</a>
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/EntityResolverChain.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/EntityResolverChain.java
index 7213d03..487c6a4 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/EntityResolverChain.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/EntityResolverChain.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/FileUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/FileUtils.java
index a70d62e..309e01a 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/FileUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/FileUtils.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.io.BufferedInputStream;
import java.io.File;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/KeyStoreUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/KeyStoreUtils.java
index 3d28f4f..b4d7b02 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/KeyStoreUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/KeyStoreUtils.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import iaik.x509.X509Certificate;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOADefaultHandler.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOADefaultHandler.java
index 7a79bd9..3dde827 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOADefaultHandler.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOADefaultHandler.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.io.IOException;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOAEntityResolver.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOAEntityResolver.java
index 8f3ffd4..7f529ca 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOAEntityResolver.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOAEntityResolver.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.io.InputStream;
@@ -31,8 +31,8 @@ import org.apache.xerces.util.URI.MalformedURIException;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
/**
* An <code>EntityResolver</code> that looks up entities stored as
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOAErrorHandler.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOAErrorHandler.java
index 3769b26..1842d03 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOAErrorHandler.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOAErrorHandler.java
@@ -22,14 +22,14 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import org.apache.xml.utils.DefaultErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
/**
* An <code>ErrorHandler</code> that logs a message and throws a
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOATimer.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOATimer.java
index acc380d..8542b58 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MOATimer.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOATimer.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.util.Map;
import java.util.WeakHashMap;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MessageProvider.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MessageProvider.java
index 1623ff1..da97ea1 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MessageProvider.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MessageProvider.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.util.Locale;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Messages.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Messages.java
index 20de46b..6e324b7 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/Messages.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Messages.java
@@ -22,14 +22,14 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.text.MessageFormat;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.PropertyResourceBundle;
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moaspss.logging.Logger;
/**
* Provides access to the system messages resource used for exception handling
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MiscUtil.java
index 2a5e1b8..5510ac8 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MiscUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -41,8 +41,8 @@ import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.ex.EgovUtilException;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.ex.EgovUtilException;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/NodeIteratorAdapter.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/NodeIteratorAdapter.java
index fdc8232..998edb4 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/NodeIteratorAdapter.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/NodeIteratorAdapter.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.util.ListIterator;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/NodeListAdapter.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/NodeListAdapter.java
index e39cc02..d88ef4b 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/NodeListAdapter.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/NodeListAdapter.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.util.List;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/OutputXML2File.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/OutputXML2File.java
index e3f8f75..e4e6cc5 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/OutputXML2File.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/OutputXML2File.java
@@ -28,11 +28,11 @@
* @author rschamberger
* $ID$
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import org.w3c.dom.Element;
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moaspss.logging.Logger;
/**
* utility functions to write XML data to files
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/ResourceBundleChain.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/ResourceBundleChain.java
index 234ed89..1edad95 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/ResourceBundleChain.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/ResourceBundleChain.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/SSLUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/SSLUtils.java
index c2c67ec..5078f01 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/SSLUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/SSLUtils.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.io.IOException;
import java.io.InputStream;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/StreamEntityResolver.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StreamEntityResolver.java
index b3bc8ae..5d328cf 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/StreamEntityResolver.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StreamEntityResolver.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.io.IOException;
import java.io.InputStream;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/StreamUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StreamUtils.java
index e4ccd12..f3abe9c 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/StreamUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StreamUtils.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/StringUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StringUtils.java
index ad879d2..695be18 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/StringUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/StringUtils.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.util.StringTokenizer;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/URLDecoder.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/URLDecoder.java
index 66739a7..af71e2d 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/URLDecoder.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/URLDecoder.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/URLEncoder.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/URLEncoder.java
index e6df1fd..2aa7e22 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/URLEncoder.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/URLEncoder.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.io.ByteArrayInputStream;
import java.io.StringWriter;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/XPathException.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/XPathException.java
index 0d20752..cbf3e4e 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/XPathException.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/XPathException.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.io.PrintStream;
import java.io.PrintWriter;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/XPathUtils.java
index 89aeaf3..2604c20 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/XPathUtils.java
@@ -22,7 +22,7 @@
*/
-package at.gv.egovernment.moa.util;
+package at.gv.egovernment.moaspss.util;
import java.util.List;
import java.util.Map;
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/ex/EgovUtilException.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/ex/EgovUtilException.java
index 733a2a8..27169b4 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moa/util/ex/EgovUtilException.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/ex/EgovUtilException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package at.gv.egovernment.moa.util.ex;
+package at.gv.egovernment.moaspss.util.ex;
public class EgovUtilException extends Exception {
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/MOATestCase.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/MOATestCase.java
index 5d1c537..1754ead 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/MOATestCase.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/MOATestCase.java
@@ -34,11 +34,10 @@ import org.w3c.dom.Document;
import org.xml.sax.InputSource;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
import junit.framework.TestCase;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-
/**
* Base class for MOA test cases.
*
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DOMUtilsTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DOMUtilsTest.java
index 1a2b690..e62d896 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DOMUtilsTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DOMUtilsTest.java
@@ -30,11 +30,10 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import at.gv.egovernment.moaspss.util.Constants;
+import at.gv.egovernment.moaspss.util.DOMUtils;
import test.at.gv.egovernment.moa.*;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-
/**
* @author Patrick Peck
* @version $Id$
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java
index e3468b8..56f7578 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java
@@ -31,10 +31,9 @@ import java.util.Date;
import java.util.GregorianCalendar;
import java.util.TimeZone;
+import at.gv.egovernment.moaspss.util.DateTimeUtils;
import junit.framework.TestCase;
-import at.gv.egovernment.moa.util.DateTimeUtils;
-
/**
* @author Patrick Peck
* @version $Id$
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
index 2433eca..5e0c8fb 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
@@ -34,8 +34,7 @@ import java.security.Security;
import java.security.cert.X509Certificate;
import java.util.Enumeration;
-import at.gv.egovernment.moa.util.KeyStoreUtils;
-
+import at.gv.egovernment.moaspss.util.KeyStoreUtils;
import junit.framework.TestCase;
/**
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java
index 2b5094f..31a0591 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java
@@ -32,12 +32,13 @@ import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSocketFactory;
import junit.framework.TestCase;
-import at.gv.egovernment.moa.util.KeyStoreUtils;
-import at.gv.egovernment.moa.util.SSLUtils;
import com.sun.net.ssl.HostnameVerifier;
import com.sun.net.ssl.HttpsURLConnection;
+import at.gv.egovernment.moaspss.util.KeyStoreUtils;
+import at.gv.egovernment.moaspss.util.SSLUtils;
+
/**
* @author Paul Ivancsics
* @version $Id$
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java
index 2ded896..7513b51 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java
@@ -26,9 +26,8 @@ package test.at.gv.egovernment.moa.util;
import java.net.URLEncoder;
-import at.gv.egovernment.moa.util.FileUtils;
-import at.gv.egovernment.moa.util.URLDecoder;
-
+import at.gv.egovernment.moaspss.util.FileUtils;
+import at.gv.egovernment.moaspss.util.URLDecoder;
import junit.framework.TestCase;
/*
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java
index 5f72c8a..78c3c7c 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java
@@ -24,9 +24,9 @@
package test.at.gv.egovernment.moa.util;
-import at.gv.egovernment.moa.util.FileUtils;
-import at.gv.egovernment.moa.util.URLDecoder;
-import at.gv.egovernment.moa.util.URLEncoder;
+import at.gv.egovernment.moaspss.util.FileUtils;
+import at.gv.egovernment.moaspss.util.URLDecoder;
+import at.gv.egovernment.moaspss.util.URLEncoder;
import junit.framework.TestCase;
/*
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java
index dfe7a53..b471fe6 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java
@@ -35,10 +35,9 @@ import org.apache.xerces.xni.grammars.XMLGrammarDescription;
import org.apache.xerces.xni.parser.XMLInputSource;
import org.xml.sax.InputSource;
+import at.gv.egovernment.moaspss.util.Constants;
import test.at.gv.egovernment.moa.MOATestCase;
-import at.gv.egovernment.moa.util.Constants;
-
/**
* Experimentation with Xerces grammar caching.
diff --git a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XPathUtilsTest.java b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XPathUtilsTest.java
index 15e6a62..f2b216f 100644
--- a/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XPathUtilsTest.java
+++ b/moaSig/common/src/test/java/test/at/gv/egovernment/moa/util/XPathUtilsTest.java
@@ -26,10 +26,9 @@ package test.at.gv.egovernment.moa.util;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
+import at.gv.egovernment.moaspss.util.XPathUtils;
import test.at.gv.egovernment.moa.MOATestCase;
-import at.gv.egovernment.moa.util.XPathUtils;
-
/**
* @author Patrick Peck