Get rid of /hs package

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

diff --git a/src/edu/internet2/middleware/shibboleth/common/NameMapper.java b/src/edu/internet2/middleware/shibboleth/common/NameMapper.java
index 8f88d4f..18e8f1a 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/common/NameMapper.java
+++ b/src/edu/internet2/middleware/shibboleth/common/NameMapper.java
@@ -40,7 +40,7 @@ import org.opensaml.SAMLNameIdentifier;
 import org.w3c.dom.Element;
 import org.xml.sax.InputSource;
 
-import edu.internet2.middleware.shibboleth.hs.provider.SharedMemoryShibHandle;
+import edu.internet2.middleware.shibboleth.common.provider.SharedMemoryShibHandle;
 import edu.internet2.middleware.shibboleth.xml.Parser;
 
 /**

diff --git a/src/edu/internet2/middleware/shibboleth/hs/provider/AQHNameIdentifierMapping.java b/src/edu/internet2/middleware/shibboleth/common/provider/AQHNameIdentifierMapping.java
similarity index 97%
rename from src/edu/internet2/middleware/shibboleth/hs/provider/AQHNameIdentifierMapping.java
rename to src/edu/internet2/middleware/shibboleth/common/provider/AQHNameIdentifierMapping.java
index e3184b3..de84609 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/hs/provider/AQHNameIdentifierMapping.java
+++ b/src/edu/internet2/middleware/shibboleth/common/provider/AQHNameIdentifierMapping.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package edu.internet2.middleware.shibboleth.hs.provider;
+package edu.internet2.middleware.shibboleth.common.provider;
 
 import java.io.Serializable;
 
@@ -34,7 +34,6 @@ import org.opensaml.SAMLException;
 import org.w3c.dom.Element;
 
 import edu.internet2.middleware.shibboleth.common.AuthNPrincipal;
-import edu.internet2.middleware.shibboleth.common.BaseNameIdentifierMapping;
 import edu.internet2.middleware.shibboleth.common.NameIdentifierMappingException;
 
 /**

diff --git a/src/edu/internet2/middleware/shibboleth/common/BaseNameIdentifierMapping.java b/src/edu/internet2/middleware/shibboleth/common/provider/BaseNameIdentifierMapping.java
similarity index 94%
rename from src/edu/internet2/middleware/shibboleth/common/BaseNameIdentifierMapping.java
rename to src/edu/internet2/middleware/shibboleth/common/provider/BaseNameIdentifierMapping.java
index b6be76a..2cb77dc 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/common/BaseNameIdentifierMapping.java
+++ b/src/edu/internet2/middleware/shibboleth/common/provider/BaseNameIdentifierMapping.java
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package edu.internet2.middleware.shibboleth.common;
+package edu.internet2.middleware.shibboleth.common.provider;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -32,6 +32,10 @@ import org.apache.log4j.Logger;
 import org.opensaml.SAMLNameIdentifier;
 import org.w3c.dom.Element;
 
+import edu.internet2.middleware.shibboleth.common.IdentityProvider;
+import edu.internet2.middleware.shibboleth.common.NameIdentifierMapping;
+import edu.internet2.middleware.shibboleth.common.NameIdentifierMappingException;
+
 /**
  * Base class for processing name identifier mapping configuration.
  * 

diff --git a/src/edu/internet2/middleware/shibboleth/hs/provider/CryptoShibHandle.java b/src/edu/internet2/middleware/shibboleth/common/provider/CryptoShibHandle.java
similarity index 99%
rename from src/edu/internet2/middleware/shibboleth/hs/provider/CryptoShibHandle.java
rename to src/edu/internet2/middleware/shibboleth/common/provider/CryptoShibHandle.java
index 9d12371..9f3609f 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/hs/provider/CryptoShibHandle.java
+++ b/src/edu/internet2/middleware/shibboleth/common/provider/CryptoShibHandle.java
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package edu.internet2.middleware.shibboleth.hs.provider;
+package edu.internet2.middleware.shibboleth.common.provider;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

diff --git a/src/edu/internet2/middleware/shibboleth/hs/provider/PrincipalNameIdentifier.java b/src/edu/internet2/middleware/shibboleth/common/provider/PrincipalNameIdentifier.java
similarity index 97%
rename from src/edu/internet2/middleware/shibboleth/hs/provider/PrincipalNameIdentifier.java
rename to src/edu/internet2/middleware/shibboleth/common/provider/PrincipalNameIdentifier.java
index 87bcded..da7ba72 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/hs/provider/PrincipalNameIdentifier.java
+++ b/src/edu/internet2/middleware/shibboleth/common/provider/PrincipalNameIdentifier.java
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package edu.internet2.middleware.shibboleth.hs.provider;
+package edu.internet2.middleware.shibboleth.common.provider;
 
 import org.apache.log4j.Logger;
 import org.opensaml.SAMLException;
@@ -31,7 +31,6 @@ import org.opensaml.SAMLNameIdentifier;
 import org.w3c.dom.Element;
 
 import edu.internet2.middleware.shibboleth.common.AuthNPrincipal;
-import edu.internet2.middleware.shibboleth.common.BaseNameIdentifierMapping;
 import edu.internet2.middleware.shibboleth.common.IdentityProvider;
 import edu.internet2.middleware.shibboleth.common.InvalidNameIdentifierException;
 import edu.internet2.middleware.shibboleth.common.NameIdentifierMapping;

diff --git a/src/edu/internet2/middleware/shibboleth/hs/provider/SharedMemoryShibHandle.java b/src/edu/internet2/middleware/shibboleth/common/provider/SharedMemoryShibHandle.java
similarity index 99%
rename from src/edu/internet2/middleware/shibboleth/hs/provider/SharedMemoryShibHandle.java
rename to src/edu/internet2/middleware/shibboleth/common/provider/SharedMemoryShibHandle.java
index 662c8fc..1b2760d 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/hs/provider/SharedMemoryShibHandle.java
+++ b/src/edu/internet2/middleware/shibboleth/common/provider/SharedMemoryShibHandle.java
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package edu.internet2.middleware.shibboleth.hs.provider;
+package edu.internet2.middleware.shibboleth.common.provider;
 
 import java.util.HashMap;
 import java.util.HashSet;

diff --git a/src/edu/internet2/middleware/shibboleth/common/ShibbolethTrust.java b/src/edu/internet2/middleware/shibboleth/common/provider/ShibbolethTrust.java
similarity index 99%
rename from src/edu/internet2/middleware/shibboleth/common/ShibbolethTrust.java
rename to src/edu/internet2/middleware/shibboleth/common/provider/ShibbolethTrust.java
index bba1c02..e0bb0e9 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/common/ShibbolethTrust.java
+++ b/src/edu/internet2/middleware/shibboleth/common/provider/ShibbolethTrust.java
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package edu.internet2.middleware.shibboleth.common;
+package edu.internet2.middleware.shibboleth.common.provider;
 
 import java.security.GeneralSecurityException;
 import java.security.cert.CertPathBuilder;
@@ -57,6 +57,7 @@ import org.apache.xml.security.keys.content.KeyName;
 import org.apache.xml.security.keys.content.X509Data;
 import org.apache.xml.security.keys.content.x509.XMLX509Certificate;
 
+import edu.internet2.middleware.shibboleth.common.Trust;
 import edu.internet2.middleware.shibboleth.metadata.EntitiesDescriptor;
 import edu.internet2.middleware.shibboleth.metadata.EntityDescriptor;
 import edu.internet2.middleware.shibboleth.metadata.ExtendedEntitiesDescriptor;

diff --git a/src/edu/internet2/middleware/shibboleth/hs/provider/X509SubjectNameNameIdentifierMapping.java b/src/edu/internet2/middleware/shibboleth/common/provider/X509SubjectNameNameIdentifierMapping.java
similarity index 97%
rename from src/edu/internet2/middleware/shibboleth/hs/provider/X509SubjectNameNameIdentifierMapping.java
rename to src/edu/internet2/middleware/shibboleth/common/provider/X509SubjectNameNameIdentifierMapping.java
index 86aa80e..bacef7a 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/hs/provider/X509SubjectNameNameIdentifierMapping.java
+++ b/src/edu/internet2/middleware/shibboleth/common/provider/X509SubjectNameNameIdentifierMapping.java
@@ -1,5 +1,4 @@
-
-package edu.internet2.middleware.shibboleth.hs.provider;
+package edu.internet2.middleware.shibboleth.common.provider;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -12,7 +11,6 @@ import org.opensaml.SAMLNameIdentifier;
 import org.w3c.dom.Element;
 
 import edu.internet2.middleware.shibboleth.common.AuthNPrincipal;
-import edu.internet2.middleware.shibboleth.common.BaseNameIdentifierMapping;
 import edu.internet2.middleware.shibboleth.common.IdentityProvider;
 import edu.internet2.middleware.shibboleth.common.InvalidNameIdentifierException;
 import edu.internet2.middleware.shibboleth.common.NameIdentifierMapping;

diff --git a/src/edu/internet2/middleware/shibboleth/idp/IdPProtocolSupport.java b/src/edu/internet2/middleware/shibboleth/idp/IdPProtocolSupport.java
index 6d56729..89ec691 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/IdPProtocolSupport.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/IdPProtocolSupport.java
@@ -54,8 +54,8 @@ import edu.internet2.middleware.shibboleth.common.NameMapper;
 import edu.internet2.middleware.shibboleth.common.RelyingParty;
 import edu.internet2.middleware.shibboleth.common.ServiceProviderMapper;
 import edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException;
-import edu.internet2.middleware.shibboleth.common.ShibbolethTrust;
 import edu.internet2.middleware.shibboleth.common.Trust;
+import edu.internet2.middleware.shibboleth.common.provider.ShibbolethTrust;
 import edu.internet2.middleware.shibboleth.metadata.EntityDescriptor;
 import edu.internet2.middleware.shibboleth.metadata.Metadata;
 import edu.internet2.middleware.shibboleth.metadata.MetadataException;

diff --git a/tests/edu/internet2/middleware/shibboleth/common/TrustTests.java b/tests/edu/internet2/middleware/shibboleth/common/TrustTests.java
index 1aef4bd..ea8d688 100644 (file)
--- a/tests/edu/internet2/middleware/shibboleth/common/TrustTests.java
+++ b/tests/edu/internet2/middleware/shibboleth/common/TrustTests.java
@@ -40,6 +40,7 @@ import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
 import edu.internet2.middleware.shibboleth.common.ShibResource.ResourceNotAvailableException;
+import edu.internet2.middleware.shibboleth.common.provider.ShibbolethTrust;
 import edu.internet2.middleware.shibboleth.metadata.EntityDescriptor;
 import edu.internet2.middleware.shibboleth.metadata.KeyDescriptor;
 import edu.internet2.middleware.shibboleth.metadata.Metadata;

diff --git a/tests/edu/internet2/middleware/shibboleth/hs/provider/NameMapperTests.java b/tests/edu/internet2/middleware/shibboleth/common/provider/NameMapperTests.java
similarity index 99%
rename from tests/edu/internet2/middleware/shibboleth/hs/provider/NameMapperTests.java
rename to tests/edu/internet2/middleware/shibboleth/common/provider/NameMapperTests.java
index b0898a0..3693ce8 100644 (file)
--- a/tests/edu/internet2/middleware/shibboleth/hs/provider/NameMapperTests.java
+++ b/tests/edu/internet2/middleware/shibboleth/common/provider/NameMapperTests.java
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package edu.internet2.middleware.shibboleth.hs.provider;
+package edu.internet2.middleware.shibboleth.common.provider;
 
 import java.io.File;
 import java.io.StringReader;
@@ -45,6 +45,7 @@ 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.ServiceProvider;
+import edu.internet2.middleware.shibboleth.common.provider.CryptoShibHandle;
 import edu.internet2.middleware.shibboleth.xml.Parser;
 
 /**