[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/common/profile/logic/ main/java/...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar 25 00:24:01 2014
New Revision: 3729

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3729&view=rev
Log:
Move NameID policy predicates to more general package.

Added:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/AffiliationNameIDPolicyPredicate.java
      - copied, changed from r3728, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AffiliationNameIDPolicyPredicate.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/DefaultNameIDPolicyPredicate.java
      - copied, changed from r3728, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/DefaultNameIDPolicyPredicate.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/package-info.java   (with props)
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AffiliationNameIDPolicyPredicate.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/DefaultNameIDPolicyPredicate.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java

Copied: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/AffiliationNameIDPolicyPredicate.java (from r3728, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AffiliationNameIDPolicyPredicate.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/AffiliationNameIDPolicyPredicate.java?p2=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/AffiliationNameIDPolicyPredicate.java&p1=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AffiliationNameIDPolicyPredicate.java&r1=3728&r2=3729&rev=3729&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AffiliationNameIDPolicyPredicate.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/AffiliationNameIDPolicyPredicate.java Tue Mar 25 00:24:01 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.opensaml.saml.saml2.profile.impl;
+package org.opensaml.saml.common.profile.logic;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

Copied: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/DefaultNameIDPolicyPredicate.java (from r3728, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/DefaultNameIDPolicyPredicate.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/DefaultNameIDPolicyPredicate.java?p2=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/DefaultNameIDPolicyPredicate.java&p1=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/DefaultNameIDPolicyPredicate.java&r1=3728&r2=3729&rev=3729&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/DefaultNameIDPolicyPredicate.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/DefaultNameIDPolicyPredicate.java Tue Mar 25 00:24:01 2014
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
-package org.opensaml.saml.saml2.profile.impl;
+package org.opensaml.saml.common.profile.logic;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.opensaml.saml.common.profile.logic.AbstractNameIDPolicyPredicate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java?rev=3729&r1=3728&r2=3729&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java Tue Mar 25 00:24:01 2014
@@ -42,6 +42,7 @@
 import org.opensaml.saml.common.SAMLObjectBuilder;
 import org.opensaml.saml.common.profile.FormatSpecificNameIdentifierGenerator;
 import org.opensaml.saml.common.profile.SAMLEventIds;
+import org.opensaml.saml.common.profile.logic.DefaultNameIDPolicyPredicate;
 import org.opensaml.saml.common.profile.logic.MetadataNameIdentifierFormatStrategy;
 import org.opensaml.saml.saml2.core.Assertion;

[... 16 lines stripped ...]