1 files changed, 10 insertions, 7 deletions
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EaafRequestedAttributeMarshaller.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EaafRequestedAttributeMarshaller.java
index 749310f2..4acee141 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EaafRequestedAttributeMarshaller.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EaafRequestedAttributeMarshaller.java
@@ -23,14 +23,16 @@ import java.util.Map.Entry;
 
 import javax.xml.namespace.QName;
 
-import org.opensaml.common.impl.AbstractSAMLObjectMarshaller;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.io.MarshallingException;
-import org.opensaml.xml.util.XMLHelper;
+import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EaafRequestedAttribute;
+
+import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
+import org.opensaml.core.xml.io.MarshallingException;
+import org.opensaml.saml.common.AbstractSAMLObjectMarshaller;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 
-import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EaafRequestedAttribute;
+import net.shibboleth.utilities.java.support.xml.AttributeSupport;
 
 public class EaafRequestedAttributeMarshaller extends AbstractSAMLObjectMarshaller {
   @Override
@@ -60,10 +62,11 @@ public class EaafRequestedAttributeMarshaller extends AbstractSAMLObjectMarshall
 
     Attr attr;
     for (final Entry<QName, String> entry : requestedAttr.getUnknownAttributes().entrySet()) {
-      attr = XMLHelper.constructAttribute(domElement.getOwnerDocument(), entry.getKey());
+
+      attr = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), entry.getKey());
       attr.setValue(entry.getValue());
       domElement.setAttributeNodeNS(attr);
-      if (org.opensaml.xml.Configuration.isIDAttribute(entry.getKey())
+      if (XMLObjectProviderRegistrySupport.isIDAttribute(entry.getKey())
           || requestedAttr.getUnknownAttributes().isIDAttribute(entry.getKey())) {
         attr.getOwnerElement().setIdAttributeNode(attr, true);
       }