[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/common/IdentifierGenerator.java opensa...

[noreply at shibboleth.net]

Author: lajoie
Date: Fri Sep 16 12:44:54 2011
New Revision: 2887

URL: http://svn.shibboleth.net/view/java-opensaml?rev=2887&view=rev
Log:
move identifier generator interface and impls to util package

Added:
    trunk/opensaml-util/src/main/java/org/opensaml/util/IdentifierGenerator.java   (contents, props changed)
      - copied, changed from r2879, trunk/opensaml-saml-api/src/main/java/org/opensaml/common/IdentifierGenerator.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/RandomIdentifierGenerator.java   (contents, props changed)
      - copied, changed from r2879, trunk/opensaml-saml-api/src/main/java/org/opensaml/common/impl/RandomIdentifierGenerator.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/SecureRandomIdentifierGenerator.java   (contents, props changed)
      - copied, changed from r2886, trunk/opensaml-saml-api/src/main/java/org/opensaml/common/impl/SecureRandomIdentifierGenerator.java
Removed:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/common/IdentifierGenerator.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/common/impl/RandomIdentifierGenerator.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/common/impl/SecureRandomIdentifierGenerator.java
Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml2/encryption/Encrypter.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml2/core/SignedAssertionTest.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml2/encryption/Encrypter.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml2/encryption/Encrypter.java?rev=2887&r1=2886&r2=2887&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml2/encryption/Encrypter.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml2/encryption/Encrypter.java Fri Sep 16 12:44:54 2011
@@ -25,8 +25,6 @@
 import javax.xml.namespace.QName;
 
 import org.opensaml.Configuration;
-import org.opensaml.common.IdentifierGenerator;
-import org.opensaml.common.impl.SecureRandomIdentifierGenerator;
 import org.opensaml.saml2.core.Assertion;
 import org.opensaml.saml2.core.Attribute;
 import org.opensaml.saml2.core.BaseID;
@@ -37,6 +35,8 @@
 import org.opensaml.saml2.core.NameID;
 import org.opensaml.saml2.core.NewEncryptedID;
 import org.opensaml.saml2.core.NewID;
+import org.opensaml.util.IdentifierGenerator;
+import org.opensaml.util.SecureRandomIdentifierGenerator;
 import org.opensaml.xml.XMLObject;
 import org.opensaml.xml.XMLObjectBuilderFactory;
 import org.opensaml.xml.encryption.CarriedKeyName;

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml2/core/SignedAssertionTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml2/core/SignedAssertionTest.java?rev=2887&r1=2886&r2=2887&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml2/core/SignedAssertionTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml2/core/SignedAssertionTest.java Fri Sep 16 12:44:54 2011
@@ -23,10 +23,10 @@
 import org.opensaml.common.BaseTestCase;
 import org.opensaml.common.SAMLTestHelper;
 import org.opensaml.common.SAMLVersion;
-import org.opensaml.common.impl.SecureRandomIdentifierGenerator;
 import org.opensaml.saml2.core.impl.AssertionBuilder;
 import org.opensaml.saml2.core.impl.AuthnStatementBuilder;
 import org.opensaml.saml2.core.impl.IssuerBuilder;
+import org.opensaml.util.SecureRandomIdentifierGenerator;
 import org.opensaml.util.criteria.CriteriaSet;
 import org.opensaml.xml.io.Marshaller;
 import org.opensaml.xml.io.MarshallingException;

Copied: trunk/opensaml-util/src/main/java/org/opensaml/util/IdentifierGenerator.java (from r2879, trunk/opensaml-saml-api/src/main/java/org/opensaml/common/IdentifierGenerator.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-util/src/main/java/org/opensaml/util/IdentifierGenerator.java?p2=trunk/opensaml-util/src/main/java/org/opensaml/util/IdentifierGenerator.java&p1=trunk/opensaml-saml-api/src/main/java/org/opensaml/common/IdentifierGenerator.java&r1=2879&r2=2887&rev=2887&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/common/IdentifierGenerator.java (original)
+++ trunk/opensaml-util/src/main/java/org/opensaml/util/IdentifierGenerator.java Fri Sep 16 12:44:54 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.opensaml.common;
+package org.opensaml.util;
 
 /**
  * Interface for identifier generators.  This identifier can be used for things like

Copied: trunk/opensaml-util/src/main/java/org/opensaml/util/RandomIdentifierGenerator.java (from r2879, trunk/opensaml-saml-api/src/main/java/org/opensaml/common/impl/RandomIdentifierGenerator.java)

[... 53 lines stripped ...]