Missed a file during last commit

Update attribute resolver so that entitlement does not rely on the static data connector default.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2756 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/installer/resources/conf-tmpl/attribute-resolver.xml b/src/installer/resources/conf-tmpl/attribute-resolver.xml
index 99906f6..49cb8e4 100644 (file)
--- a/src/installer/resources/conf-tmpl/attribute-resolver.xml
+++ b/src/installer/resources/conf-tmpl/attribute-resolver.xml
@@ -311,7 +311,6 @@
     <!--
     <resolver:AttributeDefinition id="eduPersonAffiliation" xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
         sourceAttributeID="eduPersonAffiliation">
-        <resolver:Dependency ref="staticAttributes" />
         <resolver:Dependency ref="myLDAP" />
 
         <resolver:AttributeEncoder xsi:type="SAML1String" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"

diff --git a/src/installer/resources/conf-tmpl/internal.xml b/src/installer/resources/conf-tmpl/internal.xml
index fa666cf..1381824 100644 (file)
--- a/src/installer/resources/conf-tmpl/internal.xml
+++ b/src/installer/resources/conf-tmpl/internal.xml
@@ -38,7 +38,7 @@
                     org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
                 </prop>
                 <prop key="string.resource.loader.class">
-                    org.apache.velocity.runtime.resource.loader.StringResourceLoader
+                    edu.internet2.middleware.shibboleth.common.util.StringResourceLoader
                 </prop>
             </props>
         </property>