a lot of more OpenSAML3 refactoring staff

This version is also NOT stable!

1 files changed, 9 insertions, 9 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/message/InboundMessage.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/message/InboundMessage.java
index 002db86f..8a741b69 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/message/InboundMessage.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/message/InboundMessage.java
@@ -25,18 +25,18 @@ import java.io.Serializable;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 
-import org.opensaml.saml2.metadata.EntityDescriptor;
-import org.opensaml.saml2.metadata.provider.MetadataProviderException;
+import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
+import at.gv.egiz.eaaf.modules.pvp2.api.message.InboundMessageInterface;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvp2MetadataProvider;
+import at.gv.egiz.eaaf.modules.pvp2.exception.NoMetadataInformationException;
+import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2MetadataException;
+
+import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
-import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
-import at.gv.egiz.eaaf.modules.pvp2.api.message.InboundMessageInterface;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataProvider;
-import at.gv.egiz.eaaf.modules.pvp2.exception.NoMetadataInformationException;
-
 public class InboundMessage implements InboundMessageInterface, Serializable {
   private static final Logger log = LoggerFactory.getLogger(InboundMessage.class);
 
@@ -56,7 +56,7 @@ public class InboundMessage implements InboundMessageInterface, Serializable {
    * @return EntityDescriptor from metadata
    * @throws NoMetadataInformationException In case of an error
    */
-  public EntityDescriptor getEntityMetadata(final IPvpMetadataProvider metadataProvider)
+  public EntityDescriptor getEntityMetadata(final IPvp2MetadataProvider metadataProvider)
       throws NoMetadataInformationException {
     try {
       if (metadataProvider == null) {
@@ -65,7 +65,7 @@ public class InboundMessage implements InboundMessageInterface, Serializable {
 
       return metadataProvider.getEntityDescriptor(this.entityID);
 
-    } catch (final MetadataProviderException e) {
+    } catch (final Pvp2MetadataException e) {
       log.warn("No Metadata for EntitiyID " + entityID);
       throw new NoMetadataInformationException();
     }