springframework-cvs — CVS Commit Notification List

[Springframework-cvs] spring/test/org/springframework/jdbc/datasource DataSourceTransactionManagerTests.java,1.30,1.30.2.1

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/test/org/springframework/jdbc/datasource
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/test/org/springframework/jdbc/datasource

Modified Files:
      Tag: mbranch-1-2
	DataSourceTransactionManagerTests.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: DataSourceTransactionManagerTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/test/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C2 -d -r1.30 -r1.30.2.1
*** DataSourceTransactionManagerTests.java	14 Nov 2005 22:10:13 -0000	1.30
--- DataSourceTransactionManagerTests.java	21 Apr 2006 00:13:51 -0000	1.30.2.1
***************
*** 1,11 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 31,35 ****
  import org.springframework.dao.DataAccessResourceFailureException;
  import org.springframework.jdbc.UncategorizedSQLException;
! import org.springframework.jdbc.support.nativejdbc.CommonsDbcpNativeJdbcExtractor;
  import org.springframework.transaction.CannotCreateTransactionException;
  import org.springframework.transaction.IllegalTransactionStateException;
--- 31,35 ----
  import org.springframework.dao.DataAccessResourceFailureException;
  import org.springframework.jdbc.UncategorizedSQLException;
! import org.springframework.jdbc.support.nativejdbc.SimpleNativeJdbcExtractor;
  import org.springframework.transaction.CannotCreateTransactionException;
  import org.springframework.transaction.IllegalTransactionStateException;
***************
*** 86,89 ****
--- 86,93 ----
  			ds.getConnection();
  			dsControl.setReturnValue(con, 1);
+ 			if (createStatement) {
+ 				con.getMetaData();
+ 				conControl.setReturnValue(null, 1);
+ 			}
  			con.getAutoCommit();
  			conControl.setReturnValue(autoCommit, 1);
***************
*** 141,145 ****
  					if (createStatement) {
  						tCon.createStatement();
! 						assertEquals(con, new CommonsDbcpNativeJdbcExtractor().getNativeConnection(tCon));
  					}
  				}
--- 145,149 ----
  					if (createStatement) {
  						tCon.createStatement();
! 						assertEquals(con, new SimpleNativeJdbcExtractor().getNativeConnection(tCon));
  					}
  				}
***************
*** 708,711 ****
--- 712,717 ----
  		ds.getConnection();
  		dsControl.setReturnValue(con, 1);
+ 		con.getMetaData();
+ 		conControl.setReturnValue(null, 1);
  		con.getAutoCommit();
  		conControl.setReturnValue(true, 1);
***************
*** 734,738 ****
  				try {
  					assertEquals(con, ((ConnectionProxy) dsProxy.getConnection()).getTargetConnection());
! 					assertEquals(con, new CommonsDbcpNativeJdbcExtractor().getNativeConnection(dsProxy.getConnection()));
  					// should be ignored
  					dsProxy.getConnection().close();
--- 740,744 ----
  				try {
  					assertEquals(con, ((ConnectionProxy) dsProxy.getConnection()).getTargetConnection());
! 					assertEquals(con, new SimpleNativeJdbcExtractor().getNativeConnection(dsProxy.getConnection()));
  					// should be ignored
  					dsProxy.getConnection().close();

[Springframework-cvs] spring/src/org/springframework/web/multipart/commons CommonsMultipartResolver.java,1.16,1.16.4.1

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/web/multipart/commons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/src/org/springframework/web/multipart/commons

Modified Files:
      Tag: mbranch-1-2
	CommonsMultipartResolver.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: CommonsMultipartResolver.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/multipart/commons/CommonsMultipartResolver.java,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -C2 -d -r1.16 -r1.16.4.1
*** CommonsMultipartResolver.java	17 Sep 2005 17:05:32 -0000	1.16
--- CommonsMultipartResolver.java	21 Apr 2006 00:13:50 -0000	1.16.4.1
***************
*** 1,11 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 187,191 ****
  		// its own encoding that does not match the default encoding.
  		if (!enc.equals(this.defaultEncoding)) {
! 			fileUpload = new DiskFileUpload();
  			fileUpload.setSizeMax(this.fileUpload.getSizeMax());
  			fileUpload.setSizeThreshold(this.fileUpload.getSizeThreshold());
--- 187,191 ----
  		// its own encoding that does not match the default encoding.
  		if (!enc.equals(this.defaultEncoding)) {
! 			fileUpload = newFileUpload();
  			fileUpload.setSizeMax(this.fileUpload.getSizeMax());
  			fileUpload.setSizeThreshold(this.fileUpload.getSizeThreshold());

[Springframework-cvs] spring/src/org/springframework/web/servlet/handler SimpleMappingExceptionResolver.java,1.11.2.2,1.11.2.3

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/web/servlet/handler
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/src/org/springframework/web/servlet/handler

Modified Files:
      Tag: mbranch-1-2
	SimpleMappingExceptionResolver.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: SimpleMappingExceptionResolver.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -C2 -d -r1.11.2.2 -r1.11.2.3
*** SimpleMappingExceptionResolver.java	23 Feb 2006 22:37:06 -0000	1.11.2.2
--- SimpleMappingExceptionResolver.java	21 Apr 2006 00:13:50 -0000	1.11.2.3
***************
*** 30,33 ****
--- 30,34 ----
  import org.springframework.web.servlet.HandlerExceptionResolver;
  import org.springframework.web.servlet.ModelAndView;
+ import org.springframework.web.util.WebUtils;
  
  /**
***************
*** 121,129 ****
  
  	/**
! 	 * Set the default HTTP status code that this exception resolver
! 	 * will apply if it resolves an error view.
! 	 * <p>If not specified, no status code will be applied, either
! 	 * leaving this to the controller or view, or keeping the servlet
! 	 * engine's default of 200 (OK).
  	 * @param defaultStatusCode HTTP status code value, for example
  	 * 500 (SC_INTERNAL_SERVER_ERROR) or 404 (SC_NOT_FOUND)
--- 122,132 ----
  
  	/**
! 	 * Set the default HTTP status code that this exception resolver will apply
! 	 * if it resolves an error view.
! 	 * <p>Note that this error code will only get applied in case of a top-level
! 	 * request. It will not be set for an include request, since the HTTP status
! 	 * cannot be modified from within an include.
! 	 * <p>If not specified, no status code will be applied, either leaving this to
! 	 * the controller or view, or keeping the servlet engine's default of 200 (OK).
  	 * @param defaultStatusCode HTTP status code value, for example
  	 * 500 (SC_INTERNAL_SERVER_ERROR) or 404 (SC_NOT_FOUND)
***************
*** 169,173 ****
  		if (viewName != null) {
  			// Apply HTTP status code for error views, if specified.
! 			if (this.defaultStatusCode != null) {
  				response.setStatus(this.defaultStatusCode.intValue());
  			}
--- 172,177 ----
  		if (viewName != null) {
  			// Apply HTTP status code for error views, if specified.
! 			// Only apply it if we're processing a top-level request.
! 			if (this.defaultStatusCode != null && !WebUtils.isIncludeRequest(request)) {
  				response.setStatus(this.defaultStatusCode.intValue());
  			}
***************
*** 188,191 ****
--- 192,196 ----
  	 */
  	protected String findMatchingViewName(Properties exceptionMappings, Exception ex) {
+ 		String viewName = null;
  		int deepest = Integer.MAX_VALUE;
  		for (Enumeration names = this.exceptionMappings.propertyNames(); names.hasMoreElements();) {
***************
*** 194,201 ****
  			if (depth >= 0 && depth < deepest) {
  				deepest = depth;
! 				return this.exceptionMappings.getProperty(exceptionMapping);
  			}
  		}
! 		return null;
  	}
  
--- 199,206 ----
  			if (depth >= 0 && depth < deepest) {
  				deepest = depth;
! 				viewName = this.exceptionMappings.getProperty(exceptionMapping);
  			}
  		}
! 		return viewName;
  	}
  

[Springframework-cvs] spring/src/org/springframework/web/servlet/view AbstractCachingViewResolver.java,1.24.4.1,1.24.4.2 BeanNameViewResolver.java,1.6,1.6.4.1 InternalResourceView.java,1.19.4.1,1.19.4.2

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/web/servlet/view
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/src/org/springframework/web/servlet/view

Modified Files:
      Tag: mbranch-1-2
	AbstractCachingViewResolver.java BeanNameViewResolver.java 
	InternalResourceView.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: BeanNameViewResolver.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/servlet/view/BeanNameViewResolver.java,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -C2 -d -r1.6 -r1.6.4.1
*** BeanNameViewResolver.java	25 Mar 2005 09:28:14 -0000	1.6
--- BeanNameViewResolver.java	21 Apr 2006 00:13:50 -0000	1.6.4.1
***************
*** 1,11 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 20,24 ****
  
  import org.springframework.beans.BeansException;
! import org.springframework.beans.factory.NoSuchBeanDefinitionException;
  import org.springframework.core.Ordered;
  import org.springframework.web.context.support.WebApplicationObjectSupport;
--- 20,24 ----
  
  import org.springframework.beans.BeansException;
! import org.springframework.context.ApplicationContext;
  import org.springframework.core.Ordered;
  import org.springframework.web.context.support.WebApplicationObjectSupport;
***************
*** 57,60 ****
--- 57,61 ----
  	private int order = Integer.MAX_VALUE;  // default: same as non-Ordered
  
+ 
  	public void setOrder(int order) {
  		this.order = order;
***************
*** 65,76 ****
  	}
  
  	public View resolveViewName(String viewName, Locale locale) throws BeansException {
! 		try {
! 			return (View) getApplicationContext().getBean(viewName, View.class);
! 		}
! 		catch (NoSuchBeanDefinitionException ex) {
! 			// to allow for ViewResolver chaining
  			return null;
  		}
  	}
  
--- 66,77 ----
  	}
  
+ 
  	public View resolveViewName(String viewName, Locale locale) throws BeansException {
! 		ApplicationContext context = getApplicationContext();
! 		if (!context.containsBean(viewName)) {
! 			// Allow for ViewResolver chaining.
  			return null;
  		}
+ 		return (View) context.getBean(viewName, View.class);
  	}
  

Index: InternalResourceView.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/servlet/view/InternalResourceView.java,v
retrieving revision 1.19.4.1
retrieving revision 1.19.4.2
diff -C2 -d -r1.19.4.1 -r1.19.4.2
*** InternalResourceView.java	17 Jan 2006 21:29:36 -0000	1.19.4.1
--- InternalResourceView.java	21 Apr 2006 00:13:50 -0000	1.19.4.2
***************
*** 1,11 ****
  /*
   * Copyright 2002-2006 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
   * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 25,29 ****
  import javax.servlet.http.HttpServletResponse;
  
! import org.springframework.web.util.UrlPathHelper;
  
  /**
--- 25,29 ----
  import javax.servlet.http.HttpServletResponse;
  
! import org.springframework.web.util.WebUtils;
  
  /**
***************
*** 182,185 ****
--- 182,186 ----
  	protected String prepareForRendering(HttpServletRequest request, HttpServletResponse response)
  			throws Exception {
+ 
  		return getUrl();
  	}
***************
*** 197,205 ****
  	 * @see javax.servlet.RequestDispatcher#include
  	 * @see javax.servlet.ServletResponse#isCommitted
! 	 * @see org.springframework.web.util.UrlPathHelper#INCLUDE_URI_REQUEST_ATTRIBUTE
  	 */
  	protected boolean useInclude(HttpServletRequest request, HttpServletResponse response) {
! 		return request.getAttribute(UrlPathHelper.INCLUDE_URI_REQUEST_ATTRIBUTE) != null ||
! 				response.isCommitted();
  	}
  
--- 198,205 ----
  	 * @see javax.servlet.RequestDispatcher#include
  	 * @see javax.servlet.ServletResponse#isCommitted
! 	 * @see org.springframework.web.util.WebUtils#isIncludeRequest
  	 */
  	protected boolean useInclude(HttpServletRequest request, HttpServletResponse response) {
! 		return (WebUtils.isIncludeRequest(request) || response.isCommitted());
  	}
  

Index: AbstractCachingViewResolver.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/servlet/view/AbstractCachingViewResolver.java,v
retrieving revision 1.24.4.1
retrieving revision 1.24.4.2
diff -C2 -d -r1.24.4.1 -r1.24.4.2
*** AbstractCachingViewResolver.java	2 Jan 2006 23:41:03 -0000	1.24.4.1
--- AbstractCachingViewResolver.java	21 Apr 2006 00:13:50 -0000	1.24.4.2
***************
*** 1,11 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 88,91 ****
--- 88,100 ----
  	
  	/**
+ 	 * Return the cache key for the given viewName and the given locale.
+ 	 * Needs to regard the locale in general, as a different locale can lead to a
+ 	 * different view! Can be overridden in subclasses.
+ 	 */
+ 	protected String getCacheKey(String viewName, Locale locale) {
+ 		return viewName + "_" + locale;
+ 	}
+ 
+ 	/**
  	 * Provides functionality to clear the cache for a certain view.
  	 * This can be handy in case developer are able to modify views
***************
*** 102,107 ****
  		else {
  			String cacheKey = getCacheKey(viewName, locale);
! 			if (viewCache.remove(cacheKey) == null) {
! 				// some debug output might be useful
  				if (logger.isDebugEnabled()) {
  					logger.debug("No cached instance for view '" + cacheKey + "' was found");
--- 111,116 ----
  		else {
  			String cacheKey = getCacheKey(viewName, locale);
! 			if (this.viewCache.remove(cacheKey) == null) {
! 				// Some debug output might be useful...
  				if (logger.isDebugEnabled()) {
  					logger.debug("No cached instance for view '" + cacheKey + "' was found");
***************
*** 110,114 ****
  			else {
  				if (logger.isDebugEnabled()) {
! 					logger.debug("Cach for view " + cacheKey + " has been cleared");
  				}
  			}
--- 119,123 ----
  			else {
  				if (logger.isDebugEnabled()) {
! 					logger.debug("Cache for view " + cacheKey + " has been cleared");
  				}
  			}
***************
*** 117,128 ****
  
  	/**
! 	 * Return the cache key for the given viewName and the given locale.
! 	 * Needs to regard the locale in general, as a different locale can lead to a
! 	 * different view! Can be overridden in subclasses.
  	 */
! 	protected String getCacheKey(String viewName, Locale locale) {
! 		return viewName + "_" + locale;
  	}
  
  	/**
  	 * Create the actual View object.
--- 126,140 ----
  
  	/**
! 	 * Clear the entire view cache, removing all cached view objects.
! 	 * Subsequent resolve calls will lead to recreation of demanded view objects.
  	 */
! 	public void clearCache() {
! 		logger.debug("Clearing entire view cache");
! 		synchronized (this.viewCache) {
! 			this.viewCache.clear();
! 		}
  	}
  
+ 
  	/**
  	 * Create the actual View object.

[Springframework-cvs] spring/src/org/springframework/web/context ContextLoader.java,1.30,1.30.2.1

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/web/context
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/src/org/springframework/web/context

Modified Files:
      Tag: mbranch-1-2
	ContextLoader.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: ContextLoader.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/context/ContextLoader.java,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C2 -d -r1.30 -r1.30.2.1
*** ContextLoader.java	13 Nov 2005 23:27:35 -0000	1.30
--- ContextLoader.java	21 Apr 2006 00:13:50 -0000	1.30.2.1
***************
*** 1,9 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
--- 1,9 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
***************
*** 158,172 ****
  
  	/**
! 	 * Initialize Spring's web application context for the given servlet
! 	 * context, regarding the "contextClass" and "contextConfigLocation"
! 	 * context-params.
  	 * @param servletContext current servlet context
  	 * @return the new WebApplicationContext
! 	 * @throws BeansException if the context couldn't be initialized
  	 * @see #CONTEXT_CLASS_PARAM
  	 * @see #CONFIG_LOCATION_PARAM
  	 */
  	public WebApplicationContext initWebApplicationContext(ServletContext servletContext)
! 			throws BeansException {
  
  		long startTime = System.currentTimeMillis();
--- 158,178 ----
  
  	/**
! 	 * Initialize Spring's web application context for the given servlet context,
! 	 * according to the "contextClass" and "contextConfigLocation" context-params.
  	 * @param servletContext current servlet context
  	 * @return the new WebApplicationContext
! 	 * @throws IllegalStateException if there is already a root application context present
! 	 * @throws BeansException if the context failed to initialize
  	 * @see #CONTEXT_CLASS_PARAM
  	 * @see #CONFIG_LOCATION_PARAM
  	 */
  	public WebApplicationContext initWebApplicationContext(ServletContext servletContext)
! 			throws IllegalStateException, BeansException {
! 
! 		if (servletContext.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE) != null) {
! 			throw new IllegalStateException(
! 					"Cannot initialize context because there is already a root application context present - " +
! 					"check whether you have multiple ContextLoader* definitions in your web.xml!");
! 		}
  
  		long startTime = System.currentTimeMillis();
***************
*** 271,275 ****
  			contextClassName = defaultStrategies.getProperty(WebApplicationContext.class.getName());
  			try {
! 				return Class.forName(contextClassName, true, getClass().getClassLoader());
  			}
  			catch (ClassNotFoundException ex) {
--- 277,281 ----
  			contextClassName = defaultStrategies.getProperty(WebApplicationContext.class.getName());
  			try {
! 				return ClassUtils.forName(contextClassName);
  			}
  			catch (ClassNotFoundException ex) {

[Springframework-cvs] spring/test/org/springframework/orm/hibernate/support LobTypeTests.java,1.11,1.11.4.1

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/test/org/springframework/orm/hibernate/support
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/test/org/springframework/orm/hibernate/support

Modified Files:
      Tag: mbranch-1-2
	LobTypeTests.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: LobTypeTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/test/org/springframework/orm/hibernate/support/LobTypeTests.java,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -C2 -d -r1.11 -r1.11.4.1
*** LobTypeTests.java	25 Mar 2005 09:28:32 -0000	1.11
--- LobTypeTests.java	21 Apr 2006 00:13:51 -0000	1.11.4.1
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 35,44 ****
  import net.sf.hibernate.Session;
  import net.sf.hibernate.SessionFactory;
- import org.easymock.ArgumentsMatcher;
  import org.easymock.MockControl;
  
  import org.springframework.jdbc.support.lob.LobCreator;
  import org.springframework.jdbc.support.lob.LobHandler;
  import org.springframework.orm.hibernate.SessionFactoryUtils;
  import org.springframework.transaction.support.TransactionSynchronization;
  import org.springframework.transaction.support.TransactionSynchronizationManager;
--- 35,45 ----
  import net.sf.hibernate.Session;
  import net.sf.hibernate.SessionFactory;
  import org.easymock.MockControl;
+ import org.easymock.internal.ArrayMatcher;
  
  import org.springframework.jdbc.support.lob.LobCreator;
  import org.springframework.jdbc.support.lob.LobHandler;
  import org.springframework.orm.hibernate.SessionFactoryUtils;
+ import org.springframework.transaction.MockJtaTransaction;
  import org.springframework.transaction.support.TransactionSynchronization;
  import org.springframework.transaction.support.TransactionSynchronizationManager;
***************
*** 189,193 ****
  		MockControl tmControl = MockControl.createControl(TransactionManager.class);
  		TransactionManager tm = (TransactionManager) tmControl.getMock();
! 		org.springframework.transaction.MockJtaTransaction transaction = new org.springframework.transaction.MockJtaTransaction();
  		tm.getStatus();
  		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
--- 190,194 ----
  		MockControl tmControl = MockControl.createControl(TransactionManager.class);
  		TransactionManager tm = (TransactionManager) tmControl.getMock();
! 		MockJtaTransaction transaction = new MockJtaTransaction();
  		tm.getStatus();
  		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
***************
*** 217,221 ****
  		MockControl tmControl = MockControl.createControl(TransactionManager.class);
  		TransactionManager tm = (TransactionManager) tmControl.getMock();
! 		org.springframework.transaction.MockJtaTransaction transaction = new org.springframework.transaction.MockJtaTransaction();
  		tm.getStatus();
  		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
--- 218,222 ----
  		MockControl tmControl = MockControl.createControl(TransactionManager.class);
  		TransactionManager tm = (TransactionManager) tmControl.getMock();
! 		MockJtaTransaction transaction = new MockJtaTransaction();
  		tm.getStatus();
  		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
***************
*** 241,244 ****
--- 242,359 ----
  	}
  
+ 	public void testBlobStringType() throws Exception {
+ 		String content = "content";
+ 		byte[] contentBytes = content.getBytes();
+ 		lobHandler.getBlobAsBytes(rs, 1);
+ 		lobHandlerControl.setReturnValue(contentBytes);
+ 		lobCreator.setBlobAsBytes(ps, 1, contentBytes);
+ 		lobCreatorControl.setMatcher(new ArrayMatcher());
+ 
+ 		lobHandlerControl.replay();
+ 		lobCreatorControl.replay();
+ 
+ 		BlobStringType type = new BlobStringType(lobHandler, null);
+ 		assertEquals(1, type.sqlTypes().length);
+ 		assertEquals(Types.BLOB, type.sqlTypes()[0]);
+ 		assertEquals(String.class, type.returnedClass());
+ 		assertTrue(type.equals("content", "content"));
+ 		assertEquals("content", type.deepCopy("content"));
+ 		assertFalse(type.isMutable());
+ 
+ 		assertEquals(content, type.nullSafeGet(rs, new String[] {"column"}, null));
+ 		TransactionSynchronizationManager.initSynchronization();
+ 		try {
+ 			type.nullSafeSet(ps, content, 1);
+ 			List synchs = TransactionSynchronizationManager.getSynchronizations();
+ 			assertEquals(1, synchs.size());
+ 			((TransactionSynchronization) synchs.get(0)).beforeCompletion();
+ 			((TransactionSynchronization) synchs.get(0)).afterCompletion(TransactionSynchronization.STATUS_COMMITTED);
+ 		}
+ 		finally {
+ 			TransactionSynchronizationManager.clearSynchronization();
+ 		}
+ 	}
+ 
+ 	public void testBlobStringTypeWithNull() throws Exception {
+ 		lobHandler.getBlobAsBytes(rs, 1);
+ 		lobHandlerControl.setReturnValue(null);
+ 		lobCreator.setBlobAsBytes(ps, 1, null);
+ 
+ 		lobHandlerControl.replay();
+ 		lobCreatorControl.replay();
+ 
+ 		BlobStringType type = new BlobStringType(lobHandler, null);
+ 		assertEquals(null, type.nullSafeGet(rs, new String[] {"column"}, null));
+ 		TransactionSynchronizationManager.initSynchronization();
+ 		try {
+ 			type.nullSafeSet(ps, null, 1);
+ 			List synchs = TransactionSynchronizationManager.getSynchronizations();
+ 			assertEquals(1, synchs.size());
+ 			((TransactionSynchronization) synchs.get(0)).beforeCompletion();
+ 		}
+ 		finally {
+ 			TransactionSynchronizationManager.clearSynchronization();
+ 		}
+ 	}
+ 
+ 	public void testBlobStringTypeWithJtaSynchronization() throws Exception {
+ 		MockControl tmControl = MockControl.createControl(TransactionManager.class);
+ 		TransactionManager tm = (TransactionManager) tmControl.getMock();
+ 		MockJtaTransaction transaction = new MockJtaTransaction();
+ 		tm.getStatus();
+ 		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
+ 		tm.getTransaction();
+ 		tmControl.setReturnValue(transaction, 1);
+ 
+ 		String content = "content";
+ 		byte[] contentBytes = content.getBytes();
+ 		lobHandler.getBlobAsBytes(rs, 1);
+ 		lobHandlerControl.setReturnValue(contentBytes);
+ 		lobCreator.setBlobAsBytes(ps, 1, contentBytes);
+ 		lobCreatorControl.setMatcher(new ArrayMatcher());
+ 
+ 		lobHandlerControl.replay();
+ 		lobCreatorControl.replay();
+ 
+ 		BlobStringType type = new BlobStringType(lobHandler, tm);
+ 		assertEquals(content, type.nullSafeGet(rs, new String[] {"column"}, null));
+ 		tmControl.replay();
+ 		type.nullSafeSet(ps, content, 1);
+ 		Synchronization synch = transaction.getSynchronization();
+ 		assertNotNull(synch);
+ 		synch.beforeCompletion();
+ 		synch.afterCompletion(Status.STATUS_COMMITTED);
+ 		tmControl.verify();
+ 	}
+ 
+ 	public void testBlobStringTypeWithJtaSynchronizationAndRollback() throws Exception {
+ 		MockControl tmControl = MockControl.createControl(TransactionManager.class);
+ 		TransactionManager tm = (TransactionManager) tmControl.getMock();
+ 		MockJtaTransaction transaction = new MockJtaTransaction();
+ 		tm.getStatus();
+ 		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
+ 		tm.getTransaction();
+ 		tmControl.setReturnValue(transaction, 1);
+ 
+ 		String content = "content";
+ 		byte[] contentBytes = content.getBytes();
+ 		lobHandler.getBlobAsBytes(rs, 1);
+ 		lobHandlerControl.setReturnValue(contentBytes);
+ 		lobCreator.setBlobAsBytes(ps, 1, contentBytes);
+ 		lobCreatorControl.setMatcher(new ArrayMatcher());
+ 
+ 		lobHandlerControl.replay();
+ 		lobCreatorControl.replay();
+ 
+ 		BlobStringType type = new BlobStringType(lobHandler, tm);
+ 		assertEquals(content, type.nullSafeGet(rs, new String[] {"column"}, null));
+ 		tmControl.replay();
+ 		type.nullSafeSet(ps, content, 1);
+ 		Synchronization synch = transaction.getSynchronization();
+ 		assertNotNull(synch);
+ 		synch.afterCompletion(Status.STATUS_ROLLEDBACK);
+ 		tmControl.verify();
+ 	}
+ 
  	public void testBlobByteArrayType() throws Exception {
  		byte[] content = "content".getBytes();
***************
*** 276,280 ****
  		MockControl tmControl = MockControl.createControl(TransactionManager.class);
  		TransactionManager tm = (TransactionManager) tmControl.getMock();
! 		org.springframework.transaction.MockJtaTransaction transaction = new org.springframework.transaction.MockJtaTransaction();
  		tm.getStatus();
  		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
--- 391,395 ----
  		MockControl tmControl = MockControl.createControl(TransactionManager.class);
  		TransactionManager tm = (TransactionManager) tmControl.getMock();
! 		MockJtaTransaction transaction = new MockJtaTransaction();
  		tm.getStatus();
  		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
***************
*** 305,309 ****
  		MockControl tmControl = MockControl.createControl(TransactionManager.class);
  		TransactionManager tm = (TransactionManager) tmControl.getMock();
! 		org.springframework.transaction.MockJtaTransaction transaction = new org.springframework.transaction.MockJtaTransaction();
  		tm.getStatus();
  		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
--- 420,424 ----
  		MockControl tmControl = MockControl.createControl(TransactionManager.class);
  		TransactionManager tm = (TransactionManager) tmControl.getMock();
! 		MockJtaTransaction transaction = new MockJtaTransaction();
  		tm.getStatus();
  		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
***************
*** 339,350 ****
  		lobHandlerControl.setReturnValue(new ByteArrayInputStream(baos.toByteArray()));
  		lobCreator.setBlobAsBytes(ps, 1, baos.toByteArray());
! 		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
! 			public boolean matches(Object[] o1, Object[] o2) {
! 				return Arrays.equals((byte[]) o1[2], (byte[]) o2[2]);
! 			}
! 			public String toString(Object[] objects) {
! 				return null;
! 			}
! 		});
  
  		lobHandlerControl.replay();
--- 454,458 ----
  		lobHandlerControl.setReturnValue(new ByteArrayInputStream(baos.toByteArray()));
  		lobCreator.setBlobAsBytes(ps, 1, baos.toByteArray());
! 		lobCreatorControl.setMatcher(new ArrayMatcher());
  
  		lobHandlerControl.replay();
***************
*** 396,400 ****
  		MockControl tmControl = MockControl.createControl(TransactionManager.class);
  		TransactionManager tm = (TransactionManager) tmControl.getMock();
! 		org.springframework.transaction.MockJtaTransaction transaction = new org.springframework.transaction.MockJtaTransaction();
  		tm.getStatus();
  		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
--- 504,508 ----
  		MockControl tmControl = MockControl.createControl(TransactionManager.class);
  		TransactionManager tm = (TransactionManager) tmControl.getMock();
! 		MockJtaTransaction transaction = new MockJtaTransaction();
  		tm.getStatus();
  		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
***************
*** 410,421 ****
  		lobHandlerControl.setReturnValue(new ByteArrayInputStream(baos.toByteArray()));
  		lobCreator.setBlobAsBytes(ps, 1, baos.toByteArray());
! 		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
! 			public boolean matches(Object[] o1, Object[] o2) {
! 				return Arrays.equals((byte[]) o1[2], (byte[]) o2[2]);
! 			}
! 			public String toString(Object[] objects) {
! 				return null;
! 			}
! 		});
  
  		lobHandlerControl.replay();
--- 518,522 ----
  		lobHandlerControl.setReturnValue(new ByteArrayInputStream(baos.toByteArray()));
  		lobCreator.setBlobAsBytes(ps, 1, baos.toByteArray());
! 		lobCreatorControl.setMatcher(new ArrayMatcher());
  
  		lobHandlerControl.replay();
***************
*** 441,445 ****
  		MockControl tmControl = MockControl.createControl(TransactionManager.class);
  		TransactionManager tm = (TransactionManager) tmControl.getMock();
! 		org.springframework.transaction.MockJtaTransaction transaction = new org.springframework.transaction.MockJtaTransaction();
  		tm.getStatus();
  		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
--- 542,546 ----
  		MockControl tmControl = MockControl.createControl(TransactionManager.class);
  		TransactionManager tm = (TransactionManager) tmControl.getMock();
! 		MockJtaTransaction transaction = new MockJtaTransaction();
  		tm.getStatus();
  		tmControl.setReturnValue(Status.STATUS_ACTIVE, 1);
***************
*** 455,466 ****
  		lobHandlerControl.setReturnValue(new ByteArrayInputStream(baos.toByteArray()));
  		lobCreator.setBlobAsBytes(ps, 1, baos.toByteArray());
! 		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
! 			public boolean matches(Object[] o1, Object[] o2) {
! 				return Arrays.equals((byte[]) o1[2], (byte[]) o2[2]);
! 			}
! 			public String toString(Object[] objects) {
! 				return null;
! 			}
! 		});
  
  		lobHandlerControl.replay();
--- 556,560 ----
  		lobHandlerControl.setReturnValue(new ByteArrayInputStream(baos.toByteArray()));
  		lobCreator.setBlobAsBytes(ps, 1, baos.toByteArray());
! 		lobCreatorControl.setMatcher(new ArrayMatcher());
  
  		lobHandlerControl.replay();

[Springframework-cvs] spring/test/org/springframework/remoting/rmi RmiSupportTests.java,1.6,1.6.4.1

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/test/org/springframework/remoting/rmi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/test/org/springframework/remoting/rmi

Modified Files:
      Tag: mbranch-1-2
	RmiSupportTests.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: RmiSupportTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/test/org/springframework/remoting/rmi/RmiSupportTests.java,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -C2 -d -r1.6 -r1.6.4.1
*** RmiSupportTests.java	25 Mar 2005 09:28:37 -0000	1.6
--- RmiSupportTests.java	21 Apr 2006 00:13:51 -0000	1.6.4.1
***************
*** 1,11 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 35,38 ****
--- 35,39 ----
  import org.springframework.remoting.RemoteAccessException;
  import org.springframework.remoting.RemoteConnectFailureException;
+ import org.springframework.remoting.RemoteProxyFailureException;
  import org.springframework.remoting.support.RemoteInvocation;
  
***************
*** 174,177 ****
--- 175,198 ----
  	}
  
+ 	public void testRmiProxyFactoryBeanWithWrongBusinessInterface() throws Exception {
+ 		CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean();
+ 		factory.setServiceInterface(IWrongBusinessBean.class);
+ 		factory.setServiceUrl("rmi://localhost:1090/test");
+ 		factory.afterPropertiesSet();
+ 		assertTrue(factory.getObject() instanceof IWrongBusinessBean);
+ 		IWrongBusinessBean proxy = (IWrongBusinessBean) factory.getObject();
+ 		assertFalse(proxy instanceof IRemoteBean);
+ 		try {
+ 			proxy.setOtherName("name");
+ 			fail("Should have thrown RemoteProxyFailureException");
+ 		}
+ 		catch (RemoteProxyFailureException ex) {
+ 			assertTrue(ex.getCause() instanceof NoSuchMethodException);
+ 			assertTrue(ex.getMessage().indexOf("setOtherName") != -1);
+ 			assertTrue(ex.getMessage().indexOf("IWrongBusinessBean") != -1);
+ 		}
+ 		assertEquals(1, factory.counter);
+ 	}
+ 
  	public void testRmiProxyFactoryBeanWithBusinessInterfaceAndRemoteException() throws Exception {
  		doTestRmiProxyFactoryBeanWithBusinessInterfaceAndException(
***************
*** 216,219 ****
--- 237,241 ----
  	private void doTestRmiProxyFactoryBeanWithBusinessInterfaceAndException(
  			Class rmiExceptionClass, Class springExceptionClass) throws Exception {
+ 
  		CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean();
  		factory.setServiceInterface(IBusinessBean.class);
***************
*** 403,406 ****
--- 425,435 ----
  
  
+ 	public static interface IWrongBusinessBean {
+ 
+ 		public void setOtherName(String name);
+ 
+ 	}
+ 
+ 
  	public static interface IRemoteBean extends Remote {
  

[Springframework-cvs] spring/test/org/springframework/context/support StaticMessageSourceTests.java,1.4,1.4.4.1

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/test/org/springframework/context/support
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/test/org/springframework/context/support

Modified Files:
      Tag: mbranch-1-2
	StaticMessageSourceTests.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: StaticMessageSourceTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/test/org/springframework/context/support/StaticMessageSourceTests.java,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -d -r1.4 -r1.4.4.1
*** StaticMessageSourceTests.java	6 Apr 2005 21:31:58 -0000	1.4
--- StaticMessageSourceTests.java	21 Apr 2006 00:13:51 -0000	1.4.4.1
***************
*** 1,11 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 229,231 ****
--- 229,259 ----
  	}
  
+ 	public void testNestedMessageSourceWithParamInChild() {
+ 		StaticMessageSource source = new StaticMessageSource();
+ 		StaticMessageSource parent = new StaticMessageSource();
+ 		source.setParentMessageSource(parent);
+ 
+ 		source.addMessage("param", Locale.ENGLISH, "value");
+ 		parent.addMessage("with.param", Locale.ENGLISH, "put {0} here");
+ 
+ 		MessageSourceResolvable resolvable = new DefaultMessageSourceResolvable(
+ 				new String[] {"with.param"}, new Object[] {new DefaultMessageSourceResolvable("param")});
+ 
+ 		assertEquals("put value here", source.getMessage(resolvable, Locale.ENGLISH));
+ 	}
+ 
+ 	public void testNestedMessageSourceWithParamInParent() {
+ 		StaticMessageSource source = new StaticMessageSource();
+ 		StaticMessageSource parent = new StaticMessageSource();
+ 		source.setParentMessageSource(parent);
+ 
+ 		parent.addMessage("param", Locale.ENGLISH, "value");
+ 		source.addMessage("with.param", Locale.ENGLISH, "put {0} here");
+ 
+ 		MessageSourceResolvable resolvable = new DefaultMessageSourceResolvable(
+ 				new String[] {"with.param"}, new Object[] {new DefaultMessageSourceResolvable("param")});
+ 
+ 		assertEquals("put value here", source.getMessage(resolvable, Locale.ENGLISH));
+ 	}
+ 
  }

[Springframework-cvs] spring/src/org/springframework/web/servlet/mvc BaseCommandController.java,1.37.2.1,1.37.2.2

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/web/servlet/mvc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/src/org/springframework/web/servlet/mvc

Modified Files:
      Tag: mbranch-1-2
	BaseCommandController.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: BaseCommandController.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/servlet/mvc/BaseCommandController.java,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -C2 -d -r1.37.2.1 -r1.37.2.2
*** BaseCommandController.java	17 Jan 2006 21:29:36 -0000	1.37.2.1
--- BaseCommandController.java	21 Apr 2006 00:13:50 -0000	1.37.2.2
***************
*** 5,11 ****
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 5,11 ----
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 183,201 ****
  
  	/**
- 	 * Set the Validators for this controller.
- 	 * The Validator must support the specified command class.
- 	 */
- 	public final void setValidators(Validator[] validators) {
- 		this.validators = validators;
- 	}
- 
- 	/**
- 	 * Return the Validators for this controller.
- 	 */
- 	public final Validator[] getValidators() {
- 		return validators;
- 	}
- 
- 	/**
  	 * Set the primary Validator for this controller. The Validator
  	 * must support the specified command class. If there are one
--- 183,186 ----
***************
*** 216,219 ****
--- 201,219 ----
  
  	/**
+ 	 * Set the Validators for this controller.
+ 	 * The Validator must support the specified command class.
+ 	 */
+ 	public final void setValidators(Validator[] validators) {
+ 		this.validators = validators;
+ 	}
+ 
+ 	/**
+ 	 * Return the Validators for this controller.
+ 	 */
+ 	public final Validator[] getValidators() {
+ 		return validators;
+ 	}
+ 
+ 	/**
  	 * Set if the Validator should get applied when binding.
  	 */
***************
*** 268,275 ****
  
  	/**
! 	 * Specify one or more PropertyEditorRegistrars to be applied
  	 * to every DataBinder that this controller uses.
  	 * <p>Allows for factoring out the registration of PropertyEditors
! 	 * to separate objects, as alternative to <code>initBinder</code>.
  	 * @see #initBinder
  	 */
--- 268,286 ----
  
  	/**
! 	 * Specify a single PropertyEditorRegistrar to be applied
  	 * to every DataBinder that this controller uses.
  	 * <p>Allows for factoring out the registration of PropertyEditors
! 	 * to separate objects, as an alternative to <code>initBinder</code>.
! 	 * @see #initBinder
! 	 */
! 	public final void setPropertyEditorRegistrar(PropertyEditorRegistrar propertyEditorRegistrar) {
! 		this.propertyEditorRegistrars = new PropertyEditorRegistrar[] {propertyEditorRegistrar};
! 	}
! 
! 	/**
! 	 * Specify multiple PropertyEditorRegistrars to be applied
! 	 * to every DataBinder that this controller uses.
! 	 * <p>Allows for factoring out the registration of PropertyEditors
! 	 * to separate objects, as an alternative to <code>initBinder</code>.
  	 * @see #initBinder
  	 */

[Springframework-cvs] spring/test/org/springframework/beans/factory/config PropertiesFactoryBeanTests.java,1.9,1.9.4.1

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/test/org/springframework/beans/factory/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/test/org/springframework/beans/factory/config

Modified Files:
      Tag: mbranch-1-2
	PropertiesFactoryBeanTests.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: PropertiesFactoryBeanTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/test/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -C2 -d -r1.9 -r1.9.4.1
*** PropertiesFactoryBeanTests.java	24 Jun 2005 17:33:31 -0000	1.9
--- PropertiesFactoryBeanTests.java	21 Apr 2006 00:13:51 -0000	1.9.4.1
***************
*** 1,11 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 74,77 ****
--- 74,105 ----
  	}
  
+ 	public void testWithPropertiesFileAndMultipleLocalProperties() throws Exception {
+ 		PropertiesFactoryBean pfb = new PropertiesFactoryBean();
+ 		pfb.setLocation(new ClassPathResource("/org/springframework/beans/factory/config/test.properties"));
+ 
+ 		Properties props1 = new Properties();
+ 		props1.setProperty("key2", "value2");
+ 		props1.setProperty("tb.array[0].age", "0");
+ 
+ 		Properties props2 = new Properties();
+ 		props2.setProperty("spring", "framework");
+ 		props2.setProperty("Don", "Mattingly");
+ 
+ 		Properties props3 = new Properties();
+ 		props3.setProperty("spider", "man");
+ 		props3.setProperty("bat", "man");
+ 
+ 		pfb.setPropertiesArray(new Properties[] {props1, props2, props3});
+ 		pfb.afterPropertiesSet();
+ 
+ 		Properties props = (Properties) pfb.getObject();
+ 		assertEquals("99", props.getProperty("tb.array[0].age"));
+ 		assertEquals("value2", props.getProperty("key2"));
+ 		assertEquals("framework", props.getProperty("spring"));
+ 		assertEquals("Mattingly", props.getProperty("Don"));
+ 		assertEquals("man", props.getProperty("spider"));
+ 		assertEquals("man", props.getProperty("bat"));
+ 	}
+ 
  	public void testWithPropertiesFileAndLocalPropertiesAndLocalOverride() throws Exception {
  		PropertiesFactoryBean pfb = new PropertiesFactoryBean();

[Springframework-cvs] spring/src/org/springframework/validation ValidationUtils.java,1.14,1.14.4.1

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/validation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/src/org/springframework/validation

Modified Files:
      Tag: mbranch-1-2
	ValidationUtils.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: ValidationUtils.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/validation/ValidationUtils.java,v
retrieving revision 1.14
retrieving revision 1.14.4.1
diff -C2 -d -r1.14 -r1.14.4.1
*** ValidationUtils.java	13 Sep 2005 21:23:20 -0000	1.14
--- ValidationUtils.java	21 Apr 2006 00:13:50 -0000	1.14.4.1
***************
*** 1,11 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 27,32 ****
   * implementations can become one-liners.
   *
-  * <p>Used by BindUtils' <code>bindAndValidate</code> method.
-  *
   * @author Juergen Hoeller
   * @author Dmitriy Kopylenko
--- 27,30 ----
***************
*** 34,38 ****
   * @see Validator
   * @see Errors
-  * @see org.springframework.web.bind.BindUtils#bindAndValidate
   */
  public abstract class ValidationUtils {
--- 32,35 ----
***************
*** 40,59 ****
  	private static Log logger = LogFactory.getLog(ValidationUtils.class);
  
  	/**
  	 * Invoke the given validator for the given object and Errors instance.
  	 * @param validator validator to be invoked, or <code>null</code> if no validation
! 	 * @param object object to bind the parameters to
  	 * @param errors Errors instance that should store the errors
  	 */
! 	public static void invokeValidator(Validator validator, Object object, Errors errors) {
  		if (validator != null) {
  			if (logger.isDebugEnabled()) {
  				logger.debug("Invoking validator [" + validator + "]");
  			}
! 			if (!validator.supports(object.getClass())) {
  				throw new IllegalArgumentException("Validator " + validator.getClass() +
! 						" does not support " + object.getClass());
  			}
! 			validator.validate(object, errors);
  			if (logger.isDebugEnabled()) {
  				if (errors.hasErrors()) {
--- 37,57 ----
  	private static Log logger = LogFactory.getLog(ValidationUtils.class);
  
+ 
  	/**
  	 * Invoke the given validator for the given object and Errors instance.
  	 * @param validator validator to be invoked, or <code>null</code> if no validation
! 	 * @param obj object to bind the parameters to
  	 * @param errors Errors instance that should store the errors
  	 */
! 	public static void invokeValidator(Validator validator, Object obj, Errors errors) {
  		if (validator != null) {
  			if (logger.isDebugEnabled()) {
  				logger.debug("Invoking validator [" + validator + "]");
  			}
! 			if (obj != null && !validator.supports(obj.getClass())) {
  				throw new IllegalArgumentException("Validator " + validator.getClass() +
! 						" does not support " + obj.getClass());
  			}
! 			validator.validate(obj, errors);
  			if (logger.isDebugEnabled()) {
  				if (errors.hasErrors()) {
***************
*** 111,114 ****
--- 109,113 ----
  	public static void rejectIfEmpty(
  			Errors errors, String field, String errorCode, Object[] errorArgs, String defaultMessage) {
+ 
  		Object value = errors.getFieldValue(field);
  		if (value == null || !StringUtils.hasLength(value.toString())) {
***************
*** 144,147 ****
--- 143,147 ----
  	public static void rejectIfEmptyOrWhitespace(
  			Errors errors, String field, String errorCode, String defaultMessage) {
+ 
  		rejectIfEmptyOrWhitespace(errors, field, errorCode, null, defaultMessage);
  	}
***************
*** 162,165 ****
--- 162,166 ----
  	public static void rejectIfEmptyOrWhitespace(
  			Errors errors, String field, String errorCode, Object[] errorArgs, String defaultMessage) {
+ 
  		Object value = errors.getFieldValue(field);
  		if (value == null ||!StringUtils.hasText(value.toString())) {

[Springframework-cvs] spring/test/org/springframework/beans/propertyeditors CustomEditorTests.java,1.5,1.5.2.1

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/test/org/springframework/beans/propertyeditors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/test/org/springframework/beans/propertyeditors

Modified Files:
      Tag: mbranch-1-2
	CustomEditorTests.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: CustomEditorTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/test/org/springframework/beans/propertyeditors/CustomEditorTests.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** CustomEditorTests.java	14 Oct 2005 11:03:07 -0000	1.5
--- CustomEditorTests.java	21 Apr 2006 00:13:51 -0000	1.5.2.1
***************
*** 402,409 ****
  
  	public void testByteArrayPropertyEditor() {
! 		ByteArrayBean bean = new ByteArrayBean();
  		BeanWrapper bw = new BeanWrapperImpl(bean);
! 		bw.setPropertyValue("array", "myvalue");
! 		assertEquals("myvalue", new String(bean.getArray()));
  	}
  
--- 402,416 ----
  
  	public void testByteArrayPropertyEditor() {
! 		PrimitiveArrayBean bean = new PrimitiveArrayBean();
  		BeanWrapper bw = new BeanWrapperImpl(bean);
! 		bw.setPropertyValue("byteArray", "myvalue");
! 		assertEquals("myvalue", new String(bean.getByteArray()));
! 	}
! 
! 	public void testCharArrayPropertyEditor() {
! 		PrimitiveArrayBean bean = new PrimitiveArrayBean();
! 		BeanWrapper bw = new BeanWrapperImpl(bean);
! 		bw.setPropertyValue("charArray", "myvalue");
! 		assertEquals("myvalue", new String(bean.getCharArray()));
  	}
  
***************
*** 417,420 ****
--- 424,433 ----
  		bw.setPropertyValue("myChar", "c");
  		assertEquals('c', cb.getMyChar());
+ 
+ 		bw.setPropertyValue("myChar", "\u0041");
+ 		assertEquals('A', cb.getMyChar());
+ 
+ 		bw.setPropertyValue("myChar", "\\u0022");
+ 		assertEquals('"', cb.getMyChar());
  	}
  
***************
*** 430,433 ****
--- 443,449 ----
  		assertEquals(new Character('c'), cb.getMyCharacter());
  
+ 		bw.setPropertyValue("myCharacter", "\u0041");
+ 		assertEquals(new Character('A'), cb.getMyCharacter());
+ 
  		bw.setPropertyValue("myCharacter", "");
  		assertNull(cb.getMyCharacter());
***************
*** 1139,1152 ****
  
  
! 	private static class ByteArrayBean {
  
! 		private byte[] array;
  
! 		public byte[] getArray() {
! 			return array;
  		}
  
! 		public void setArray(byte[] array) {
! 			this.array = array;
  		}
  	}
--- 1155,1178 ----
  
  
! 	private static class PrimitiveArrayBean {
  
! 		private byte[] byteArray;
  
! 		private char[] charArray;
! 
! 		public byte[] getByteArray() {
! 			return byteArray;
  		}
  
! 		public void setByteArray(byte[] byteArray) {
! 			this.byteArray = byteArray;
! 		}
! 
! 		public char[] getCharArray() {
! 			return charArray;
! 		}
! 
! 		public void setCharArray(char[] charArray) {
! 			this.charArray = charArray;
  		}
  	}

[Springframework-cvs] spring/src/org/springframework/web/servlet/mvc/multiaction MultiActionController.java,1.24.2.1,1.24.2.2

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/web/servlet/mvc/multiaction
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/src/org/springframework/web/servlet/mvc/multiaction

Modified Files:
      Tag: mbranch-1-2
	MultiActionController.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: MultiActionController.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -C2 -d -r1.24.2.1 -r1.24.2.2
*** MultiActionController.java	23 Dec 2005 13:52:04 -0000	1.24.2.1
--- MultiActionController.java	21 Apr 2006 00:13:50 -0000	1.24.2.2
***************
*** 1,11 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 289,293 ****
  	 * @see org.springframework.web.servlet.mvc.LastModified#getLastModified(HttpServletRequest)
  	 */
! 	public final long getLastModified(HttpServletRequest request) {
  		try {
  			String handlerMethodName = this.methodNameResolver.getHandlerMethodName(request);
--- 289,293 ----
  	 * @see org.springframework.web.servlet.mvc.LastModified#getLastModified(HttpServletRequest)
  	 */
! 	public long getLastModified(HttpServletRequest request) {
  		try {
  			String handlerMethodName = this.methodNameResolver.getHandlerMethodName(request);
***************
*** 302,306 ****
  					// We encountered an error invoking the last-modified method.
  					// We can't do anything useful except log this, as we can't throw an exception.
! 					logger.error("Failed to invoke lastModified method", ex);
  				}
  			}	// if we had a lastModified method for this request
--- 302,306 ----
  					// We encountered an error invoking the last-modified method.
  					// We can't do anything useful except log this, as we can't throw an exception.
! 					logger.error("Failed to invoke last-modified method", ex);
  				}
  			}	// if we had a lastModified method for this request
***************
*** 311,315 ****
  			// has generated content. Do nothing, that's OK: We'll return default.
  		}
- 		// the default if we didn't find a method
  		return -1L;
  	}
--- 311,314 ----
***************
*** 317,323 ****
  
  	//---------------------------------------------------------------------
! 	// Implementation of Controller
  	//---------------------------------------------------------------------
  
  	protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response)
  	    throws Exception {
--- 316,328 ----
  
  	//---------------------------------------------------------------------
! 	// Implementation of AbstractController
  	//---------------------------------------------------------------------
  
+ 	/**
+ 	 * Determine a handler method and invoke it.
+ 	 * @see MethodNameResolver#getHandlerMethodName
+ 	 * @see #invokeNamedMethod
+ 	 * @see #handleNoSuchRequestHandlingMethod
+ 	 */
  	protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response)
  	    throws Exception {
***************
*** 327,336 ****
  		}
  		catch (NoSuchRequestHandlingMethodException ex) {
! 			pageNotFoundLogger.warn(ex.getMessage());
! 			response.sendError(HttpServletResponse.SC_NOT_FOUND);
! 			return null;
  		}
  	}
! 	
  	/**
  	 * Invokes the named method.
--- 332,359 ----
  		}
  		catch (NoSuchRequestHandlingMethodException ex) {
! 			return handleNoSuchRequestHandlingMethod(ex, request, response);
  		}
  	}
! 
! 	/**
! 	 * Handle the case where no request handler method was found.
! 	 * <p>The default implementation logs a warning and sends an HTTP 404 error.
! 	 * Alternatively, a fallback view could be chosen, or the
! 	 * NoSuchRequestHandlingMethodException could be rethrown as-is.
! 	 * @param ex the NoSuchRequestHandlingMethodException to be handled
! 	 * @param request current HTTP request
! 	 * @param response current HTTP response
! 	 * @return a ModelAndView to render, or <code>null</code> if handled directly
! 	 * @throws Exception an Exception that should be thrown as result of the servlet request
! 	 */
! 	protected ModelAndView handleNoSuchRequestHandlingMethod(
! 			NoSuchRequestHandlingMethodException ex, HttpServletRequest request, HttpServletResponse response)
! 			throws Exception {
! 
! 		pageNotFoundLogger.warn(ex.getMessage());
! 		response.sendError(HttpServletResponse.SC_NOT_FOUND);
! 		return null;
! 	}
! 
  	/**
  	 * Invokes the named method.

[Springframework-cvs] spring/src/org/springframework/web/servlet FrameworkServlet.java,1.32.4.2,1.32.4.3

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/web/servlet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/src/org/springframework/web/servlet

Modified Files:
      Tag: mbranch-1-2
	FrameworkServlet.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: FrameworkServlet.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/servlet/FrameworkServlet.java,v
retrieving revision 1.32.4.2
retrieving revision 1.32.4.3
diff -C2 -d -r1.32.4.2 -r1.32.4.3
*** FrameworkServlet.java	2 Jan 2006 21:45:09 -0000	1.32.4.2
--- FrameworkServlet.java	21 Apr 2006 00:13:50 -0000	1.32.4.3
***************
*** 1,11 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 409,413 ****
  		finally {
  			if (failureCause != null) {
! 				logger.error("Could not complete request", failureCause);
  			}
  			else {
--- 409,413 ----
  		finally {
  			if (failureCause != null) {
! 				logger.debug("Could not complete request", failureCause);
  			}
  			else {

[Springframework-cvs] spring/test/org/springframework/beans BeanWrapperTests.java,1.13.4.2,1.13.4.3

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/test/org/springframework/beans
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/test/org/springframework/beans

Modified Files:
      Tag: mbranch-1-2
	BeanWrapperTests.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: BeanWrapperTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/test/org/springframework/beans/BeanWrapperTests.java,v
retrieving revision 1.13.4.2
retrieving revision 1.13.4.3
diff -C2 -d -r1.13.4.2 -r1.13.4.3
*** BeanWrapperTests.java	20 Feb 2006 11:58:27 -0000	1.13.4.2
--- BeanWrapperTests.java	21 Apr 2006 00:13:51 -0000	1.13.4.3
***************
*** 375,382 ****
  		assertTrue("stringArray elt is ok", pt.stringArray[0].equals("one"));
  
! 		bw.setPropertyValue("stringArray", "foo,fi,fi,fum");
! 		assertTrue("stringArray length = 4", pt.stringArray.length == 4);
! 		assertTrue("correct values", pt.stringArray[0].equals("foo") && pt.stringArray[1].equals("fi") &&
! 				pt.stringArray[2].equals("fi") && pt.stringArray[3].equals("fum"));
  	}
  
--- 375,380 ----
  		assertTrue("stringArray elt is ok", pt.stringArray[0].equals("one"));
  
! 		bw.setPropertyValue("stringArray", null);
! 		assertTrue("stringArray is null", pt.stringArray == null);
  	}
  
***************
*** 417,425 ****
  		assertTrue("stringArray length = 1", pt.stringArray.length == 1);
  		assertTrue("correct values", pt.stringArray[0].equals("one"));
  
! 		bw.setPropertyValue("stringArray", "1foo,3fi,2fi,1fum");
! 		assertTrue("stringArray length = 4", pt.stringArray.length == 4);
! 		assertTrue("correct values", pt.stringArray[0].equals("foo") && pt.stringArray[1].equals("fi") &&
! 				pt.stringArray[2].equals("fi") && pt.stringArray[3].equals("fum"));
  	}
  
--- 415,427 ----
  		assertTrue("stringArray length = 1", pt.stringArray.length == 1);
  		assertTrue("correct values", pt.stringArray[0].equals("one"));
+ 	}
  
! 	public void testStringArrayPropertyWithStringSplitting() throws Exception {
! 		PropsTest pt = new PropsTest();
! 		BeanWrapper bw = new BeanWrapperImpl(pt);
! 		bw.registerCustomEditor(String[].class, "stringArray", new StringArrayPropertyEditor());
! 		bw.setPropertyValue("stringArray", "a1,b2");
! 		assertTrue("stringArray length = 2", pt.stringArray.length == 2);
! 		assertTrue("correct values", pt.stringArray[0].equals("a1") && pt.stringArray[1].equals("b2"));
  	}
  

[Springframework-cvs] spring/src/org/springframework/util CollectionUtils.java,1.7,1.7.4.1 StringUtils.java,1.43.2.4,1.43.2.5

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/src/org/springframework/util

Modified Files:
      Tag: mbranch-1-2
	CollectionUtils.java StringUtils.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: CollectionUtils.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/util/CollectionUtils.java,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -C2 -d -r1.7 -r1.7.4.1
*** CollectionUtils.java	12 Sep 2005 20:35:33 -0000	1.7
--- CollectionUtils.java	21 Apr 2006 00:13:50 -0000	1.7.4.1
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 61,68 ****
  			return false;
  		}
  		Object candidate = null;
  		for (Iterator it = coll.iterator(); it.hasNext();) {
  			Object elem = it.next();
! 			if (candidate == null) {
  				candidate = elem;
  			}
--- 61,70 ----
  			return false;
  		}
+ 		boolean hasCandidate = false;
  		Object candidate = null;
  		for (Iterator it = coll.iterator(); it.hasNext();) {
  			Object elem = it.next();
! 			if (!hasCandidate) {
! 				hasCandidate = true;
  				candidate = elem;
  			}

Index: StringUtils.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/util/StringUtils.java,v
retrieving revision 1.43.2.4
retrieving revision 1.43.2.5
diff -C2 -d -r1.43.2.4 -r1.43.2.5
*** StringUtils.java	21 Feb 2006 18:14:52 -0000	1.43.2.4
--- StringUtils.java	21 Apr 2006 00:13:50 -0000	1.43.2.5
***************
*** 203,207 ****
  		}
  
! 		String lcStr = str.substring(suffix.length()).toLowerCase();
  		String lcSuffix = suffix.toLowerCase();
  		return lcStr.equals(lcSuffix);
--- 203,207 ----
  		}
  
! 		String lcStr = str.substring(str.length() - suffix.length()).toLowerCase();
  		String lcSuffix = suffix.toLowerCase();
  		return lcStr.equals(lcSuffix);
***************
*** 458,473 ****
  		List pathElements = new LinkedList();
  		int tops = 0;
  		for (int i = pathArray.length - 1; i >= 0; i--) {
  			if (CURRENT_PATH.equals(pathArray[i])) {
! 				// do nothing
  			}
  			else if (TOP_PATH.equals(pathArray[i])) {
  				tops++;
  			}
  			else {
  				if (tops > 0) {
  					tops--;
  				}
  				else {
  					pathElements.add(0, pathArray[i]);
  				}
--- 458,477 ----
  		List pathElements = new LinkedList();
  		int tops = 0;
+ 
  		for (int i = pathArray.length - 1; i >= 0; i--) {
  			if (CURRENT_PATH.equals(pathArray[i])) {
! 				// Points to current directory - drop it.
  			}
  			else if (TOP_PATH.equals(pathArray[i])) {
+ 				// Registering top path found.
  				tops++;
  			}
  			else {
  				if (tops > 0) {
+ 					// Merging path element with corresponding to top path.
  					tops--;
  				}
  				else {
+ 					// Normal path element found.
  					pathElements.add(0, pathArray[i]);
  				}
***************
*** 475,478 ****
--- 479,487 ----
  		}
  
+ 		// Remaining top paths need to be retained.
+ 		for (int i = 0; i < tops; i++) {
+ 			pathElements.add(0, TOP_PATH);
+ 		}
+ 
  		return prefix + collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);
  	}
***************
*** 482,486 ****
  	 * @param path1 First path for comparizon
  	 * @param path2 Second path for comparizon
! 	 * @return True if the two paths are equivalent after normalization
  	 */
  	public static boolean pathEquals(String path1, String path2) {
--- 491,495 ----
  	 * @param path1 First path for comparizon
  	 * @param path2 Second path for comparizon
! 	 * @return whether the two paths are equivalent after normalization
  	 */
  	public static boolean pathEquals(String path1, String path2) {

[Springframework-cvs] spring/src/org/springframework/remoting RemoteProxyFailureException.java,NONE,1.1.2.2

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/remoting
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/src/org/springframework/remoting

Added Files:
      Tag: mbranch-1-2
	RemoteProxyFailureException.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

--- NEW FILE: RemoteProxyFailureException.java ---
/*
 * Copyright 2002-2006 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.springframework.remoting;

/**
 * RemoteAccessException subclass to be thrown in case of a failure
 * within the client-side proxy for a remote service, for example
 * when a method is not found on the underlying stub.
 *
 * @author Juergen Hoeller
 * @since 1.2.8
 */
public class RemoteProxyFailureException extends RemoteAccessException {

	/**
	 * Constructor for RemoteProxyFailureException.
	 * @param msg message
	 * @param ex root cause from remoting API in use
	 */
	public RemoteProxyFailureException(String msg, Throwable ex) {
		super(msg, ex);
	}

}

[Springframework-cvs] spring/docs/reference/src jmx.xml,1.14,1.14.4.1 mvc.xml,1.46.4.1,1.46.4.2

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/docs/reference/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18244/docs/reference/src

Modified Files:
      Tag: mbranch-1-2
	jmx.xml mvc.xml 
Log Message:
fixed typos

Index: mvc.xml
===================================================================
RCS file: /cvsroot/springframework/spring/docs/reference/src/mvc.xml,v
retrieving revision 1.46.4.1
retrieving revision 1.46.4.2
diff -C2 -d -r1.46.4.1 -r1.46.4.2
*** mvc.xml	23 Feb 2006 22:05:46 -0000	1.46.4.1
--- mvc.xml	21 Apr 2006 00:10:49 -0000	1.46.4.2
***************
*** 1346,1350 ****
  
        <para>It is sometimes desireable to issue an HTTP redirect back to the
!       client, before the view is rendered. This si desireable for example when
        one controller has been called with POSTed data, and the response is
        actually a delegation to another controller (for example on a successful
--- 1346,1350 ----
  
        <para>It is sometimes desireable to issue an HTTP redirect back to the
!       client, before the view is rendered. This is desireable for example when
        one controller has been called with POSTed data, and the response is
        actually a delegation to another controller (for example on a successful

Index: jmx.xml
===================================================================
RCS file: /cvsroot/springframework/spring/docs/reference/src/jmx.xml,v
retrieving revision 1.14
retrieving revision 1.14.4.1
diff -C2 -d -r1.14 -r1.14.4.1
*** jmx.xml	9 Aug 2005 09:39:57 -0000	1.14
--- jmx.xml	21 Apr 2006 00:10:49 -0000	1.14.4.1
***************
*** 110,114 ****
  beans with that. This is useful when your application is running inside a container such as Tomcat or IBM WebSphere that has its own
  <literal>MBeanServer</literal>.</para>
! 			<para>However, this is approach is no use for standalone environment, or when running inside a container that does not provide an
  <literal>MBeanServer</literal>. To overcome this you can create an
  <literal>MBeanServer</literal> instance declaratively by adding an
--- 110,114 ----
  beans with that. This is useful when your application is running inside a container such as Tomcat or IBM WebSphere that has its own
  <literal>MBeanServer</literal>.</para>
! 			<para>However, this approach is of no use in a standalone environment, or when running inside a container that does not provide an
  <literal>MBeanServer</literal>. To overcome this you can create an
  <literal>MBeanServer</literal> instance declaratively by adding an

[Springframework-cvs] spring/docs/reference/src index.xml,1.57.2.1,1.57.2.2

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/docs/reference/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18139/docs/reference/src

Modified Files:
      Tag: mbranch-1-2
	index.xml 
Log Message:
prepared for release 1.2.8

Index: index.xml
===================================================================
RCS file: /cvsroot/springframework/spring/docs/reference/src/index.xml,v
retrieving revision 1.57.2.1
retrieving revision 1.57.2.2
diff -C2 -d -r1.57.2.1 -r1.57.2.2
*** index.xml	23 Dec 2005 14:35:46 -0000	1.57.2.1
--- index.xml	21 Apr 2006 00:10:27 -0000	1.57.2.2
***************
*** 37,41 ****
            Reference Documentation
          </subtitle>
!         <releaseinfo>Version 1.2.7</releaseinfo>
          <pubdate>(Work in progress)</pubdate>
          
--- 37,41 ----
            Reference Documentation
          </subtitle>
!         <releaseinfo>Version 1.2.8</releaseinfo>
          <pubdate>(Work in progress)</pubdate>
          

[Springframework-cvs] spring project.properties,1.102.2.1,1.102.2.2

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18139

Modified Files:
      Tag: mbranch-1-2
	project.properties 
Log Message:
prepared for release 1.2.8

Index: project.properties
===================================================================
RCS file: /cvsroot/springframework/spring/project.properties,v
retrieving revision 1.102.2.1
retrieving revision 1.102.2.2
diff -C2 -d -r1.102.2.1 -r1.102.2.2
*** project.properties	23 Dec 2005 14:36:16 -0000	1.102.2.1
--- project.properties	21 Apr 2006 00:10:27 -0000	1.102.2.2
***************
*** 8,12 ****
  
  # Spring version
! spring-version=1.2.7
  
  # Project name
--- 8,12 ----
  
  # Spring version
! spring-version=1.2.8
  
  # Project name

[Springframework-cvs] spring build.xml,1.144.2.1,1.144.2.2

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17165

Modified Files:
      Tag: mbranch-1-2
	build.xml 
Log Message:
included "tiger" source tree in source build (spring-src.zip)

Index: build.xml
===================================================================
RCS file: /cvsroot/springframework/spring/build.xml,v
retrieving revision 1.144.2.1
retrieving revision 1.144.2.2
diff -C2 -d -r1.144.2.1 -r1.144.2.2
*** build.xml	27 Feb 2006 20:33:03 -0000	1.144.2.1
--- build.xml	21 Apr 2006 00:08:48 -0000	1.144.2.2
***************
*** 70,75 ****
  
  		<echo message=""/>
! 		<echo message="${name} build file"/>
! 		<echo message="------------------------------------------------------"/>
  		<echo message=""/>
  		<echo message="Among the available targets are:"/>
--- 70,75 ----
  
  		<echo message=""/>
! 		<echo message="Spring Framework build script"/>
! 		<echo message="-----------------------------------------"/>
  		<echo message=""/>
  		<echo message="Among the available targets are:"/>
***************
*** 86,91 ****
  
  		<delete dir="${target.classes.dir}"/>
- 		<delete dir="${target.testclasses.dir}"/>
  		<delete dir="${target.mockclasses.dir}"/>
  		<delete dir="${target.clover.dir}"/>
  		<delete dir="${target.junit.reports.dir}"/>
--- 86,91 ----
  
  		<delete dir="${target.classes.dir}"/>
  		<delete dir="${target.mockclasses.dir}"/>
+ 		<delete dir="${target.testclasses.dir}"/>
  		<delete dir="${target.clover.dir}"/>
  		<delete dir="${target.junit.reports.dir}"/>
***************
*** 429,432 ****
--- 429,435 ----
  				<include name="org/springframework/**"/>
  			</fileset>
+ 			<fileset dir="${tiger.src.dir}">
+ 				<include name="org/springframework/**"/>
+ 			</fileset>
  		</zip>
  

[Springframework-cvs] spring/mock/org/springframework/mock/web MockFilterConfig.java,1.4.4.1,1.4.4.2

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/mock/org/springframework/mock/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16066/mock/org/springframework/mock/web

Modified Files:
      Tag: mbranch-1-2
	MockFilterConfig.java 
Log Message:
added overloaded constructors, using a MockServletContext instead of a ServletContext argument

Index: MockFilterConfig.java
===================================================================
RCS file: /cvsroot/springframework/spring/mock/org/springframework/mock/web/MockFilterConfig.java,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C2 -d -r1.4.4.1 -r1.4.4.2
*** MockFilterConfig.java	9 Jan 2006 22:46:02 -0000	1.4.4.1
--- MockFilterConfig.java	21 Apr 2006 00:06:39 -0000	1.4.4.2
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 61,64 ****
--- 61,79 ----
  	}
  
+ 	/**
+ 	 * Create new MockServletConfig with a MockServletContext.
+ 	 */
+ 	public MockFilterConfig() {
+ 		this(new MockServletContext());
+ 	}
+ 
+ 	/**
+ 	 * Create new MockServletConfig with a MockServletContext.
+ 	 * @param filterName the name of the filter
+ 	 */
+ 	public MockFilterConfig(String filterName) {
+ 		this(new MockServletContext(), filterName);
+ 	}
+ 
  
  	public String getFilterName() {

[Springframework-cvs] spring/lib readme.txt,1.82.2.5,1.82.2.6

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15796/lib

Modified Files:
      Tag: mbranch-1-2
	readme.txt 
Log Message:
updated to Quartz 1.5.2

Index: readme.txt
===================================================================
RCS file: /cvsroot/springframework/spring/lib/readme.txt,v
retrieving revision 1.82.2.5
retrieving revision 1.82.2.6
diff -C2 -d -r1.82.2.5 -r1.82.2.6
*** readme.txt	23 Feb 2006 22:13:48 -0000	1.82.2.5
--- readme.txt	21 Apr 2006 00:06:15 -0000	1.82.2.6
***************
*** 298,303 ****
  - required at runtime when using Spring's AbstractExcelView
  
! * quartz/quartz-1.5.1.jar
! - Quartz 1.5.1 (http://www.opensymphony.com/quartz)
  - required for building the framework
  - required at runtime when using Spring's Quartz scheduling support
--- 298,303 ----
  - required at runtime when using Spring's AbstractExcelView
  
! * quartz/quartz-1.5.2.jar
! - Quartz 1.5.2 (http://www.opensymphony.com/quartz)
  - required for building the framework
  - required at runtime when using Spring's Quartz scheduling support

[Springframework-cvs] spring/lib/quartz quartz-1.5.2.jar,NONE,1.1.2.2 quartz-1.5.1.jar,1.1,NONE

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/lib/quartz
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15796/lib/quartz

Added Files:
      Tag: mbranch-1-2
	quartz-1.5.2.jar 
Removed Files:
      Tag: mbranch-1-2
	quartz-1.5.1.jar 
Log Message:
updated to Quartz 1.5.2

--- quartz-1.5.1.jar DELETED ---

--- NEW FILE: quartz-1.5.2.jar ---
(This appears to be a binary file; contents omitted.)

[Springframework-cvs] spring/samples/jpetstore/war/WEB-INF/jsp/struts Cart.jsp,1.1,1.1.4.1

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/samples/jpetstore/war/WEB-INF/jsp/struts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15444/samples/jpetstore/war/WEB-INF/jsp/struts

Modified Files:
      Tag: mbranch-1-2
	Cart.jsp 
Log Message:
fixed "Next" link

Index: Cart.jsp
===================================================================
RCS file: /cvsroot/springframework/spring/samples/jpetstore/war/WEB-INF/jsp/struts/Cart.jsp,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** Cart.jsp	4 Dec 2003 08:44:22 -0000	1.1
--- Cart.jsp	21 Apr 2006 00:05:13 -0000	1.1.4.1
***************
*** 58,62 ****
      <a href="<c:url value="viewCart.do?page=previousCart"/>"><font color="green"><B>&lt;&lt; Prev</B></font></a>
    </c:if>
!   <c:if test="${!cartForm.cart.cartItemList.firstPage}">
      <a href="<c:url value="viewCart.do?page=nextCart"/>"><font color="green"><B>Next &gt;&gt;</B></font></a>
    </c:if>
--- 58,62 ----
      <a href="<c:url value="viewCart.do?page=previousCart"/>"><font color="green"><B>&lt;&lt; Prev</B></font></a>
    </c:if>
!   <c:if test="${!cartForm.cart.cartItemList.lastPage}">
      <a href="<c:url value="viewCart.do?page=nextCart"/>"><font color="green"><B>Next &gt;&gt;</B></font></a>
    </c:if>