[java-idp-testbed COMMIT] in /trunk/src/main: java/sp/BaseSAMLController.java resources/system/conf/testbed-opensaml.xml

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Jun  6 14:24:01 2014
New Revision: 263

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=263&view=rev
Log:
Some work on JSPT-45: Implement class and method renames for new naming convention for any remaining components.

Modified:
    trunk/src/main/java/sp/BaseSAMLController.java
    trunk/src/main/resources/system/conf/testbed-opensaml.xml

Modified: trunk/src/main/java/sp/BaseSAMLController.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/sp/BaseSAMLController.java?rev=263&r1=262&r2=263&view=diff
==============================================================================
--- trunk/src/main/java/sp/BaseSAMLController.java (original)
+++ trunk/src/main/java/sp/BaseSAMLController.java Fri Jun  6 14:24:01 2014
@@ -21,7 +21,7 @@
 
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
-import net.shibboleth.utilities.java.support.security.Type4UuidIdentifierGenerationStrategy;
+import net.shibboleth.utilities.java.support.security.Type4UUIDIdentifierGenerationStrategy;
 import net.shibboleth.utilities.java.support.xml.ParserPool;
 
 import org.apache.velocity.app.VelocityEngine;
@@ -45,7 +45,7 @@
 
     @Autowired protected MarshallerFactory marshallerFactory;
 
-    protected IdentifierGenerationStrategy idGenerator = new Type4UuidIdentifierGenerationStrategy();
+    protected IdentifierGenerationStrategy idGenerator = new Type4UUIDIdentifierGenerationStrategy();
 
     @Autowired protected VelocityEngine velocityEngine;
 

Modified: trunk/src/main/resources/system/conf/testbed-opensaml.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/system/conf/testbed-opensaml.xml?rev=263&r1=262&r2=263&view=diff
==============================================================================
--- trunk/src/main/resources/system/conf/testbed-opensaml.xml (original)
+++ trunk/src/main/resources/system/conf/testbed-opensaml.xml Fri Jun  6 14:24:01 2014
@@ -60,7 +60,7 @@
         <property name="velocityProperties">
             <props>
                 <prop key="runtime.log.logsystem.class">
-                    net.shibboleth.utilities.java.support.velocity.Slf4JLogChute
+                    net.shibboleth.utilities.java.support.velocity.SLF4JLogChute
                 </prop>
                 <prop key="input.encoding">UTF-8</prop>
                 <prop key="output.encoding">UTF-8</prop>