[java-opensaml COMMIT] in /trunk: opensaml-core/src/main/java/org/opensaml/xml/io/AbstractXMLObjectMarshaller.java op...

[noreply at shibboleth.net]

Author: lajoie
Date: Tue Mar 13 17:44:06 2012
New Revision: 2951

URL: http://svn.shibboleth.net/view/java-opensaml?rev=2951&view=rev
Log:
Synch up with latest java-support

Modified:
    trunk/opensaml-core/src/main/java/org/opensaml/xml/io/AbstractXMLObjectMarshaller.java
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/xml/security/credential/CredentialContextSet.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/collections/ClassIndexedSet.java

Modified: trunk/opensaml-core/src/main/java/org/opensaml/xml/io/AbstractXMLObjectMarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/xml/io/AbstractXMLObjectMarshaller.java?rev=2951&r1=2950&r2=2951&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/xml/io/AbstractXMLObjectMarshaller.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/xml/io/AbstractXMLObjectMarshaller.java Tue Mar 13 17:44:06 2012
@@ -345,7 +345,7 @@
                     continue;
                 }
                 
-                String declared = NamespaceSupport.lookupNamespaceURI(domElement, namespace.getNamespacePrefix());
+                String declared = NamespaceSupport.lookupNamespaceURI(domElement, domElement, namespace.getNamespacePrefix());
                 if (declared != null && namespace.getNamespaceURI().equals(declared)) {
                     log.trace("Namespace {} has already been declared on an ancestor of {} no need to add it here", namespace,
                             xmlObject.getElementQName());

Modified: trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java?rev=2951&r1=2950&r2=2951&view=diff
==============================================================================
--- trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java (original)
+++ trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java Tue Mar 13 17:44:06 2012
@@ -22,13 +22,13 @@
 import java.util.Iterator;
 import java.util.UUID;
 
-import net.shibboleth.utilities.java.support.collection.ClassIndexedSet;
 import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
 import net.shibboleth.utilities.java.support.logic.Assert;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.joda.time.DateTime;
 import org.opensaml.messaging.MessageRuntimeException;
+import org.opensaml.util.collections.ClassIndexedSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/xml/security/credential/CredentialContextSet.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/xml/security/credential/CredentialContextSet.java?rev=2951&r1=2950&r2=2951&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/xml/security/credential/CredentialContextSet.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/xml/security/credential/CredentialContextSet.java Tue Mar 13 17:44:06 2012
@@ -17,14 +17,12 @@
 
 package org.opensaml.xml.security.credential;
 
-import net.shibboleth.utilities.java.support.collection.ClassIndexedSet;
-
+import org.opensaml.util.collections.ClassIndexedSet;
 
 /**
  * This class holds instances of {@link CredentialContext} which represent information
  * about the context in which a {@link CredentialResolver} has resolved a {@link Credential}.
  */
 public class CredentialContextSet extends ClassIndexedSet<CredentialContext> {
-    
-    
-}
+       
+}

Modified: trunk/opensaml-util/src/main/java/org/opensaml/util/collections/ClassIndexedSet.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-util/src/main/java/org/opensaml/util/collections/ClassIndexedSet.java?rev=2951&r1=2950&r2=2951&view=diff
==============================================================================
--- trunk/opensaml-util/src/main/java/org/opensaml/util/collections/ClassIndexedSet.java (original)
+++ trunk/opensaml-util/src/main/java/org/opensaml/util/collections/ClassIndexedSet.java Tue Mar 13 17:44:06 2012
@@ -23,7 +23,7 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import org.opensaml.util.Assert;
+import net.shibboleth.utilities.java.support.logic.Assert;
 
 /**
  * Set implementation which provides indexed access to set members via their class, and which allows only one instance
@@ -31,7 +31,6 @@
  * 
  * @param <T> the type of object stored by this class
  */
- at Deprecated
 public class ClassIndexedSet<T> extends AbstractSet<T> implements Set<T> {
 
     /** Storage for set members. */