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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jul 31 06:18:11 2014
New Revision: 6371

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6371&view=rev
Log:
IDP-447 Schema change and parser for Scripted Data Connector

Added:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ScriptDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ScriptDataConnectorParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedAttributes-8.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedAttributes.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedConnector.8.js
Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/DataConnectorNamespaceHandler.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/DataConnectorNamespaceHandler.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/DataConnectorNamespaceHandler.java?rev=6371&r1=6370&r2=6371&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/DataConnectorNamespaceHandler.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/DataConnectorNamespaceHandler.java Thu Jul 31 06:18:11 2014
@@ -34,5 +34,6 @@
         registerBeanDefinitionParser(StoredIDDataConnectorParser.TYPE_NAME, new StoredIDDataConnectorParser());
         registerBeanDefinitionParser(RDBMSDataConnectorParser.TYPE_NAME, new RDBMSDataConnectorParser());
         registerBeanDefinitionParser(LDAPDataConnectorParser.TYPE_NAME, new LDAPDataConnectorParser());
+        registerBeanDefinitionParser(ScriptDataConnectorParser.TYPE_NAME, new ScriptDataConnectorParser());
     }
 }

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=6371&r1=6370&r2=6371&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 Thu Jul 31 06:18:11 2014
@@ -43,7 +43,42 @@
             </extension>
         </complexContent>
     </complexType>
-    
+
+    <complexType name="Script">
+        <annotation>
+            <documentation>
+                A data connector that constructs attributes by means of a script supported by JSR-223.  Populated 
+                Attributes are added to the java.util.Collection "connectorResults". 
+            </documentation>
+        </annotation>
+        <complexContent>
+            <extension base="resolver:BaseDataConnectorType">
+                <choice>
+                    <element name="Script" type="string" minOccurs="0">
+                        <annotation>
+                            <documentation>The script to evaluate to construct the attribute.</documentation>
+                        </annotation>
+                    </element>
+                    <element name="ScriptFile" type="string" minOccurs="0">
+                        <annotation>
+                            <documentation>
+                                The filesystem path to the script to evaluate to construct the attribute.
+                            </documentation>
+                        </annotation>
+                    </element>
+                </choice>
+                <attribute name="language" type="string">
+                    <annotation>
+                        <documentation>
+                            The JSR-233 name for the scripting language that will be used. By default "javascript" is
+                            supported.
+                        </documentation>
+                    </annotation>
+                </attribute>
+            </extension>
+        </complexContent>
+    </complexType>
+
     <complexType name="ComputedId">
         <annotation>
             <documentation>