1 files changed, 5 insertions, 5 deletions
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PvpMetadataBuilder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PvpMetadataBuilder.java
index 9645c2c8..42f69a57 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PvpMetadataBuilder.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PvpMetadataBuilder.java
@@ -36,13 +36,13 @@ import javax.xml.transform.stream.StreamResult;
 
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataBuilderConfiguration;
-import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EaafDefaultSaml2Bootstrap;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
 
 import org.apache.commons.httpclient.auth.CredentialsNotAvailableException;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
+import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.core.xml.io.Marshaller;
 import org.opensaml.core.xml.io.MarshallingException;
 import org.opensaml.saml.common.xml.SAMLConstants;
@@ -176,12 +176,11 @@ public class PvpMetadataBuilder {
       entitiesDescriptor.getEntityDescriptors().add(entityDescriptor);
 
       // load default PVP security configurations
-      EaafDefaultSaml2Bootstrap.initializeDefaultPvpConfiguration();
       entitiesDescriptor.setSignature(signature);
 
       // marshall document
       final Marshaller out =
-          org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(entitiesDescriptor);
+          XMLObjectProviderRegistrySupport.getMarshallerFactory().getMarshaller(entitiesDescriptor);
       out.marshall(entitiesDescriptor, document);
 
     } else {
@@ -192,7 +191,7 @@ public class PvpMetadataBuilder {
 
       // marshall document
       final Marshaller out =
-          org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(entityDescriptor);
+          XMLObjectProviderRegistrySupport.getMarshallerFactory().getMarshaller(entityDescriptor);
       out.marshall(entityDescriptor, document);
 
     }
@@ -335,7 +334,8 @@ public class PvpMetadataBuilder {
     attributeService.setIndex(0);
     attributeService.setIsDefault(true);
     final ServiceName serviceName = Saml2Utils.createSamlObject(ServiceName.class);
-    serviceName.setName(new LocalizedString("Default Service", "en"));
+    serviceName.setValue("Default Service");
+    serviceName.setXMLLang("en");
     attributeService.getNames().add(serviceName);
 
     if (reqSpAttr != null && reqSpAttr.size() > 0) {