[java-metadata-aggregator COMMIT] in /trunk/aggregator-pipeline/src: main/java/net/shibboleth/metadata/AbstractItem.j...

[noreply at shibboleth.net]

Author: iay
Date: Sun Sep 15 05:45:49 2013
New Revision: 246

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=246&view=rev
Log:
MDA-70: move ClassToInstanceMultiMap to java-support

Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/Item.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/ClassToInstanceMultiMap.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/ItemCollectionWithMetadata.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/ClassToInstanceMultiMapTest.java

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java?rev=246&r1=245&r2=246&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java Sun Sep 15 05:45:49 2013
@@ -21,7 +21,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
-import net.shibboleth.metadata.util.ClassToInstanceMultiMap;
+import net.shibboleth.utilities.java.support.collection.ClassToInstanceMultiMap;
 
 /**
  * Base implementation of an {@link Item}.

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/Item.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/Item.java?rev=246&r1=245&r2=246&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/Item.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/Item.java Sun Sep 15 05:45:49 2013
@@ -22,7 +22,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.metadata.util.ClassToInstanceMultiMap;
+import net.shibboleth.utilities.java.support.collection.ClassToInstanceMultiMap;
 
 /**
  * A wrapper around a piece of information processed by pipeline stages.

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java?rev=246&r1=245&r2=246&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java Sun Sep 15 05:45:49 2013
@@ -30,9 +30,9 @@
 import net.shibboleth.metadata.ItemMetadata;
 import net.shibboleth.metadata.pipeline.BaseStage;
 import net.shibboleth.metadata.pipeline.StageProcessingException;
-import net.shibboleth.metadata.util.ClassToInstanceMultiMap;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.collection.ClassToInstanceMultiMap;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/ItemCollectionWithMetadata.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/ItemCollectionWithMetadata.java?rev=246&r1=245&r2=246&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/ItemCollectionWithMetadata.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/ItemCollectionWithMetadata.java Sun Sep 15 05:45:49 2013
@@ -26,6 +26,7 @@
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.ItemMetadata;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.collection.ClassToInstanceMultiMap;
 import net.shibboleth.utilities.java.support.collection.LazyList;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java

[... 15 lines stripped ...]