[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 21 15:54:02 2014
New Revision: 6762

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6762&view=rev
Log:
Mark queryUsesStoredProcedure setting as unsupported, and log a warning.

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnector.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnector.java?rev=6762&r1=6761&r2=6762&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnector.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnector.java Tue Oct 21 15:54:02 2014
@@ -52,8 +52,6 @@
     /** Whether the JDBC connection is read-only. */
     private boolean readOnlyConnection = true;
 
-    // TODO: support queryUsesStoredProcedure?
-
     /**
      * Constructor.
      */

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.java?rev=6762&r1=6761&r2=6762&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.java Tue Oct 21 15:54:02 2014
@@ -125,6 +125,11 @@
         if (noResultIsError != null) {
             builder.addPropertyValue("noResultAnError", noResultIsError);
         }
+        
+        if (AttributeSupport.hasAttribute(config, new QName("queryUsesStoredProcedure"))) {
+            log.warn("queryUsesStoredProcedure property no longer supported and should be removed");
+        }
+        
         builder.setInitMethodName("initialize");
         builder.setDestroyMethodName("destroy");
     }
@@ -218,7 +223,7 @@
                     renamingMap.put(columnName, attributeId);
                 }
                 
-                if (AttributeSupport.hasAttribute(column, new QName(null, "type"))) {
+                if (AttributeSupport.hasAttribute(column, new QName("type"))) {
                     LoggerFactory.getLogger(RDBMSDataConnectorParser.class).warn(
                             "dc:Column type attribute is no longer supported");
                 }

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd?rev=6762&r1=6761&r2=6762&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd (original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd Tue Oct 21 15:54:02 2014
@@ -219,8 +219,7 @@
                 <attribute name="queryUsesStoredProcedure" type="string">
                     <annotation>
                         <documentation>
-                            A boolean flag that determines whether stored procedures might be used in the SQL queries
-                            used in this connector.
+                            No longer supported.
                         </documentation>
                     </annotation>
                 </attribute>