[utilities COMMIT] in /spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring: config/DurationPropertyEditor...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Jun  6 15:31:02 2014
New Revision: 592

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

Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationToLongConverter.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java?rev=592&r1=591&r2=592&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java Fri Jun  6 15:31:02 2014
@@ -19,7 +19,7 @@
 
 import java.beans.PropertyEditorSupport;
 
-import net.shibboleth.utilities.java.support.xml.DomTypeSupport;
+import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 
 
 /**
@@ -31,11 +31,11 @@
     public void setAsText(String text) {
 
         if (text.startsWith("P")) {
-            setValue(DomTypeSupport.getDataTypeFactory().newDuration(text));
+            setValue(DOMTypeSupport.getDataTypeFactory().newDuration(text));
         } else if (text.startsWith("-P")) {
             throw new IllegalArgumentException("Negative durations are not supported");
         } else {
-            setValue(DomTypeSupport.getDataTypeFactory().newDuration(Long.valueOf(text)));
+            setValue(DOMTypeSupport.getDataTypeFactory().newDuration(Long.valueOf(text)));
         }
     }    
 }

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationToLongConverter.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationToLongConverter.java?rev=592&r1=591&r2=592&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationToLongConverter.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationToLongConverter.java Fri Jun  6 15:31:02 2014
@@ -22,7 +22,7 @@
 import org.springframework.core.convert.converter.Converter;
 
 import net.shibboleth.utilities.java.support.annotation.Duration;
-import net.shibboleth.utilities.java.support.xml.DomTypeSupport;
+import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 
 
 /**
@@ -33,7 +33,7 @@
     /** {@inheritDoc} */
     public Long convert(String source) {
         if (source.startsWith("P")) {
-            return DomTypeSupport.durationToLong(source);
+            return DOMTypeSupport.durationToLong(source);
         } else if (source.startsWith("-P")) {
             throw new IllegalArgumentException("Negative durations are not supported");
         } else {

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java?rev=592&r1=591&r2=592&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java Fri Jun  6 15:31:02 2014
@@ -22,7 +22,7 @@
 
 import javax.xml.namespace.QName;
 
-import net.shibboleth.utilities.java.support.xml.DomTypeSupport;
+import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 import net.shibboleth.utilities.java.support.xml.QNameSupport;
 
 import org.slf4j.Logger;
@@ -107,7 +107,7 @@
         QName parserId;
         BeanDefinitionParser parser = null;
 
-        parserId = DomTypeSupport.getXSIType(element);
+        parserId = DOMTypeSupport.getXSIType(element);
         if (parserId != null) {
             log.trace("Attempting to find parser for element of type: {}", parserId);
             parser = parsers.get(parserId);
@@ -139,7 +139,7 @@
         BeanDefinitionDecorator decorator = null;
 
         if (node instanceof Element) {
-            decorator = decorators.get(DomTypeSupport.getXSIType((Element) node));
+            decorator = decorators.get(DOMTypeSupport.getXSIType((Element) node));
             if (decorator == null) {

[... 70 lines stripped ...]