Updated component naming.
authorwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 15 Mar 2005 04:44:18 +0000 (04:44 +0000)
committerwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 15 Mar 2005 04:44:18 +0000 (04:44 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1298 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

src/edu/internet2/middleware/shibboleth/aa/arp/ArpEngine.java
src/edu/internet2/middleware/shibboleth/aa/arp/provider/FileSystemArpRepository.java
src/edu/internet2/middleware/shibboleth/common/ServiceProviderMapper.java
src/edu/internet2/middleware/shibboleth/idp/IdPConfig.java
src/edu/internet2/middleware/shibboleth/log/LoggingContextListener.java
src/edu/internet2/middleware/shibboleth/utils/ResolverTest.java
tests/edu/internet2/middleware/shibboleth/aa/arp/ArpTests.java

index de3e2da..095af28 100755 (executable)
@@ -113,7 +113,7 @@ public class ArpEngine {
                }
 
                NodeList itemElements =
-                       config.getElementsByTagNameNS(IdPConfig.originConfigNamespace, "ArpRepository");
+                       config.getElementsByTagNameNS(IdPConfig.configNameSpace, "ArpRepository");
 
                if (itemElements.getLength() > 1) {
                        log.warn(
@@ -152,13 +152,13 @@ public class ArpEngine {
                        placeHolder = docFactory.newDocumentBuilder().newDocument();
 
                        Element defRepository =
-                               placeHolder.createElementNS(IdPConfig.originConfigNamespace, "ArpRepository");
+                               placeHolder.createElementNS(IdPConfig.configNameSpace, "ArpRepository");
                        defRepository.setAttributeNS(
-                               IdPConfig.originConfigNamespace,
+                               IdPConfig.configNameSpace,
                                "implementation",
                                "edu.internet2.middleware.shibboleth.aa.arp.provider.FileSystemArpRepository");
 
-                       Element path = placeHolder.createElementNS(IdPConfig.originConfigNamespace, "Path");
+                       Element path = placeHolder.createElementNS(IdPConfig.configNameSpace, "Path");
                        Text text = placeHolder.createTextNode("/conf/arps/");
                        path.appendChild(text);
 
index bdf41b1..c1a2a61 100755 (executable)
@@ -82,7 +82,7 @@ public class FileSystemArpRepository extends BaseArpRepository implements ArpRep
        public FileSystemArpRepository(Element config) throws ArpRepositoryException {
                super(config);
 
-               NodeList itemElements = config.getElementsByTagNameNS(IdPConfig.originConfigNamespace, "Path");
+               NodeList itemElements = config.getElementsByTagNameNS(IdPConfig.configNameSpace, "Path");
 
                if (itemElements.getLength() > 1) {
                        log.warn(
index 142e7ed..68d99e1 100644 (file)
@@ -64,7 +64,7 @@ public class ServiceProviderMapper {
                this.credentials = credentials;
                this.nameMapper = nameMapper;
 
-               NodeList itemElements = rawConfig.getElementsByTagNameNS(IdPConfig.originConfigNamespace, "RelyingParty");
+               NodeList itemElements = rawConfig.getElementsByTagNameNS(IdPConfig.configNameSpace, "RelyingParty");
 
                for (int i = 0; i < itemElements.getLength(); i++) {
                        addRelyingParty((Element) itemElements.item(i));
@@ -274,7 +274,7 @@ public class ServiceProviderMapper {
 
                        // Load and verify the name format that the HS should use in
                        // assertions for this RelyingParty
-                       NodeList hsNameFormats = ((Element) partyConfig).getElementsByTagNameNS(IdPConfig.originConfigNamespace,
+                       NodeList hsNameFormats = ((Element) partyConfig).getElementsByTagNameNS(IdPConfig.configNameSpace,
                                        "HSNameFormat");
                        // If no specification. Make sure we have a default mapping
                        if (hsNameFormats.getLength() < 1) {
index e722e49..5df600f 100644 (file)
@@ -42,7 +42,7 @@ public class IdPConfig {
 
        private String defaultRelyingPartyName;
        private String providerId;
-       public static final String originConfigNamespace = "urn:mace:shibboleth:idp:config:1.0";
+       public static final String configNameSpace = "urn:mace:shibboleth:idp:config:1.0";
        private String resolverConfig = "/conf/resolver.xml";
        private boolean passThruErrors = false;
        private int maxThreads = 5;
index 417be6a..9dde6f3 100644 (file)
@@ -96,7 +96,7 @@ public class LoggingContextListener implements ServletContextListener {
 
        protected void loadConfiguration(Document originConfig) throws ShibbolethConfigurationException {
                NodeList itemElements = originConfig.getDocumentElement().getElementsByTagNameNS(
-                               IdPConfig.originConfigNamespace, "Logging");
+                               IdPConfig.configNameSpace, "Logging");
                Node errorLogNode = null;
                boolean encounteredLog4JConfig = false;
 
index 33a6e78..2dccecb 100644 (file)
@@ -226,7 +226,7 @@ public class ResolverTest
 
                                NodeList itemElements =
                                        originConfig.getDocumentElement().getElementsByTagNameNS(
-                                                       IdPConfig.originConfigNamespace,
+                                                       IdPConfig.configNameSpace,
                                                        "ReleasePolicyEngine");
 
                                if (itemElements.getLength() > 1) {
index 5ef8180..f10b959 100755 (executable)
@@ -134,9 +134,9 @@ public class ArpTests extends TestCase {
                        placeHolder = docFactory.newDocumentBuilder().newDocument();
 
                        memoryRepositoryElement =
-                               placeHolder.createElementNS(IdPConfig.originConfigNamespace, "ArpRepository");
+                               placeHolder.createElementNS(IdPConfig.configNameSpace, "ArpRepository");
                        memoryRepositoryElement.setAttributeNS(
-                               IdPConfig.originConfigNamespace,
+                               IdPConfig.configNameSpace,
                                "implementation",
                                "edu.internet2.middleware.shibboleth.aa.arp.provider.MemoryArpRepository");
                } catch (ParserConfigurationException e) {
@@ -410,9 +410,9 @@ public class ArpTests extends TestCase {
                        placeHolder = docFactory.newDocumentBuilder().newDocument();
 
                        Element repositoryElement =
-                               placeHolder.createElementNS(IdPConfig.originConfigNamespace, "ArpRepository");
+                               placeHolder.createElementNS(IdPConfig.configNameSpace, "ArpRepository");
                        repositoryElement.setAttributeNS(
-                               IdPConfig.originConfigNamespace,
+                               IdPConfig.configNameSpace,
                                "implementation",
                                "edu.internet2.middleware.shibboleth.aa.arp.provider.Foo");
 
@@ -488,14 +488,14 @@ public class ArpTests extends TestCase {
                        placeHolder = docFactory.newDocumentBuilder().newDocument();
 
                        Element repositoryElement =
-                               placeHolder.createElementNS(IdPConfig.originConfigNamespace, "ArpRepository");
+                               placeHolder.createElementNS(IdPConfig.configNameSpace, "ArpRepository");
                        repositoryElement.setAttributeNS(
-                               IdPConfig.originConfigNamespace,
+                               IdPConfig.configNameSpace,
                                "implementation",
                                "edu.internet2.middleware.shibboleth.aa.arp.provider.FileSystemArpRepository");
-                       repositoryElement.setAttributeNS(IdPConfig.originConfigNamespace, "arpTTL", "65535");
+                       repositoryElement.setAttributeNS(IdPConfig.configNameSpace, "arpTTL", "65535");
 
-                       Element path = placeHolder.createElementNS(IdPConfig.originConfigNamespace, "Path");
+                       Element path = placeHolder.createElementNS(IdPConfig.configNameSpace, "Path");
                        Text text = placeHolder.createTextNode(new File("data/").toURI().toString());
                        path.appendChild(text);