svn commit: r1907094 - in /cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl: AbstractElementParser.java BeanMapElementParser.java WildcardBeanMap.java

Author: javier
Date: Sun Jan 29 21:57:42 2023
New Revision: 1907094

URL: http://svn.apache.org/viewvc?rev=1907094&view=rev
Log:
Update code as some Spring methods and attributes were deprecated and removed. Use alternatives.

Modified:
    cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractElementParser.java
    cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/BeanMapElementParser.java
    cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/WildcardBeanMap.java

Modified: cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractElementParser.java?rev=1907094&r1=1907093&r2=1907094&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractElementParser.java (original)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractElementParser.java Sun Jan 29 21:57:42 2023
@@ -130,7 +130,7 @@ public abstract class AbstractElementPar
 
         final List aliases = new ArrayList();
         if (StringUtils.hasLength(nameAttr)) {
-            String[] nameArr = StringUtils.tokenizeToStringArray(nameAttr, BeanDefinitionParserDelegate.BEAN_NAME_DELIMITERS);
+            String[] nameArr = StringUtils.tokenizeToStringArray(nameAttr, BeanDefinitionParserDelegate.MULTI_VALUE_ATTRIBUTE_DELIMITERS);
             aliases.addAll(Arrays.asList(nameArr));
         }
 

Modified: cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/BeanMapElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/BeanMapElementParser.java?rev=1907094&r1=1907093&r2=1907094&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/BeanMapElementParser.java (original)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/BeanMapElementParser.java Sun Jan 29 21:57:42 2023
@@ -40,7 +40,7 @@ public class BeanMapElementParser extend
         final String type = this.getAttributeValue(element, "type", null);
         final Class typeClass;
         try {
-            typeClass = ClassUtils.forName(type);
+            typeClass = ClassUtils.forName(type, null);
         } catch (ClassNotFoundException e) {
             throw new BeanDefinitionStoreException("Unable to load aspect class: " + type, e);
         }

Modified: cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/WildcardBeanMap.java
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/WildcardBeanMap.java?rev=1907094&r1=1907093&r2=1907094&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/WildcardBeanMap.java (original)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/WildcardBeanMap.java Sun Jan 29 21:57:42 2023
@@ -53,7 +53,7 @@ public class WildcardBeanMap extends Bea
     protected String[] lookupBeans(ListableBeanFactory factory) {
         List<String> filteredBeanNames = new ArrayList<String>();
 
-        for (String beanName : factory.getBeanNamesForType(null)) {
+        for (String beanName : factory.getBeanNamesForType((Class<?>) null)) {
             if (PatternMatchUtils.simpleMatch(this.wildcard, beanName)) {
                 filteredBeanNames.add(beanName);
             }