resolves SWAMIDOPS-6786

6 files changed, 154 insertions, 186 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index e23f8adb..9ead5066 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -93,9 +93,6 @@
   <xi:include href="swamid-1.0/kib.ki.se.xml"/>
   <xi:include href="swamid-1.0/beta.lobber.se.xml"/>
   <xi:include href="swamid-1.0/idp.his.se.xml"/>
-  <xi:include href="swamid-1.0/users.hv.se-shib1.xml"/>
-  <xi:include href="swamid-1.0/users.hv.se-saml2.xml"/>
-  <xi:include href="swamid-1.0/idp.hv.se.xml"/>
   <xi:include href="swamid-1.0/www07test.sub.su.se.xml"/>
   <xi:include href="swamid-1.0/sp.kau.se.xml"/>
   <xi:include href="swamid-1.0/fordrop.irt.kth.se.xml"/>
@@ -218,5 +215,6 @@
   <xi:include href="swamid-2.0/webinar.nordu.net.xml"/>
   <xi:include href="swamid-1.0/connect-stable.sunet.se.xml"/>
   <xi:include href="swamid-1.0/idp2.hv.se.xml"/>
+  <xi:include href="swamid-1.0/iidp3.hv.se.xml"/>
   <xi:include href="swamid-1.0/account.mdh.se.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-1.0/idp.hv.se.xml b/swamid-1.0/idp.hv.se.xml
deleted file mode 100644
index e74bff90..00000000
--- a/swamid-1.0/idp.hv.se.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hv.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan Väst (Test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University West (Test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Högskolan Väst</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVALtbgbiGePSQRiuJWkxZd8HtW/w1MA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDIuc2VydmVyLmh2LnNlMB4XDTEyMDkxNzE1
-NDI1OVoXDTMyMDkxNzE1NDI1OVowHzEdMBsGA1UEAxMUbHNhbWwwMi5zZXJ2ZXIu
-aHYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNVi8HZrhxc6Ej
-8IQ0THnFlT5aBJ2smTGUIVukL3oZAz97k4eiW8LASSspRiXVIdc4raqIQA8bpbQo
-+eNcFW7jXYsqoe0d3CLIu0ByQnx8Nz5jMoq5v9yTBLsibYQwOMBv86I1lBK2RPzf
-U/oXJm4K/zg2tP7g7H+7WRt2si3rpgt0IPl30JEPwtu1mh2Cj5Q1JXsO+tJCg2Ay
-8ZBsJnCiOvqb95qL38Fz3KirpR8XjDqlOeMpwqiyaGeaCclPxX3JvMrZwh6oiV8R
-6Gyy9vzHKc0+WXed9ibukYO7Fg6G27lhOWZtejz3GEEu1ntm36lFCeEKdxPDH6LK
-f7l6xfXJAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGxzYW1sMDIuc2VydmVyLmh2LnNl
-hitodHRwczovL2xzYW1sMDIuc2VydmVyLmh2LnNlL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQXuIOXHveFmjCrgcp7tH995VjgGzANBgkqhkiG9w0BAQUFAAOCAQEA
-wbGPDIuz3kj6u1sBks0JvYfvfByCc4DDL+iRofK469vInb9Bl3q3FZ98RJaTAZz4
-0YhDl8YdnmRFHzzxOH/aCv470M6Iv15NNU9Jud908GW6LrL0P9hlUa4lUWKYAXrF
-EfEyHbb3K/Um2NUfd9DeioF1UIJmoU3FFhUq5vdA9De9VrVurjuXsmqv1ralOHsM
-EJBpSa0a5oThsjhceaWEMzpFdNd6ZuCWiEggKFIASgOcKDLrwP+uA990vn3ZTZlT
-lpadkHfwrYu8XNz8XFVFFeh0gjH+cIQXhfrabp/HCgurMMkVCOOJckqxUKZqrPon
-T7zM8EYIoUGXGU9cqttxeA==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hv.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hv.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hv.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hv.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hv.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hv.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVALtbgbiGePSQRiuJWkxZd8HtW/w1MA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDIuc2VydmVyLmh2LnNlMB4XDTEyMDkxNzE1
-NDI1OVoXDTMyMDkxNzE1NDI1OVowHzEdMBsGA1UEAxMUbHNhbWwwMi5zZXJ2ZXIu
-aHYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNVi8HZrhxc6Ej
-8IQ0THnFlT5aBJ2smTGUIVukL3oZAz97k4eiW8LASSspRiXVIdc4raqIQA8bpbQo
-+eNcFW7jXYsqoe0d3CLIu0ByQnx8Nz5jMoq5v9yTBLsibYQwOMBv86I1lBK2RPzf
-U/oXJm4K/zg2tP7g7H+7WRt2si3rpgt0IPl30JEPwtu1mh2Cj5Q1JXsO+tJCg2Ay
-8ZBsJnCiOvqb95qL38Fz3KirpR8XjDqlOeMpwqiyaGeaCclPxX3JvMrZwh6oiV8R
-6Gyy9vzHKc0+WXed9ibukYO7Fg6G27lhOWZtejz3GEEu1ntm36lFCeEKdxPDH6LK
-f7l6xfXJAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGxzYW1sMDIuc2VydmVyLmh2LnNl
-hitodHRwczovL2xzYW1sMDIuc2VydmVyLmh2LnNlL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQXuIOXHveFmjCrgcp7tH995VjgGzANBgkqhkiG9w0BAQUFAAOCAQEA
-wbGPDIuz3kj6u1sBks0JvYfvfByCc4DDL+iRofK469vInb9Bl3q3FZ98RJaTAZz4
-0YhDl8YdnmRFHzzxOH/aCv470M6Iv15NNU9Jud908GW6LrL0P9hlUa4lUWKYAXrF
-EfEyHbb3K/Um2NUfd9DeioF1UIJmoU3FFhUq5vdA9De9VrVurjuXsmqv1ralOHsM
-EJBpSa0a5oThsjhceaWEMzpFdNd6ZuCWiEggKFIASgOcKDLrwP+uA990vn3ZTZlT
-lpadkHfwrYu8XNz8XFVFFeh0gjH+cIQXhfrabp/HCgurMMkVCOOJckqxUKZqrPon
-T7zM8EYIoUGXGU9cqttxeA==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hv.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hv.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="sv">Högskolan Väst (TEST)</OrganizationName>
-    <OrganizationName xml:lang="en">University West (TEST)</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan Väst (TEST)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University West (TEST)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Magnus</GivenName>
-    <SurName>Andersson</SurName>
-    <EmailAddress>Magnus.Andersson@hv.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/idp2.hv.se.xml b/swamid-1.0/idp2.hv.se.xml
index b8f0a4a0..2b2fed05 100644
--- a/swamid-1.0/idp2.hv.se.xml
+++ b/swamid-1.0/idp2.hv.se.xml
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp2.hv.se/idp/shibboleth">
-   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-        <Extensions>
-            <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
-        	<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-		<mdui:DisplayName xml:lang="en">University West (Test2)</mdui:DisplayName>
-		<mdui:DisplayName xml:lang="sv">Högskolan Väst (Test2)</mdui:DisplayName>
+	<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+	<Extensions>
+		<shibmd:Scope regexp="false">hv.se</shibmd:Scope>
+	<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+		<mdui:DisplayName xml:lang="en">University West</mdui:DisplayName>
+		<mdui:DisplayName xml:lang="sv">Högskolan Väst</mdui:DisplayName>
 		<mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
 		<mdui:Description xml:lang="sv">Identity Provider för Högskolan Väst</mdui:Description>
-		</mdui:UIInfo>
-        </Extensions>
+	</mdui:UIInfo>
+	<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+		<mdui:DomainHint>hv.se</mdui:DomainHint>
+		<mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
+	</mdui:DiscoHints>
+	</Extensions>
 
         <KeyDescriptor>
             <ds:KeyInfo>
@@ -97,21 +102,26 @@ aRQKNbVQdPN5ht6TrINjDQ==
         <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
         
     </AttributeAuthorityDescriptor>
-
-    <Organization>
-                <OrganizationName xml:lang="en">University West (TEST2)</OrganizationName>
-                <OrganizationName xml:lang="sv">Högskolan Väst (TEST2)</OrganizationName>
-                <OrganizationDisplayName xml:lang="en">University West (TEST2)</OrganizationDisplayName>
-                <OrganizationDisplayName xml:lang="sv">Högskolan Väst (TEST2)</OrganizationDisplayName>
+           <Organization>
+                <OrganizationName xml:lang="en">HV</OrganizationName>
+                <OrganizationName xml:lang="sv">HV</OrganizationName>
+                <OrganizationDisplayName xml:lang="en">University West</OrganizationDisplayName>
+                <OrganizationDisplayName xml:lang="sv">Högskolan Väst</OrganizationDisplayName>
                 <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
                 <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
         </Organization>
 
-        <ContactPerson contactType="technical">
+        <ContactPerson contactType="administrative">
+                <Company>Högskolan Väst</Company>
                 <GivenName>Magnus</GivenName>
                 <SurName>Andersson</SurName>
                 <EmailAddress>Magnus.Andersson@hv.se</EmailAddress>
         </ContactPerson>
-
+        <ContactPerson contactType="technical">
+                <Company>Högskolan Väst</Company>
+                <GivenName>Christian</GivenName>
+                <SurName>Jiresjö</SurName>
+                <EmailAddress>Christian.Jiresjo@hv.se</EmailAddress>
+        </ContactPerson>
     
 </EntityDescriptor>
diff --git a/swamid-1.0/iidp3.hv.se.xml b/swamid-1.0/iidp3.hv.se.xml
new file mode 100644
index 00000000..ac953ec2
--- /dev/null
+++ b/swamid-1.0/iidp3.hv.se.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp3.hv.se/idp/shibboleth">
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+	<Extensions>
+		<shibmd:Scope regexp="false">hv.se</shibmd:Scope>
+	<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+		<mdui:DisplayName xml:lang="en">University West (Test)</mdui:DisplayName>
+		<mdui:DisplayName xml:lang="sv">Högskolan Väst (Test)</mdui:DisplayName>
+		<mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
+		<mdui:Description xml:lang="sv">Identity Provider för Högskolan Väst</mdui:Description>
+	</mdui:UIInfo>
+	<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+		<mdui:DomainHint>hv.se</mdui:DomainHint>
+		<mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
+	</mdui:DiscoHints>
+	</Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAKTQIrf9LxcGt46niDqiM7jwkFfgMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDQuc2VydmVyLmh2LnNlMB4XDTEyMTEzMDEz
+MDU1MFoXDTMyMTEzMDEzMDU1MFowHzEdMBsGA1UEAxMUbHNhbWwwNC5zZXJ2ZXIu
+aHYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCclapvzUvFzlGy
+HHpmhLlLt2ZSwhKVkyuphRkz7MeF8jFrvN4QQ7/dQHt3c+HdEwycJ6DUgvstHthx
+gYek3Lp8fvoMjPN4RZXOg7VEZn6So8y+aRYTjx0vrLG4IlUZyGZlyw0M9SCl4zt0
+sOBNZZqK/K0qgPG5mYwnDKYM0HTUwVQqzqcIYS53wq0iRffeA+fRa0GQpBH4tNOb
+WjVkHw0HCaxHPI7rg5cnzBQVLr4MiLELYDcwdCyFxFP6qvYTeGVnGyIMN5ZkHFH5
+14bhD4k+3zjc0unztuAeBqrKuyRu0fqTA7naezG0sNw5TooxxMVQNchGf0ZpQiEE
+WJqb3pCLAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGxzYW1sMDQuc2VydmVyLmh2LnNl
+hitodHRwczovL2xzYW1sMDQuc2VydmVyLmh2LnNlL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRfZ73QSc/wylbnusEXXLOfPQvbgTANBgkqhkiG9w0BAQUFAAOCAQEA
+ErxZEN44gh21kexTLFIHHaPJ97rawkYE/lXGRxtzmyOamyTMt7C5gcFy9Vx4vHHR
+l/mtKWWwOjGwJDWSAiMIXmKehGMncLqXPeiPpaPx9Gmeh7T1o5ZqNTK608xvlxDV
+4TMbzNQKo9+B9zJFKso4Cusn+XefHkokKrYRuaX5ZQ5Lk2cvob46pl75aXA03w9D
+qIQd0+msnu09J5Ul9LG666tzcNXSJjJRKOWlSomwGi/oLgKkENGkPD+s8UZ/qoQv
+h45FsOw64riDT7QFrR9PvAvJhhpD7Q7NX+dZUQNnj0oyFZij3k6A36D5eENhf5HN
+skz1W+/eg2IbITbz88uIXA==
+
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.hv.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.hv.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+                                   
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.hv.se/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.hv.se/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.hv.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.hv.se/idp/profile/SAML2/Redirect/SSO"/>
+    </IDPSSODescriptor>
+
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAKTQIrf9LxcGt46niDqiM7jwkFfgMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDQuc2VydmVyLmh2LnNlMB4XDTEyMTEzMDEz
+MDU1MFoXDTMyMTEzMDEzMDU1MFowHzEdMBsGA1UEAxMUbHNhbWwwNC5zZXJ2ZXIu
+aHYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCclapvzUvFzlGy
+HHpmhLlLt2ZSwhKVkyuphRkz7MeF8jFrvN4QQ7/dQHt3c+HdEwycJ6DUgvstHthx
+gYek3Lp8fvoMjPN4RZXOg7VEZn6So8y+aRYTjx0vrLG4IlUZyGZlyw0M9SCl4zt0
+sOBNZZqK/K0qgPG5mYwnDKYM0HTUwVQqzqcIYS53wq0iRffeA+fRa0GQpBH4tNOb
+WjVkHw0HCaxHPI7rg5cnzBQVLr4MiLELYDcwdCyFxFP6qvYTeGVnGyIMN5ZkHFH5
+14bhD4k+3zjc0unztuAeBqrKuyRu0fqTA7naezG0sNw5TooxxMVQNchGf0ZpQiEE
+WJqb3pCLAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGxzYW1sMDQuc2VydmVyLmh2LnNl
+hitodHRwczovL2xzYW1sMDQuc2VydmVyLmh2LnNlL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRfZ73QSc/wylbnusEXXLOfPQvbgTANBgkqhkiG9w0BAQUFAAOCAQEA
+ErxZEN44gh21kexTLFIHHaPJ97rawkYE/lXGRxtzmyOamyTMt7C5gcFy9Vx4vHHR
+l/mtKWWwOjGwJDWSAiMIXmKehGMncLqXPeiPpaPx9Gmeh7T1o5ZqNTK608xvlxDV
+4TMbzNQKo9+B9zJFKso4Cusn+XefHkokKrYRuaX5ZQ5Lk2cvob46pl75aXA03w9D
+qIQd0+msnu09J5Ul9LG666tzcNXSJjJRKOWlSomwGi/oLgKkENGkPD+s8UZ/qoQv
+h45FsOw64riDT7QFrR9PvAvJhhpD7Q7NX+dZUQNnj0oyFZij3k6A36D5eENhf5HN
+skz1W+/eg2IbITbz88uIXA==
+
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.hv.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.hv.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+        
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+        
+    </AttributeAuthorityDescriptor>
+    <Organization>
+                <OrganizationName xml:lang="en">HV</OrganizationName>
+                <OrganizationName xml:lang="sv">HV</OrganizationName>
+                <OrganizationDisplayName xml:lang="en">University West (Test)</OrganizationDisplayName>
+                <OrganizationDisplayName xml:lang="sv">Högskolan Väst (Test)</OrganizationDisplayName>
+                <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
+                <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
+        </Organization>
+
+        <ContactPerson contactType="administrative">
+                <Company>Högskolan Väst</Company>
+                <GivenName>Magnus</GivenName>
+                <SurName>Andersson</SurName>
+                <EmailAddress>Magnus.Andersson@hv.se</EmailAddress>
+        </ContactPerson>
+        <ContactPerson contactType="technical">
+                <Company>Högskolan Väst</Company>
+                <GivenName>Christian</GivenName>
+                <SurName>Jiresjö</SurName>
+                <EmailAddress>Christian.Jiresjo@hv.se</EmailAddress>
+        </ContactPerson>
+    
+</EntityDescriptor>
diff --git a/swamid-1.0/users.hv.se-saml2.xml b/swamid-1.0/users.hv.se-saml2.xml
deleted file mode 100644
index 504f3b49..00000000
--- a/swamid-1.0/users.hv.se-saml2.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://users.hv.se/login/saml2/idp/metadata.php">
-  <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-       <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYDVQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xiZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2ZlaWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7nbK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2QarQ4/67OZfHd7R+POBXhophSMv1ZOo</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYDVQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xiZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2ZlaWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7nbK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2QarQ4/67OZfHd7R+POBXhophSMv1ZOo</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://users.hv.se/login/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://users.hv.se/login/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HV</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Högskolan Väst (SAML2)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Magnus</GivenName>
-    <SurName>Andersson</SurName>
-    <EmailAddress>Magnus.Andersson@hv.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/users.hv.se-shib1.xml b/swamid-1.0/users.hv.se-shib1.xml
deleted file mode 100644
index 3dcd02b9..00000000
--- a/swamid-1.0/users.hv.se-shib1.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://users.hv.se/login/shib13/idp/metadata.php">
-  <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-       <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYDVQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xiZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2ZlaWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7nbK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2QarQ4/67OZfHd7R+POBXhophSMv1ZOo</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYDVQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xiZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2ZlaWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7nbK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2QarQ4/67OZfHd7R+POBXhophSMv1ZOo</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://users.hv.se/login/shib13/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HV</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Högskolan Väst (SAML1)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Magnus</GivenName>
-    <SurName>Andersson</SurName>
-    <EmailAddress>Magnus.Andersson@hv.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>