Removed some old "origin" naming.
authorwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Fri, 6 May 2005 20:05:32 +0000 (20:05 +0000)
committerwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Fri, 6 May 2005 20:05:32 +0000 (20:05 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1452 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

src/edu/internet2/middleware/shibboleth/common/IdPConfigLoader.java
src/edu/internet2/middleware/shibboleth/common/XML.java
src/edu/internet2/middleware/shibboleth/common/provider/CryptoShibHandle.java

index 18c7006..cbd55f3 100644 (file)
@@ -34,7 +34,7 @@ import org.w3c.dom.Document;
 import edu.internet2.middleware.shibboleth.xml.Parser;
 
 /**
- * Constructs a DOM tree for the origin configuration XML file.
+ * Constructs a DOM tree for the IdP configuration XML file.
  * 
  * @author Walter Hoehn
  * @author Noah Levitt
index 5c85ff1..b5c3cd2 100755 (executable)
@@ -77,7 +77,7 @@ public class XML
     public final static String XMLENC_NS = "http://www.w3.org/2001/04/xmlenc#";
     
     public final static String MAIN_SHEMA_ID = "shibboleth-targetconfig-1.0.xsd";
-    public final static String ORIGIN_SHEMA_ID = "shibboleth-idpconfig-1.0.xsd";
+    public final static String IDP_SHEMA_ID = "shibboleth-idpconfig-1.0.xsd";
     
     public final static String XMLSIG_RETMETHOD_RAWX509    = "http://www.w3.org/2000/09/xmldsig#rawX509Certificate";
     public final static String XMLSIG_RETMETHOD_RAWX509CRL = "http://www.w3.org/2000/09/xmldsig-more#rawX509CRL";
index 720b794..6270c15 100644 (file)
@@ -117,7 +117,7 @@ public class CryptoShibHandle extends AQHNameIdentifierMapping implements NameId
                        if (usingDefaultSecret()) {
                                log.warn("You are running Crypto AQH Name Mapping with the "
                                                + "default secret key.  This is UNSAFE!  Please change "
-                                               + "this configuration and restart the origin.");
+                                               + "this configuration and restart the IdP.");
                        }
                } catch (StreamCorruptedException e) {
                        if (System.getProperty("java.version").startsWith("1.4.2")) {