Merge branch 'master' into frontchannel-slo v2.3.2-slo10
authorTamas Frank <sitya@niif.hu>
Mon, 25 Jul 2011 17:03:07 +0000 (19:03 +0200)
committerTamas Frank <sitya@niif.hu>
Mon, 25 Jul 2011 17:03:07 +0000 (19:03 +0200)
commit2fc4f99aef9f1dad5b3961414aad755ec1b7affe
tree11fe0bff9ea5b0bc57b7b2b106af6e183981a01f
parentc69d62209c10bf0569f4dbd3cfdeb0f4d8cf6a3c
parent3679065b69f4c89c69f7cb1eab19434c2cf2706b
Merge branch 'master' into frontchannel-slo

Conflicts:
pom.xml
src/installer/resources/conf-tmpl/handler.xml
src/installer/resources/conf-tmpl/relying-party.xml
src/installer/resources/metadata-tmpl/idp-metadata.xml
12 files changed:
pom.xml
src/installer/resources/conf-tmpl/handler.xml
src/installer/resources/conf-tmpl/relying-party.xml
src/installer/resources/metadata-tmpl/idp-metadata.xml
src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerNamespaceHandler.java
src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
src/main/java/edu/internet2/middleware/shibboleth/idp/session/ServiceInformation.java
src/main/java/edu/internet2/middleware/shibboleth/idp/session/impl/ServiceInformationImpl.java
src/main/java/edu/internet2/middleware/shibboleth/idp/session/impl/SessionManagerImpl.java
src/main/resources/schema/shibboleth-2.0-idp-profile-handler.xsd
src/main/webapp/WEB-INF/web.xml