Removed some old "origin" naming.

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

diff --git a/src/edu/internet2/middleware/shibboleth/aa/attrresolv/provider/PersistentIDAttributeDefinition.java b/src/edu/internet2/middleware/shibboleth/aa/attrresolv/provider/PersistentIDAttributeDefinition.java
index 36ec9b9..a4c2e3d 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/aa/attrresolv/provider/PersistentIDAttributeDefinition.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/attrresolv/provider/PersistentIDAttributeDefinition.java
@@ -130,7 +130,7 @@ public class PersistentIDAttributeDefinition extends BaseAttributeDefinition imp
                                if (usingDefaultSecret()) {
                                        log
                                                        .warn("You are running the PersistentIDAttributeDefinition PlugIn with the default secret key as a salt.  This is UNSAFE!  Please change "
-                                                                       + "this configuration and restart the origin.");
+                                                                       + "this configuration and restart the IdP.");
                                }
                                this.salt = secret.getEncoded();
 

diff --git a/src/edu/internet2/middleware/shibboleth/common/OriginConfig.java b/src/edu/internet2/middleware/shibboleth/common/IdPConfigLoader.java
similarity index 76%
rename from src/edu/internet2/middleware/shibboleth/common/OriginConfig.java
rename to src/edu/internet2/middleware/shibboleth/common/IdPConfigLoader.java
index 103ff44..18c7006 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/common/OriginConfig.java
+++ b/src/edu/internet2/middleware/shibboleth/common/IdPConfigLoader.java
@@ -39,23 +39,23 @@ import edu.internet2.middleware.shibboleth.xml.Parser;
  * @author Walter Hoehn
  * @author Noah Levitt
  */
-public class OriginConfig {
+public class IdPConfigLoader {
 
-       private static Logger   log                                     = Logger.getLogger(OriginConfig.class);
-       private static Document originConfig            = null;
-       private static String   originConfigFile        = null;
+       private static Logger   log                                     = Logger.getLogger(IdPConfigLoader.class);
+       private static Document idpConfig               = null;
+       private static String   idpConfigFile   = null;
 
        // never returns null
-       private static String getOriginConfigFile(ServletContext context) {
-               if (context.getInitParameter("OriginConfigFile") != null) {
-                       return context.getInitParameter("OriginConfigFile");
+       private static String getIdPConfigFile(ServletContext context) {
+               if (context.getInitParameter("IdpConfigFile") != null) {
+                       return context.getInitParameter("IdPConfigFile");
                } else {
-                       return "/conf/origin.xml";
+                       return "/conf/idp.xml";
                }
        }
 
        /**
-        * Loads the Origin Configuration file into a DOM tree.
+        * Loads the IdP Configuration file into a DOM tree.
         * 
         * @param configFileLocation
         *            URL of the configuration file
@@ -63,41 +63,41 @@ public class OriginConfig {
         * @throws ShibbolethConfigurationException
         *             if there was an error loading the file
         */
-       public static synchronized Document getOriginConfig(String configFileLocation)
+       public static synchronized Document getIdPConfig(String configFileLocation)
                        throws ShibbolethConfigurationException {
 
-               if (configFileLocation.equals(originConfigFile)) {
-                       return originConfig;
+               if (configFileLocation.equals(idpConfigFile)) {
+                       return idpConfig;
                        
-               } else if (originConfigFile == null) {
-                       originConfigFile = configFileLocation;
+               } else if (idpConfigFile == null) {
+                       idpConfigFile = configFileLocation;
                        
                } else {
-                       log.error("Previously read origin configuration from (" + originConfigFile + "), re-reading from ("
+                       log.error("Previously read IdP configuration from (" + idpConfigFile + "), re-reading from ("
                                        + configFileLocation + "). This probably indicates a bug in shibboleth.");
-                       originConfigFile = configFileLocation;
+                       idpConfigFile = configFileLocation;
                }
 
                try {
-                       originConfig = Parser.loadDom(configFileLocation, true);
+                       idpConfig = Parser.loadDom(configFileLocation, true);
                } catch (Exception e) {
                        log.error("Encountered an error while parsing Shibboleth Identity Provider configuration file: " + e);
                        throw new ShibbolethConfigurationException("Unable to parse IdP configuration file.");
                }
-               return originConfig;
+               return idpConfig;
        }
 
        /**
-        * Loads the Origin Configuration file into a DOM tree.
+        * Loads the IdP Configuration file into a DOM tree.
         * 
         * @param context
-        *            {@link ServletContext}from which to figure out the location of origin.xml
+        *            {@link ServletContext}from which to figure out the location of IdP
         * @return the DOM Document
         * @throws ShibbolethConfigurationException
         *             if there was an error loading the file
         */
-       public static Document getOriginConfig(ServletContext context) throws ShibbolethConfigurationException {
-               return getOriginConfig(getOriginConfigFile(context));
+       public static Document getIdPConfig(ServletContext context) throws ShibbolethConfigurationException {
+               return getIdPConfig(getIdPConfigFile(context));
 
        }
 }

diff --git a/src/edu/internet2/middleware/shibboleth/idp/IdPConfig.java b/src/edu/internet2/middleware/shibboleth/idp/IdPConfig.java
index c078abf..673d09f 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/IdPConfig.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/IdPConfig.java
@@ -54,7 +54,7 @@ public class IdPConfig {
 
        public IdPConfig(Element config) throws ShibbolethConfigurationException {
 
-               if (!config.getTagName().equals("IdPConfig") && !config.getTagName().equals("ShibbolethOriginConfig")) { throw new ShibbolethConfigurationException(
+               if (!config.getTagName().equals("IdPConfig")) { throw new ShibbolethConfigurationException(
                                "Unexpected configuration data.  <IdPConfig/> is needed."); }
 
                log.debug("Loading global configuration properties.");
@@ -178,4 +178,4 @@ public class IdPConfig {
 
                return AAUrl;
        }
-}
+}
\ No newline at end of file

diff --git a/src/edu/internet2/middleware/shibboleth/idp/IdPResponder.java b/src/edu/internet2/middleware/shibboleth/idp/IdPResponder.java
index b34edbe..49df477 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/IdPResponder.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/IdPResponder.java
@@ -61,7 +61,7 @@ import edu.internet2.middleware.shibboleth.common.Credentials;
 import edu.internet2.middleware.shibboleth.common.NameIdentifierMapping;
 import edu.internet2.middleware.shibboleth.common.NameIdentifierMappingException;
 import edu.internet2.middleware.shibboleth.common.NameMapper;
-import edu.internet2.middleware.shibboleth.common.OriginConfig;
+import edu.internet2.middleware.shibboleth.common.IdPConfigLoader;
 import edu.internet2.middleware.shibboleth.common.ServiceProviderMapper;
 import edu.internet2.middleware.shibboleth.common.ServiceProviderMapperException;
 import edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException;
@@ -98,7 +98,7 @@ public class IdPResponder extends HttpServlet {
                try {
                        binding = SAMLBindingFactory.getInstance(SAMLBinding.SOAP);
 
-                       Document originConfig = OriginConfig.getOriginConfig(this.getServletContext());
+                       Document originConfig = IdPConfigLoader.getIdPConfig(this.getServletContext());
 
                        // Load global configuration properties
                        configuration = new IdPConfig(originConfig.getDocumentElement());

diff --git a/src/edu/internet2/middleware/shibboleth/log/LoggingContextListener.java b/src/edu/internet2/middleware/shibboleth/log/LoggingContextListener.java
index 9a5b051..15d7070 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/log/LoggingContextListener.java
+++ b/src/edu/internet2/middleware/shibboleth/log/LoggingContextListener.java
@@ -47,7 +47,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import edu.internet2.middleware.shibboleth.common.OriginConfig;
+import edu.internet2.middleware.shibboleth.common.IdPConfigLoader;
 import edu.internet2.middleware.shibboleth.common.ShibResource;
 import edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException;
 import edu.internet2.middleware.shibboleth.idp.IdPConfig;
@@ -78,7 +78,7 @@ public class LoggingContextListener implements ServletContextListener {
                rootAppender.setLayout(new PatternLayout("%d{ISO8601} %-5p %-41X{serviceId} - %m%n"));
 
                try {
-                       Document originConfig = OriginConfig.getOriginConfig(sce.getServletContext());
+                       Document originConfig = IdPConfigLoader.getIdPConfig(sce.getServletContext());
                        loadConfiguration(originConfig);
                } catch (ShibbolethConfigurationException e) {
                        sce.getServletContext().log("Problem setting up logging.", e);

diff --git a/src/edu/internet2/middleware/shibboleth/utils/ResolverTest.java b/src/edu/internet2/middleware/shibboleth/utils/ResolverTest.java
index b15d5f2..33e3d28 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/utils/ResolverTest.java
+++ b/src/edu/internet2/middleware/shibboleth/utils/ResolverTest.java
@@ -77,7 +77,7 @@ import edu.internet2.middleware.shibboleth.aa.arp.ArpProcessingException;
 import edu.internet2.middleware.shibboleth.aa.attrresolv.AttributeResolver;
 import edu.internet2.middleware.shibboleth.aa.attrresolv.AttributeResolverException;
 import edu.internet2.middleware.shibboleth.common.LocalPrincipal;
-import edu.internet2.middleware.shibboleth.common.OriginConfig;
+import edu.internet2.middleware.shibboleth.common.IdPConfigLoader;
 import edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException;
 import edu.internet2.middleware.shibboleth.idp.IdPConfig;
 import edu.internet2.middleware.shibboleth.xml.Parser;
@@ -219,7 +219,7 @@ public class ResolverTest
        {
                if (originxml != null) {
                        try {
-                               Document originConfig = OriginConfig.getOriginConfig(originxml);
+                               Document originConfig = IdPConfigLoader.getIdPConfig(originxml);
                                IdPConfig configuration = new IdPConfig(originConfig.getDocumentElement());
 
                                resolver = new AttributeResolver(configuration);

diff --git a/webApplication/sample.jsp b/webApplication/sample.jsp
index 3664c73..55194e3 100644 (file)
--- a/webApplication/sample.jsp
+++ b/webApplication/sample.jsp
@@ -33,7 +33,7 @@ require valid-user
 </p>
 
 <p>Because of the "require valid-user" rule, any user from a trusted
-origin-site is allowed access, once they establish a session using
+Identity Provider is allowed access, once they establish a session using
 Shibboleth.</p>
 
 <p>Here are some pieces of information I can tell about you using