move PluggableConfigurationComponent from SP to Common

Remove references to XMLException

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

diff --git a/src/edu/internet2/middleware/shibboleth/aap/provider/XMLAAPProvider.java b/src/edu/internet2/middleware/shibboleth/aap/provider/XMLAAPProvider.java
index 529afc0..3ffae34 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/aap/provider/XMLAAPProvider.java
+++ b/src/edu/internet2/middleware/shibboleth/aap/provider/XMLAAPProvider.java
@@ -37,11 +37,11 @@ import org.w3c.dom.NodeList;
 import edu.internet2.middleware.shibboleth.aap.AAP;
 import edu.internet2.middleware.shibboleth.aap.AttributeRule;
 import edu.internet2.middleware.shibboleth.common.Constants;
+import edu.internet2.middleware.shibboleth.common.PluggableConfigurationComponent;
 import edu.internet2.middleware.shibboleth.metadata.EntitiesDescriptor;
 import edu.internet2.middleware.shibboleth.metadata.RoleDescriptor;
 import edu.internet2.middleware.shibboleth.metadata.ScopedRoleDescriptor;
 import edu.internet2.middleware.shibboleth.metadata.ScopedRoleDescriptor.Scope;
-import edu.internet2.middleware.shibboleth.serviceprovider.PluggableConfigurationComponent;
 
 public class XMLAAPProvider implements AAP, PluggableConfigurationComponent {
 

diff --git a/src/edu/internet2/middleware/shibboleth/serviceprovider/PluggableConfigurationComponent.java b/src/edu/internet2/middleware/shibboleth/common/PluggableConfigurationComponent.java
similarity index 88%
rename from src/edu/internet2/middleware/shibboleth/serviceprovider/PluggableConfigurationComponent.java
rename to src/edu/internet2/middleware/shibboleth/common/PluggableConfigurationComponent.java
index b6dc843..4f282a3 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/serviceprovider/PluggableConfigurationComponent.java
+++ b/src/edu/internet2/middleware/shibboleth/common/PluggableConfigurationComponent.java
@@ -43,12 +43,10 @@
  * For examples of use, see one of the builtin implementation
  * classes (XMLMetadataImpl, ...).
  */
-package edu.internet2.middleware.shibboleth.serviceprovider;
+package edu.internet2.middleware.shibboleth.common;
 
-import org.apache.xmlbeans.XmlException;
 import org.opensaml.SAMLException;
 import org.w3c.dom.Element;
-import edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException;
 
 public interface PluggableConfigurationComponent {
     
@@ -56,7 +54,6 @@ public interface PluggableConfigurationComponent {
     initialize(Element dom) 
        throws 
        SAMLException,
-       XmlException, // If there is a problem in the configuration data
        ShibbolethConfigurationException; // for other problems
     
 }
\ No newline at end of file

diff --git a/src/edu/internet2/middleware/shibboleth/common/provider/ShibbolethTrust.java b/src/edu/internet2/middleware/shibboleth/common/provider/ShibbolethTrust.java
index f0175e2..4787673 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/common/provider/ShibbolethTrust.java
+++ b/src/edu/internet2/middleware/shibboleth/common/provider/ShibbolethTrust.java
@@ -62,6 +62,7 @@ import org.opensaml.SAMLSignedObject;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import edu.internet2.middleware.shibboleth.common.PluggableConfigurationComponent;
 import edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException;
 import edu.internet2.middleware.shibboleth.common.Trust;
 import edu.internet2.middleware.shibboleth.metadata.EntitiesDescriptor;
@@ -71,7 +72,6 @@ import edu.internet2.middleware.shibboleth.metadata.ExtendedEntityDescriptor;
 import edu.internet2.middleware.shibboleth.metadata.KeyAuthority;
 import edu.internet2.middleware.shibboleth.metadata.KeyDescriptor;
 import edu.internet2.middleware.shibboleth.metadata.RoleDescriptor;
-import edu.internet2.middleware.shibboleth.serviceprovider.PluggableConfigurationComponent;
 
 /**
  * <code>Trust</code> implementation that does PKIX validation against key authorities included in shibboleth-specific
@@ -475,7 +475,7 @@ public class ShibbolethTrust extends BasicTrust implements Trust, PluggableConfi
                
        }
 
-       public void initialize(Element dom) throws SAMLException, XmlException, ShibbolethConfigurationException {
+       public void initialize(Element dom) throws SAMLException, ShibbolethConfigurationException {
                
        }
 

diff --git a/src/edu/internet2/middleware/shibboleth/metadata/provider/XMLMetadataProvider.java b/src/edu/internet2/middleware/shibboleth/metadata/provider/XMLMetadataProvider.java
index e9b50dc..5c65e2c 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/metadata/provider/XMLMetadataProvider.java
+++ b/src/edu/internet2/middleware/shibboleth/metadata/provider/XMLMetadataProvider.java
@@ -52,8 +52,8 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import edu.internet2.middleware.shibboleth.common.Constants;
+import edu.internet2.middleware.shibboleth.common.PluggableConfigurationComponent;
 import edu.internet2.middleware.shibboleth.metadata.*;
-import edu.internet2.middleware.shibboleth.serviceprovider.PluggableConfigurationComponent;
 
 /**
  * @author Scott Cantor

diff --git a/src/edu/internet2/middleware/shibboleth/serviceprovider/ServiceProviderConfig.java b/src/edu/internet2/middleware/shibboleth/serviceprovider/ServiceProviderConfig.java
index db94776..94b2d93 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/serviceprovider/ServiceProviderConfig.java
+++ b/src/edu/internet2/middleware/shibboleth/serviceprovider/ServiceProviderConfig.java
@@ -180,6 +180,7 @@ import edu.internet2.middleware.shibboleth.aap.AAP;
 import edu.internet2.middleware.shibboleth.aap.AttributeRule;
 import edu.internet2.middleware.shibboleth.aap.provider.XMLAAPProvider;
 import edu.internet2.middleware.shibboleth.common.Credentials;
+import edu.internet2.middleware.shibboleth.common.PluggableConfigurationComponent;
 import edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException;
 import edu.internet2.middleware.shibboleth.common.Trust;
 import edu.internet2.middleware.shibboleth.common.provider.ShibbolethTrust;