Changed the default and example audiences.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@604 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/conf/origin.properties b/src/conf/origin.properties
index 9613edf..6622f46 100755 (executable)
--- a/src/conf/origin.properties
+++ b/src/conf/origin.properties
@@ -113,7 +113,7 @@
 ##### Club Configuration #####
 
  # [Optional] URIs that define club policy, separated by commas (defaults to the InCommon pilot policy)
- #edu.internet2.middleware.shibboleth.audiences = urn:mace:incommon:pilot:2003, urn:example:com:exampleClub
+ #edu.internet2.middleware.shibboleth.audiences = urn:mace:incommon:pilot, urn:example:com:exampleClub
 
 
 

diff --git a/src/edu/internet2/middleware/shibboleth/aa/AAServlet.java b/src/edu/internet2/middleware/shibboleth/aa/AAServlet.java
index 9b5db38..3acf9d6 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aa/AAServlet.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/AAServlet.java
@@ -152,7 +152,7 @@ public class AAServlet extends HttpServlet {
                defaultProps.setProperty(
                        "edu.internet2.middleware.shibboleth.hs.provider.CryptoHandleRepository.keyStorePath",
                        "/conf/handle.jks");
-               defaultProps.setProperty("edu.internet2.middleware.shibboleth.audiences", "urn:mace:incommon:pilot:2003");
+               defaultProps.setProperty("edu.internet2.middleware.shibboleth.audiences", "urn:mace:incommon:pilot");
                defaultProps.setProperty("edu.internet2.middleware.shibboleth.aa.AAServlet.passThruErrors", "false");
 
                //Load from file

diff --git a/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java b/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
index 4e55b25..31309ed 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
+++ b/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
@@ -107,7 +107,7 @@ public class HandleServlet extends HttpServlet {
                defaultProps.setProperty(
                        "edu.internet2.middleware.shibboleth.hs.provider.CryptoHandleRepository.keyStorePath",
                        "/conf/handle.jks");
-               defaultProps.setProperty("edu.internet2.middleware.shibboleth.audiences", "urn:mace:incommon:pilot:2003");
+               defaultProps.setProperty("edu.internet2.middleware.shibboleth.audiences", "urn:mace:incommon:pilot");
                defaultProps.setProperty(
                        "edu.internet2.middleware.shibboleth.hs.HandleServlet.authMethod",
                        SAMLAuthenticationStatement.AuthenticationMethod_Unspecified);