Fix up config bugs

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

diff --git a/resources/conf/internal.xml b/resources/conf/internal.xml
index 0e8d12a..12e7d57 100644 (file)
--- a/resources/conf/internal.xml
+++ b/resources/conf/internal.xml
@@ -48,19 +48,25 @@
         <property name="ignoreElementContentWhitespace" value="true" />
         <property name="namespaceAware" value="true" />
     </bean>
-    
+
     <bean id="shibboleth.TaskTimer" class="java.util.Timer" destroy-method="cancel">
         <constructor-arg value="true" type="boolean" />
     </bean>
-    
+
     <bean id="shibboleth.StorageService" class="org.opensaml.util.storage.MapBasedStorageService" />
-    
+
     <bean id="shibboleth.StorageServiceSweeper" class="org.opensaml.util.storage.ExpiringObjectStorageServiceSweeper">
         <constructor-arg ref="shibboleth.TaskTimer" />
         <constructor-arg ref="shibboleth.StorageService" />
-        <constructor-arg value="600000" />
+        <constructor-arg value="600000" type="long" />
+    </bean>
+
+    <bean id="shibboleth.SessionManager"
+        class="edu.internet2.middleware.shibboleth.idp.session.impl.SessionManagerImpl">
+        <constructor-arg ref="shibboleth.StorageService" />
+        <constructor-arg value="1800000" type="long" />
     </bean>
-    
+
     <bean id="shibboleth.ArtifactMap" class="org.opensaml.common.binding.artifact.BasicSAMLArtifactMap">
         <constructor-arg ref="shibboleth.StorageService" />
         <constructor-arg type="long" value="300000" />
@@ -115,7 +121,7 @@
                 <value>urn:oasis:names:tc:SAML:1.0:profiles:artifact-01</value>
             </key>
             <bean id="shibboleth.SAML1HttpArtifactDecoder"
-                class="org.opensaml.saml1.binding.encoding.HTTPArtifactDecoder">
+                class="org.opensaml.saml1.binding.decoding.HTTPArtifactDecoder">
             </bean>
         </entry>
         <entry>
@@ -159,7 +165,7 @@
                 <value>urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact</value>
             </key>
             <bean id="shibboleth.SAML2HTTPArtifactEncoder"
-                class="org.opensaml.saml2.binding.decoding.HTTPArtifactEncoder">
+                class="org.opensaml.saml2.binding.encoding.HTTPArtifactEncoder">
                 <constructor-arg ref="shibboleth.ArtifactMap" />
                 <constructor-arg ref="shibboleth.VelocityEngine" />
                 <constructor-arg value="/templates/saml2-post-artifact-binding.vm" />
@@ -198,9 +204,6 @@
         </entry>
     </util:map>
 
-    <bean id="shibboleth.SessionManager"
-        class="edu.internet2.middleware.shibboleth.idp.session.impl.SessionManagerImpl" />
-
     <bean id="shibboleth.SAML1AttributeAuthority"
         class="edu.internet2.middleware.shibboleth.common.attribute.provider.ShibbolethSAML1AttributeAuthority">
         <constructor-arg ref="shibboleth.AttributeResolver" />