diff options
author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2018-07-20 10:57:08 +0200 |
---|---|---|
committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2018-07-20 10:57:08 +0200 |
commit | 84a86ceddf89f4a1a04396a37742a892f09ffafb (patch) | |
tree | 8408d00bb975a6cf5cae551018ca93ea4bf2b1a8 /eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java | |
parent | 41ee559d1aafc2eab6f4f9a339ff8b6ca9970c18 (diff) | |
download | EAAF-Components-84a86ceddf89f4a1a04396a37742a892f09ffafb.tar.gz EAAF-Components-84a86ceddf89f4a1a04396a37742a892f09ffafb.tar.bz2 EAAF-Components-84a86ceddf89f4a1a04396a37742a892f09ffafb.zip |
some small modifications in attribute builder
update internal messages-codes
Diffstat (limited to 'eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java')
-rw-r--r-- | eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java index 994d66df..cedd8bad 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java +++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java @@ -49,14 +49,15 @@ public abstract class AbstractMetadataSignatureFilter implements MetadataFilter if (metadata instanceof EntitiesDescriptor) { EntitiesDescriptor entitiesDescriptor = (EntitiesDescriptor) metadata; if(entitiesDescriptor.getSignature() == null) { - throw new PVP2MetadataException("Root element of metadata file has to be signed", null); + throw new PVP2MetadataException("pvp2.26", + new Object[] {"Root element of metadata file has to be signed"}); } processEntitiesDescriptor(entitiesDescriptor); if (entitiesDescriptor.getEntityDescriptors().size() == 0) { - throw new PVP2MetadataException("No valid entity in metadata " - + entitiesDescriptor.getName() + ". Metadata is not loaded.", null); + throw new PVP2MetadataException("pvp2.26", + new Object[] {"No valid entity in metadata " + entitiesDescriptor.getName()}); } @@ -64,9 +65,9 @@ public abstract class AbstractMetadataSignatureFilter implements MetadataFilter EntityDescriptor entityDescriptor = (EntityDescriptor) metadata; processEntityDescriptorr(entityDescriptor); - } else { - throw new PVP2MetadataException("Invalid Metadata file Root element is no EntitiesDescriptor", null); - } + } else + throw new PVP2MetadataException("pvp2.26", + new Object[] {"Invalid Metadata file Root element is unknown"}); @@ -74,6 +75,7 @@ public abstract class AbstractMetadataSignatureFilter implements MetadataFilter } catch (EAAFException e) { log.warn("Metadata signature policy check FAILED.", e); throw new SignatureValidationException(e); + } } |