[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/saml-nameid-system.xml idp-saml-im...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 13 22:27:16 2015
New Revision: 7820

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7820&view=rev
Log:
IDP-829 - Logging and doc improvements, rename deprecated setter to avoid conflict.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/PersistentSAML2NameIDGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/StoredPersistentIdGenerationStrategy.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/PersistentSAML2NameIDGeneratorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/StoredPersistentIdDecoderTest.java

Modified: trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml?rev=7820&r1=7819&r2=7820&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml	Tue Oct 13 22:27:16 2015
@@ -64,7 +64,7 @@
     <bean id="shibboleth.StoredPersistentIdGenerator" lazy-init="true"
         class="net.shibboleth.idp.saml.nameid.impl.StoredPersistentIdGenerationStrategy"
         p:computedIdStrategy="#{getObject('%{idp.persistentId.computed:shibboleth.ComputedPersistentIdGenerator}'.trim())}"
-        p:IDStore="#{getObject('%{idp.persistentId.store:}')}" />
+        p:deprecatedPersistentIdStore="#{getObject('%{idp.persistentId.store:}')}" />
     
     <!-- These two beans handle legacy support for NameID generation in the Attribute Resolver. -->
     <bean id="shibboleth.LegacySAML1NameIdentifierGenerator"

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java?rev=7820&r1=7819&r2=7820&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java	Tue Oct 13 22:27:16 2015
@@ -117,7 +117,7 @@
 
         idStore.initialize();
 
-        storedIdStrategy.setIDStore(idStore);
+        storedIdStrategy.setPersistentIdStore(idStore);
         storedIdStrategy.setComputedIdStrategy(getComputedIdStrategy());
         storedIdStrategy.initialize();
     }

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java?rev=7820&r1=7819&r2=7820&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java	Tue Oct 13 22:27:16 2015
@@ -55,11 +55,20 @@
 /**
  * JDBC-based storage management for SAML persistent IDs.
  * 
- * <p>The DDL for the database is
+ * <p>The general DDL for the database is:
  * 
- * <tt>CREATE TABLE shibpid {localEntity VARCHAR NOT NULL, peerEntity VARCHAR NOT NULL,
- *     persistentId VARCHAR NOT NULL, principalName VARCHAR NOT NULL, localId VARCHAR NOT NULL,
- *     peerProvidedId VARCHAR, creationDate TIMESTAMP NOT NULL, deactivationDate TIMESTAMP}</tt>.
+ * <pre>
+ * CREATE TABLE shibpid (
+ *      localEntity VARCHAR(255) NOT NULL,
+ *      peerEntity VARCHAR(255) NOT NULL,
+ *      persistentId VARCHAR(50) NOT NULL,
+ *      principalName VARCHAR(50) NOT NULL,
+ *      localId VARCHAR(50) NOT NULL,
+ *      peerProvidedId VARCHAR(50),
+ *      creationDate TIMESTAMP NOT NULL,
+ *      deactivationDate TIMESTAMP,
+ *      PRIMARY KEY (localEntity, peerEntity, persistentId)
+ *     );</pre>.
  *    
  * The first three columns should be defined as the primary key of the table, and the other columns
  * should be indexed.</p>

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/PersistentSAML2NameIDGenerator.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/PersistentSAML2NameIDGenerator.java?rev=7820&r1=7819&r2=7820&view=diff
==============================================================================

[... 93 lines stripped ...]