springframework-cvs — CVS Commit Notification List

[Springframework-cvs] spring/osgi/bundlor org.springframework.web.servlet.mf, 1.4, 1.5 org.springframework.web.mf, 1.6, 1.7

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

Update of /cvsroot/springframework/spring/osgi/bundlor
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18157/osgi/bundlor

Modified Files:
	org.springframework.web.servlet.mf org.springframework.web.mf 
Log Message:
lowered required JSP level to 2.0

Index: org.springframework.web.servlet.mf
===================================================================
RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.servlet.mf,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** org.springframework.web.servlet.mf	28 Oct 2008 17:12:08 -0000	1.4
--- org.springframework.web.servlet.mf	27 Nov 2008 21:53:25 -0000	1.5
***************
*** 12,16 ****
   javax.servlet;version="[2.4.0, 3.0.0)",
   javax.servlet.http;version="[2.4.0, 3.0.0)",
!  javax.servlet.jsp;version="[2.1.0, 3.0.0)";resolution:=optional,
   javax.servlet.jsp.jstl.*;version="[1.1.2, 2.0.0)";resolution:=optional,
   javax.servlet.jsp.tagext;version="[2.1.0, 3.0.0)";resolution:=optional,
--- 12,16 ----
   javax.servlet;version="[2.4.0, 3.0.0)",
   javax.servlet.http;version="[2.4.0, 3.0.0)",
!  javax.servlet.jsp;version="[2.0.0, 3.0.0)";resolution:=optional,
   javax.servlet.jsp.jstl.*;version="[1.1.2, 2.0.0)";resolution:=optional,
   javax.servlet.jsp.tagext;version="[2.1.0, 3.0.0)";resolution:=optional,

Index: org.springframework.web.mf
===================================================================
RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.mf,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** org.springframework.web.mf	20 Nov 2008 12:40:25 -0000	1.6
--- org.springframework.web.mf	27 Nov 2008 21:53:25 -0000	1.7
***************
*** 9,13 ****
   javax.servlet;version="[2.4.0, 3.0.0)",
   javax.servlet.http;version="[2.4.0, 3.0.0)",
!  javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional,
   javax.xml.rpc.*;version="[1.1.0, 2.0.0)";resolution:=optional,
   javax.xml.soap.*;version="[1.3.0, 2.0.0)";resolution:=optional,
--- 9,13 ----
   javax.servlet;version="[2.4.0, 3.0.0)",
   javax.servlet.http;version="[2.4.0, 3.0.0)",
!  javax.servlet.jsp.*;version="[2.0.0, 3.0.0)";resolution:=optional,
   javax.xml.rpc.*;version="[1.1.0, 2.0.0)";resolution:=optional,
   javax.xml.soap.*;version="[1.3.0, 2.0.0)";resolution:=optional,

[Springframework-cvs] spring/src/org/springframework/web/servlet HandlerExecutionChain.java, 1.9, 1.10

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

Update of /cvsroot/springframework/spring/src/org/springframework/web/servlet
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/src/org/springframework/web/servlet

Modified Files:
	HandlerExecutionChain.java 
Log Message:
polishing

Index: HandlerExecutionChain.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/servlet/HandlerExecutionChain.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** HandlerExecutionChain.java	21 Oct 2008 10:15:42 -0000	1.9
--- HandlerExecutionChain.java	27 Nov 2008 18:04:36 -0000	1.10
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2007 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2008 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 114,122 ****
  	}
  
  	/**
  	 * Delegates to the handler's <code>toString()</code>.
  	 */
  	public String toString() {
! 		return String.valueOf(handler);
  	}
  }
--- 114,124 ----
  	}
  
+ 
  	/**
  	 * Delegates to the handler's <code>toString()</code>.
  	 */
  	public String toString() {
! 		return String.valueOf(this.handler);
  	}
+ 
  }

[Springframework-cvs] spring/mock/org/springframework/mock/web/portlet MockPortletURL.java, 1.4, 1.5 MockPortalContext.java, 1.3, 1.4 MockActionResponse.java, 1.4, 1.5 MockPortletResponse.java, 1.4, 1.5 MockPortletConfig.java, 1.4, 1.5

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

Update of /cvsroot/springframework/spring/mock/org/springframework/mock/web/portlet
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/mock/org/springframework/mock/web/portlet

Modified Files:
	MockPortletURL.java MockPortalContext.java 
	MockActionResponse.java MockPortletResponse.java 
	MockPortletConfig.java 
Log Message:
polishing

Index: MockPortletConfig.java
===================================================================
RCS file: /cvsroot/springframework/spring/mock/org/springframework/mock/web/portlet/MockPortletConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MockPortletConfig.java	11 Oct 2007 16:46:39 -0000	1.4
--- MockPortletConfig.java	27 Nov 2008 18:04:36 -0000	1.5
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2007 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2008 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 22,25 ****
--- 22,26 ----
  import java.util.Properties;
  import java.util.ResourceBundle;
+ import java.util.Map;
  
  import javax.portlet.PortletConfig;
***************
*** 41,45 ****
  	private final String portletName;
  
! 	private final HashMap resourceBundles = new HashMap();
  
  	private final Properties initParameters = new Properties();
--- 42,46 ----
  	private final String portletName;
  
! 	private final Map resourceBundles = new HashMap();
  
  	private final Properties initParameters = new Properties();

Index: MockPortletURL.java
===================================================================
RCS file: /cvsroot/springframework/spring/mock/org/springframework/mock/web/portlet/MockPortletURL.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MockPortletURL.java	25 Sep 2007 21:44:14 -0000	1.4
--- MockPortletURL.java	27 Nov 2008 18:04:36 -0000	1.5
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2007 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2008 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 60,64 ****
  	private PortletMode portletMode;
  
! 	private final Map parameters = new LinkedHashMap(16);
  
  	private boolean secure = false;
--- 60,64 ----
  	private PortletMode portletMode;
  
! 	private final Map parameters = new LinkedHashMap();
  
  	private boolean secure = false;
***************
*** 143,166 ****
  
  	public boolean isSecure() {
! 		return secure;
! 	}
! 
! 	public String toString() {
! 		StringBuffer query = new StringBuffer();
! 		query.append(encodeParameter("urlType", this.urlType));
! 		if (this.windowState != null) {
! 			query.append(";" + encodeParameter("windowState", this.windowState.toString()));
! 		}
! 		if (this.portletMode != null) {
! 			query.append(";" + encodeParameter("portletMode", this.portletMode.toString()));
! 		}
! 		for (Iterator it = this.parameters.entrySet().iterator(); it.hasNext();) {
! 			Map.Entry entry = (Map.Entry) it.next();
! 			String name = (String) entry.getKey();
! 			String[] values = (String[]) entry.getValue();
! 			query.append(";" + encodeParameter("param_" + name, values));
! 		}
! 		return (this.secure ? "https:" : "http:") +
! 				"//localhost/mockportlet?" + query.toString();
  	}
  
--- 143,147 ----
  
  	public boolean isSecure() {
! 		return this.secure;
  	}
  
***************
*** 178,188 ****
  	private String encodeParameter(String name, String[] values) {
  		try {
! 			StringBuffer buf = new StringBuffer();
  			for (int i = 0, n = values.length; i < n; i++) {
! 				buf.append((i > 0 ? ";" : "") +
  						URLEncoder.encode(name, ENCODING) + "=" +
  						URLEncoder.encode(values[i], ENCODING));
  			}
! 			return buf.toString();
  		}
  		catch (UnsupportedEncodingException ex) {
--- 159,169 ----
  	private String encodeParameter(String name, String[] values) {
  		try {
! 			StringBuffer sb = new StringBuffer();
  			for (int i = 0, n = values.length; i < n; i++) {
! 				sb.append((i > 0 ? ";" : "") +
  						URLEncoder.encode(name, ENCODING) + "=" +
  						URLEncoder.encode(values[i], ENCODING));
  			}
! 			return sb.toString();
  		}
  		catch (UnsupportedEncodingException ex) {
***************
*** 191,193 ****
--- 172,194 ----
  	}
  
+ 
+ 	public String toString() {
+ 		StringBuffer sb = new StringBuffer();
+ 		sb.append(encodeParameter("urlType", this.urlType));
+ 		if (this.windowState != null) {
+ 			sb.append(";" + encodeParameter("windowState", this.windowState.toString()));
+ 		}
+ 		if (this.portletMode != null) {
+ 			sb.append(";" + encodeParameter("portletMode", this.portletMode.toString()));
+ 		}
+ 		for (Iterator it = this.parameters.entrySet().iterator(); it.hasNext();) {
+ 			Map.Entry entry = (Map.Entry) it.next();
+ 			String name = (String) entry.getKey();
+ 			String[] values = (String[]) entry.getValue();
+ 			sb.append(";" + encodeParameter("param_" + name, values));
+ 		}
+ 		return (this.secure ? "https:" : "http:") +
+ 				"//localhost/mockportlet?" + sb.toString();
+ 	}
+ 
  }

Index: MockPortletResponse.java
===================================================================
RCS file: /cvsroot/springframework/spring/mock/org/springframework/mock/web/portlet/MockPortletResponse.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MockPortletResponse.java	25 Sep 2007 21:44:14 -0000	1.4
--- MockPortletResponse.java	27 Nov 2008 18:04:36 -0000	1.5
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2007 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2008 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 37,41 ****
  	private final PortalContext portalContext;
  
! 	private final Map properties = new LinkedHashMap(16);
  
  
--- 37,41 ----
  	private final PortalContext portalContext;
  
! 	private final Map properties = new LinkedHashMap();
  
  
***************
*** 62,66 ****
  	 */
  	public PortalContext getPortalContext() {
! 		return portalContext;
  	}
  
--- 62,66 ----
  	 */
  	public PortalContext getPortalContext() {
! 		return this.portalContext;
  	}
  

Index: MockActionResponse.java
===================================================================
RCS file: /cvsroot/springframework/spring/mock/org/springframework/mock/web/portlet/MockActionResponse.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MockActionResponse.java	25 Sep 2007 21:44:14 -0000	1.4
--- MockActionResponse.java	27 Nov 2008 18:04:36 -0000	1.5
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2007 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2008 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 20,25 ****
  import java.util.Collections;
  import java.util.Iterator;
- import java.util.Map;
  import java.util.LinkedHashMap;
  
  import javax.portlet.ActionResponse;
--- 20,25 ----
  import java.util.Collections;
  import java.util.Iterator;
  import java.util.LinkedHashMap;
+ import java.util.Map;
  
  import javax.portlet.ActionResponse;
***************
*** 30,34 ****
  import javax.portlet.WindowStateException;
  
- import org.springframework.core.CollectionFactory;
  import org.springframework.util.Assert;
  import org.springframework.util.CollectionUtils;
--- 30,33 ----
***************
*** 49,53 ****
  	private String redirectedUrl;
  
! 	private final Map renderParameters = new LinkedHashMap(16);
  
  
--- 48,52 ----
  	private String redirectedUrl;
  
! 	private final Map renderParameters = new LinkedHashMap();
  
  
***************
*** 134,139 ****
  	}
  
! 	public String getRenderParameter(String name) {
! 		String[] arr = (String[]) this.renderParameters.get(name);
  		return (arr != null && arr.length > 0 ? arr[0] : null);
  	}
--- 133,138 ----
  	}
  
! 	public String getRenderParameter(String key) {
! 		String[] arr = (String[]) this.renderParameters.get(key);
  		return (arr != null && arr.length > 0 ? arr[0] : null);
  	}

Index: MockPortalContext.java
===================================================================
RCS file: /cvsroot/springframework/spring/mock/org/springframework/mock/web/portlet/MockPortalContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MockPortalContext.java	15 Oct 2006 18:23:22 -0000	1.3
--- MockPortalContext.java	27 Nov 2008 18:04:36 -0000	1.4
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2006 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2008 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 78,81 ****
--- 78,85 ----
  	}
  
+ 	public void setProperty(String name, String value) {
+ 		this.properties.setProperty(name, value);
+ 	}
+ 
  	public String getProperty(String name) {
  		return this.properties.getProperty(name);

[Springframework-cvs] spring/src/org/springframework/web/portlet/handler ParameterHandlerMapping.java, 1.6, 1.7

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

Update of /cvsroot/springframework/spring/src/org/springframework/web/portlet/handler
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/src/org/springframework/web/portlet/handler

Modified Files:
	ParameterHandlerMapping.java 
Log Message:
polishing

Index: ParameterHandlerMapping.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/portlet/handler/ParameterHandlerMapping.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ParameterHandlerMapping.java	11 Oct 2007 15:51:56 -0000	1.6
--- ParameterHandlerMapping.java	27 Nov 2008 18:04:36 -0000	1.7
***************
*** 95,99 ****
  
  	/**
! 	 * Register all handlers specified in the Portlet mode map for the corresponding modes.
  	 * @param parameterMap Map with parameter names as keys and handler beans or bean names as values
  	 * @throws BeansException if the handler couldn't be registered
--- 95,99 ----
  
  	/**
! 	 * Register all handlers for the specified parameters.
  	 * @param parameterMap Map with parameter names as keys and handler beans or bean names as values
  	 * @throws BeansException if the handler couldn't be registered

[Springframework-cvs] spring/src/org/springframework/jca/cci/core CciTemplate.java, 1.12, 1.13

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

Update of /cvsroot/springframework/spring/src/org/springframework/jca/cci/core
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/src/org/springframework/jca/cci/core

Modified Files:
	CciTemplate.java 
Log Message:
polishing

Index: CciTemplate.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/jca/cci/core/CciTemplate.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CciTemplate.java	17 Jul 2008 07:50:53 -0000	1.12
--- CciTemplate.java	27 Nov 2008 18:04:36 -0000	1.13
***************
*** 379,383 ****
  	protected RecordFactory getRecordFactory(ConnectionFactory connectionFactory) throws ResourceException {
  		try {
! 			return getConnectionFactory().getRecordFactory();
  		}
  		catch (NotSupportedException ex) {
--- 379,383 ----
  	protected RecordFactory getRecordFactory(ConnectionFactory connectionFactory) throws ResourceException {
  		try {
! 			return connectionFactory.getRecordFactory();
  		}
  		catch (NotSupportedException ex) {

[Springframework-cvs] spring/mock/org/springframework/test/jdbc JdbcTestUtils.java, 1.3, 1.4

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

Update of /cvsroot/springframework/spring/mock/org/springframework/test/jdbc
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/mock/org/springframework/test/jdbc

Modified Files:
	JdbcTestUtils.java 
Log Message:
polishing

Index: JdbcTestUtils.java
===================================================================
RCS file: /cvsroot/springframework/spring/mock/org/springframework/test/jdbc/JdbcTestUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JdbcTestUtils.java	22 Apr 2008 16:46:49 -0000	1.3
--- JdbcTestUtils.java	27 Nov 2008 18:04:36 -0000	1.4
***************
*** 1,4 ****
  /*
!  * Copyright 2007 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2008 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 34,38 ****
  	/**
  	 * Read a script from the LineNumberReaded and build a String containing the lines.
- 	 * 
  	 * @param lineNumberReader the <code>LineNumberReader</> containing the script to be processed
  	 * @return <code>String</code> containing the script lines
--- 34,37 ----
***************
*** 63,70 ****
  		boolean inLiteral = false;
  		char[] content = script.toCharArray();
- 
  		for (int i = 0; i < script.length(); i++) {
  			if (content[i] == '\'') {
! 				inLiteral = inLiteral ? false : true;
  			}
  			if (content[i] == delim && !inLiteral) {
--- 62,68 ----
  		boolean inLiteral = false;
  		char[] content = script.toCharArray();
  		for (int i = 0; i < script.length(); i++) {
  			if (content[i] == '\'') {
! 				inLiteral = !inLiteral;
  			}
  			if (content[i] == delim && !inLiteral) {
***************
*** 86,93 ****
  		boolean inLiteral = false;
  		char[] content = script.toCharArray();
- 
  		for (int i = 0; i < script.length(); i++) {
  			if (content[i] == '\'') {
! 				inLiteral = inLiteral ? false : true;
  			}
  			if (content[i] == delim && !inLiteral) {
--- 84,90 ----
  		boolean inLiteral = false;
  		char[] content = script.toCharArray();
  		for (int i = 0; i < script.length(); i++) {
  			if (content[i] == '\'') {
! 				inLiteral = !inLiteral;
  			}
  			if (content[i] == delim && !inLiteral) {

[Springframework-cvs] spring/mock/org/springframework/test/web ModelAndViewAssert.java, 1.3, 1.4 AbstractModelAndViewTests.java, 1.5, 1.6

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

Update of /cvsroot/springframework/spring/mock/org/springframework/test/web
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/mock/org/springframework/test/web

Modified Files:
	ModelAndViewAssert.java AbstractModelAndViewTests.java 
Log Message:
polishing

Index: ModelAndViewAssert.java
===================================================================
RCS file: /cvsroot/springframework/spring/mock/org/springframework/test/web/ModelAndViewAssert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ModelAndViewAssert.java	10 Sep 2007 13:26:40 -0000	1.3
--- ModelAndViewAssert.java	27 Nov 2008 18:04:36 -0000	1.4
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2007 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2008 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 28,40 ****
  
  /**
-  * <p>
   * A collection of assertions intended to simplify testing scenarios
   * dealing with Spring Web MVC
   * {@link org.springframework.web.servlet.ModelAndView ModelAndView} objects.
!  * Intended for use with JUnit 4 and TestNG.
!  * </p>
!  * <p>
   * All <code>assert*()</code> methods throw {@link AssertionError}s.
-  * </p>
   *
   * @author Sam Brannen
--- 28,37 ----
  
  /**
   * A collection of assertions intended to simplify testing scenarios
   * dealing with Spring Web MVC
   * {@link org.springframework.web.servlet.ModelAndView ModelAndView} objects.
!  *
!  * <p>Intended for use with JUnit 4 and TestNG.
   * All <code>assert*()</code> methods throw {@link AssertionError}s.
   *
   * @author Sam Brannen
***************
*** 50,54 ****
  	 * exists and checks it type, based on the <code>expectedType</code>. If
  	 * the model entry exists and the type matches, the model value is returned.
- 	 *
  	 * @param mav ModelAndView to test against (never <code>null</code>)
  	 * @param modelName name of the object to add to the model (never
--- 47,50 ----
***************
*** 62,70 ****
  		assertCondition(mav != null, "ModelAndView is null");
  		assertCondition(mav.getModel() != null, "Model is null");
! 		final Object obj = mav.getModel().get(modelName);
  		assertCondition(obj != null, "Model attribute with name '" + modelName + "' is null");
  
! 		assertCondition(expectedType.isAssignableFrom(obj.getClass()), "Model attribute is not of expected type '"
! 				+ expectedType.getName() + "' but rather of type '" + obj.getClass().getName() + "'");
  		return obj;
  	}
--- 58,66 ----
  		assertCondition(mav != null, "ModelAndView is null");
  		assertCondition(mav.getModel() != null, "Model is null");
! 		Object obj = mav.getModel().get(modelName);
  		assertCondition(obj != null, "Model attribute with name '" + modelName + "' is null");
  
! 		assertCondition(expectedType.isAssignableFrom(obj.getClass()), "Model attribute is not of expected type '" +
! 				expectedType.getName() + "' but rather of type '" + obj.getClass().getName() + "'");
  		return obj;
  	}
***************
*** 72,76 ****
  	/**
  	 * Compare each individual entry in a list, without first sorting the lists.
- 	 *
  	 * @param mav ModelAndView to test against (never <code>null</code>)
  	 * @param modelName name of the object to add to the model (never
--- 68,71 ----
***************
*** 91,95 ****
  	/**
  	 * Assert whether or not a model attribute is available.
- 	 *
  	 * @param mav ModelAndView to test against (never <code>null</code>)
  	 * @param modelName name of the object to add to the model (never
--- 86,89 ----
***************
*** 97,101 ****
  	 */
  	public static void assertModelAttributeAvailable(ModelAndView mav, Object modelName) throws AssertionError {
- 
  		assertCondition(mav != null, "ModelAndView is null");
  		assertCondition(mav.getModel() != null, "Model is null");
--- 91,94 ----
***************
*** 107,111 ****
  	 * Compare a given <code>expectedValue</code> to the value from the model
  	 * bound under the given <code>modelName</code>.
- 	 *
  	 * @param mav ModelAndView to test against (never <code>null</code>)
  	 * @param modelName name of the object to add to the model (never
--- 100,103 ----
***************
*** 125,134 ****
  	 * Inspect the <code>expectedModel</code> to see if all elements in the
  	 * model appear and are equal.
- 	 *
  	 * @param mav ModelAndView to test against (never <code>null</code>)
  	 * @param expectedModel the expected model
  	 */
  	public static void assertModelAttributeValues(ModelAndView mav, Map expectedModel) throws AssertionError {
- 
  		assertCondition(mav != null, "ModelAndView is null");
  		assertCondition(mav.getModel() != null, "Model is null");
--- 117,124 ----
***************
*** 161,165 ****
  	 * Compare each individual entry in a list after having sorted both lists
  	 * (optionally using a comparator).
- 	 *
  	 * @param mav ModelAndView to test against (never <code>null</code>)
  	 * @param modelName name of the object to add to the model (never
--- 151,154 ----
***************
*** 195,204 ****
  	 * Check to see if the view name in the ModelAndView matches the given
  	 * <code>expectedName</code>.
- 	 *
  	 * @param mav ModelAndView to test against (never <code>null</code>)
  	 * @param expectedName the name of the model value
  	 */
  	public static void assertViewName(ModelAndView mav, String expectedName) throws AssertionError {
- 
  		assertCondition(mav != null, "ModelAndView is null");
  		assertCondition(expectedName.equals(mav.getViewName()), "View name is not equal to '" + expectedName
--- 184,191 ----
***************
*** 210,219 ****
  	 * Fails by throwing an <code>AssertionError</code> with the supplied
  	 * <code>message</code>.
- 	 *
  	 * @param message the exception message to use
  	 * @see #assertCondition(boolean,String)
  	 */
  	private static void fail(String message) throws AssertionError {
- 
  		throw new AssertionError(message);
  	}
--- 197,204 ----
***************
*** 223,227 ****
  	 * <code>AssertionError</code> with the supplied <code>message</code> if
  	 * the test result is <code>false</code>.
- 	 *
  	 * @param condition a boolean expression
  	 * @param message the exception message to use if the assertion fails
--- 208,211 ----
***************
*** 230,234 ****
  	 */
  	private static void assertCondition(boolean condition, String message) throws AssertionError {
- 
  		if (!condition) {
  			fail(message);
--- 214,217 ----
***************
*** 237,241 ****
  
  	private static void appendNonMatchingSetsErrorMessage(Set assertionSet, Set incorrectSet, StringBuffer buf) {
- 
  		Set tempSet = new HashSet();
  		tempSet.addAll(incorrectSet);
--- 220,223 ----

Index: AbstractModelAndViewTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/mock/org/springframework/test/web/AbstractModelAndViewTests.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractModelAndViewTests.java	8 Sep 2007 15:16:48 -0000	1.5
--- AbstractModelAndViewTests.java	27 Nov 2008 18:04:36 -0000	1.6
***************
*** 27,40 ****
  
  /**
-  * <p>
   * Convenient JUnit 3.8 base class for tests dealing with Spring Web MVC
   * {@link org.springframework.web.servlet.ModelAndView ModelAndView} objects.
!  * </p>
!  * <p>
!  * All <code>assert*()</code> methods throw {@link AssertionFailedError}s.
!  * </p>
!  * <p>
!  * Consider the use of {@link ModelAndViewAssert} with JUnit 4 and TestNG.
!  * </p>
   *
   * @author Alef Arendsen
--- 27,36 ----
  
  /**
   * Convenient JUnit 3.8 base class for tests dealing with Spring Web MVC
   * {@link org.springframework.web.servlet.ModelAndView ModelAndView} objects.
!  *
!  * <p>All <code>assert*()</code> methods throw {@link AssertionFailedError}s.
!  *
!  * <p>Consider the use of {@link ModelAndViewAssert} with JUnit 4 and TestNG.
   *
   * @author Alef Arendsen
***************
*** 51,55 ****
  	 * exists and checks it type, based on the <code>expectedType</code>. If
  	 * the model entry exists and the type matches, the model value is returned.
- 	 *
  	 * @param mav ModelAndView to test against (never <code>null</code>)
  	 * @param modelName name of the object to add to the model (never
--- 47,50 ----
***************
*** 59,63 ****
  	 */
  	protected Object assertAndReturnModelAttributeOfType(ModelAndView mav, Object modelName, Class expectedType) {
- 
  		try {
  			return ModelAndViewAssert.assertAndReturnModelAttributeOfType(mav, modelName, expectedType);
--- 54,57 ----
***************
*** 70,74 ****
  	/**
  	 * Compare each individual entry in a list, without first sorting the lists.
- 	 *
  	 * @param mav ModelAndView to test against (never <code>null</code>)
  	 * @param modelName name of the object to add to the model (never
--- 64,67 ----
***************
*** 77,81 ****
  	 */
  	protected void assertCompareListModelAttribute(ModelAndView mav, Object modelName, List expectedList) {
- 
  		try {
  			ModelAndViewAssert.assertCompareListModelAttribute(mav, modelName, expectedList);
--- 70,73 ----
***************
*** 88,92 ****
  	/**
  	 * Assert whether or not a model attribute is available.
- 	 *
  	 * @param mav ModelAndView to test against (never <code>null</code>)
  	 * @param modelName name of the object to add to the model (never
--- 80,83 ----
***************
*** 94,98 ****
  	 */
  	protected void assertModelAttributeAvailable(ModelAndView mav, Object modelName) {
- 
  		try {
  			ModelAndViewAssert.assertModelAttributeAvailable(mav, modelName);
--- 85,88 ----
***************
*** 106,110 ****
  	 * Compare a given <code>expectedValue</code> to the value from the model
  	 * bound under the given <code>modelName</code>.
- 	 *
  	 * @param mav ModelAndView to test against (never <code>null</code>)
  	 * @param modelName name of the object to add to the model (never
--- 96,99 ----
***************
*** 113,117 ****
  	 */
  	protected void assertModelAttributeValue(ModelAndView mav, Object modelName, Object expectedValue) {
- 
  		try {
  			ModelAndViewAssert.assertModelAttributeValue(mav, modelName, expectedValue);
--- 102,105 ----
***************
*** 125,134 ****
  	 * Inspect the <code>expectedModel</code> to see if all elements in the
  	 * model appear and are equal.
- 	 *
  	 * @param mav ModelAndView to test against (never <code>null</code>)
  	 * @param expectedModel the expected model
  	 */
  	protected void assertModelAttributeValues(ModelAndView mav, Map expectedModel) {
- 
  		try {
  			ModelAndViewAssert.assertModelAttributeValues(mav, expectedModel);
--- 113,120 ----
***************
*** 142,146 ****
  	 * Compare each individual entry in a list after having sorted both lists
  	 * (optionally using a comparator).
- 	 *
  	 * @param mav ModelAndView to test against (never <code>null</code>)
  	 * @param modelName name of the object to add to the model (never
--- 128,131 ----
***************
*** 153,157 ****
  	protected void assertSortAndCompareListModelAttribute(
  			ModelAndView mav, Object modelName, List expectedList, Comparator comparator) {
- 
  		try {
  			ModelAndViewAssert.assertSortAndCompareListModelAttribute(mav, modelName, expectedList, comparator);
--- 138,141 ----
***************
*** 165,174 ****
  	 * Check to see if the view name in the ModelAndView matches the given
  	 * <code>expectedName</code>.
- 	 *
  	 * @param mav ModelAndView to test against (never <code>null</code>)
  	 * @param expectedName the name of the model value
  	 */
  	protected void assertViewName(ModelAndView mav, String expectedName) {
- 
  		try {
  			ModelAndViewAssert.assertViewName(mav, expectedName);
--- 149,156 ----

[Springframework-cvs] spring/src/org/springframework/web/portlet HandlerExecutionChain.java, 1.3, 1.4

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

Update of /cvsroot/springframework/spring/src/org/springframework/web/portlet
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/src/org/springframework/web/portlet

Modified Files:
	HandlerExecutionChain.java 
Log Message:
polishing

Index: HandlerExecutionChain.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/portlet/HandlerExecutionChain.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HandlerExecutionChain.java	23 Jul 2007 11:17:35 -0000	1.3
--- HandlerExecutionChain.java	27 Nov 2008 18:04:36 -0000	1.4
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2007 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2008 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 115,117 ****
--- 115,125 ----
  	}
  
+ 
+ 	/**
+ 	 * Delegates to the handler's <code>toString()</code>.
+ 	 */
+ 	public String toString() {
+ 		return String.valueOf(this.handler);
+ 	}
+ 
  }

[Springframework-cvs] spring/tiger/src/org/springframework/jdbc/core/metadata GenericCallMetaDataProvider.java, 1.7, 1.8

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

Update of /cvsroot/springframework/spring/tiger/src/org/springframework/jdbc/core/metadata
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/tiger/src/org/springframework/jdbc/core/metadata

Modified Files:
	GenericCallMetaDataProvider.java 
Log Message:
polishing

Index: GenericCallMetaDataProvider.java
===================================================================
RCS file: /cvsroot/springframework/spring/tiger/src/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GenericCallMetaDataProvider.java	22 May 2008 21:10:01 -0000	1.7
--- GenericCallMetaDataProvider.java	27 Nov 2008 18:04:35 -0000	1.8
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2007 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2008 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 348,361 ****
  			}
  		}
! 		catch (SQLException se) {
! 			logger.warn("Error while retreiving metadata for procedure columns: " + se.getMessage());
  		}
  		finally {
  			try {
! 				if (procs != null)
  					procs.close();
  			}
! 			catch (SQLException se) {
! 				logger.warn("Problem closing resultset for procedure column metadata " + se.getMessage());
  			}
  		}
--- 348,362 ----
  			}
  		}
! 		catch (SQLException ex) {
! 			logger.warn("Error while retrieving metadata for procedure columns: " + ex);
  		}
  		finally {
  			try {
! 				if (procs != null) {
  					procs.close();
+ 				}
  			}
! 			catch (SQLException ex) {
! 				logger.warn("Problem closing ResultSet for procedure column metadata: " + ex);
  			}
  		}

[Springframework-cvs] spring/mock/org/springframework/test AbstractSpringContextTests.java, 1.18, 1.19 AbstractTransactionalSpringContextTests.java, 1.27, 1.28

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

Update of /cvsroot/springframework/spring/mock/org/springframework/test
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/mock/org/springframework/test

Modified Files:
	AbstractSpringContextTests.java 
	AbstractTransactionalSpringContextTests.java 
Log Message:
polishing

Index: AbstractSpringContextTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/mock/org/springframework/test/AbstractSpringContextTests.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** AbstractSpringContextTests.java	13 Sep 2007 09:29:18 -0000	1.18
--- AbstractSpringContextTests.java	27 Nov 2008 18:04:35 -0000	1.19
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2007 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2008 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 81,90 ****
  	}
  
  	/**
  	 * Explicitly add an ApplicationContext instance under a given key.
! 	 * <p>
! 	 * This is not meant to be used by subclasses. It is rather exposed for
  	 * special test suite environments.
- 	 *
  	 * @param key the context key
  	 * @param context the ApplicationContext instance
--- 81,89 ----
  	}
  
+ 
  	/**
  	 * Explicitly add an ApplicationContext instance under a given key.
! 	 * <p>This is not meant to be used by subclasses. It is rather exposed for
  	 * special test suite environments.
  	 * @param key the context key
  	 * @param context the ApplicationContext instance
***************
*** 97,101 ****
  	/**
  	 * Return whether there is a cached context for the given key.
- 	 *
  	 * @param key the context key
  	 */
--- 96,99 ----
***************
*** 105,138 ****
  
  	/**
! 	 * <p>
! 	 * Determines if the supplied context <code>key</code> is <em>empty</em>.
! 	 * </p>
! 	 * <p>
! 	 * By default, <code>null</code> values, empty strings, and zero-length
  	 * arrays are considered <em>empty</em>.
- 	 * </p>
- 	 *
  	 * @param key the context key to check
! 	 * @return <code>true</code> if the supplied context key is empty.
  	 */
  	protected boolean isContextKeyEmpty(Object key) {
! 		return (key == null) || ((key instanceof String) && !StringUtils.hasText((String) key))
! 				|| ((key instanceof Object[]) && ObjectUtils.isEmpty((Object[]) key));
  	}
  
  	/**
  	 * Obtain an ApplicationContext for the given key, potentially cached.
- 	 *
  	 * @param key the context key; may be <code>null</code>.
! 	 * @return the corresponding ApplicationContext instance (potentially
! 	 *         cached), or <code>null</code> if the provided <code>key</code>
! 	 *         is <em>empty</em>.
  	 */
  	protected final ConfigurableApplicationContext getContext(Object key) throws Exception {
- 
  		if (isContextKeyEmpty(key)) {
  			return null;
  		}
- 
  		String keyString = contextKeyString(key);
  		ConfigurableApplicationContext ctx = (ConfigurableApplicationContext) contextKeyToContextMap.get(keyString);
--- 103,127 ----
  
  	/**
! 	 * Determine if the supplied context <code>key</code> is <em>empty</em>.
! 	 * <p>By default, <code>null</code> values, empty strings, and zero-length
  	 * arrays are considered <em>empty</em>.
  	 * @param key the context key to check
! 	 * @return <code>true</code> if the supplied context key is empty
  	 */
  	protected boolean isContextKeyEmpty(Object key) {
! 		return (key == null) || ((key instanceof String) && !StringUtils.hasText((String) key)) ||
! 				((key instanceof Object[]) && ObjectUtils.isEmpty((Object[]) key));
  	}
  
  	/**
  	 * Obtain an ApplicationContext for the given key, potentially cached.
  	 * @param key the context key; may be <code>null</code>.
! 	 * @return the corresponding ApplicationContext instance (potentially cached),
! 	 * or <code>null</code> if the provided <code>key</code> is <em>empty</em>
  	 */
  	protected final ConfigurableApplicationContext getContext(Object key) throws Exception {
  		if (isContextKeyEmpty(key)) {
  			return null;
  		}
  		String keyString = contextKeyString(key);
  		ConfigurableApplicationContext ctx = (ConfigurableApplicationContext) contextKeyToContextMap.get(keyString);
***************
*** 148,158 ****
  	 * Mark the context with the given key as dirty. This will cause the cached
  	 * context to be reloaded before the next test case is executed.
! 	 * <p>
! 	 * Call this method only if you change the state of a singleton bean,
  	 * potentially affecting future tests.
  	 */
  	protected final void setDirty(Object contextKey) {
  		String keyString = contextKeyString(contextKey);
! 		ConfigurableApplicationContext ctx = (ConfigurableApplicationContext) contextKeyToContextMap.remove(keyString);
  		if (ctx != null) {
  			ctx.close();
--- 137,147 ----
  	 * Mark the context with the given key as dirty. This will cause the cached
  	 * context to be reloaded before the next test case is executed.
! 	 * <p>Call this method only if you change the state of a singleton bean,
  	 * potentially affecting future tests.
  	 */
  	protected final void setDirty(Object contextKey) {
  		String keyString = contextKeyString(contextKey);
! 		ConfigurableApplicationContext ctx =
! 				(ConfigurableApplicationContext) contextKeyToContextMap.remove(keyString);
  		if (ctx != null) {
  			ctx.close();
***************
*** 163,167 ****
  	 * Subclasses can override this to return a String representation of their
  	 * context key for use in caching and logging.
- 	 *
  	 * @param contextKey the context key
  	 */
--- 152,155 ----
***************
*** 172,178 ****
  	/**
  	 * Load a new ApplicationContext for the given key.
! 	 * <p>
! 	 * To be implemented by subclasses.
! 	 *
  	 * @param key the context key
  	 * @return the corresponding ApplicationContext instance (new)
--- 160,164 ----
  	/**
  	 * Load a new ApplicationContext for the given key.
! 	 * <p>To be implemented by subclasses.
  	 * @param key the context key
  	 * @return the corresponding ApplicationContext instance (new)

Index: AbstractTransactionalSpringContextTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/mock/org/springframework/test/AbstractTransactionalSpringContextTests.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** AbstractTransactionalSpringContextTests.java	13 Sep 2007 09:07:28 -0000	1.27
--- AbstractTransactionalSpringContextTests.java	27 Nov 2008 18:04:35 -0000	1.28
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2007 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2008 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 27,32 ****
   * transaction, but normally will roll the transaction back on the completion of
   * each test.
!  * <p>
!  * This is useful in a range of circumstances, allowing the following benefits:
   * <ul>
   * <li>Ability to delete or insert any data in the database, without affecting
--- 27,32 ----
   * transaction, but normally will roll the transaction back on the completion of
   * each test.
!  *
!  * <p>This is useful in a range of circumstances, allowing the following benefits:
   * <ul>
   * <li>Ability to delete or insert any data in the database, without affecting
***************
*** 35,54 ****
   * <li>Ability to write anything to the database without any need to clean up.
   * </ul>
!  * <p>
!  * This class is typically very fast, compared to traditional setup/teardown
   * scripts.
!  * <p>
!  * If data should be left in the database, call the {@link #setComplete()}
   * method in each test. The {@link #setDefaultRollback "defaultRollback"}
   * property, which defaults to "true", determines whether transactions will
   * complete by default.
!  * <p>
!  * It is even possible to end the transaction early; for example, to verify lazy
   * loading behavior of an O/R mapping tool. (This is a valuable away to avoid
   * unexpected errors when testing a web UI, for example.) Simply call the
   * {@link #endTransaction()} method. Execution will then occur without a
   * transactional context.
!  * <p>
!  * The {@link #startNewTransaction()} method may be called after a call to
   * {@link #endTransaction()} if you wish to create a new transaction, quite
   * independent of the old transaction. The new transaction's default fate will
--- 35,54 ----
   * <li>Ability to write anything to the database without any need to clean up.
   * </ul>
!  *
!  * <p>This class is typically very fast, compared to traditional setup/teardown
   * scripts.
!  *
!  * <p>If data should be left in the database, call the {@link #setComplete()}
   * method in each test. The {@link #setDefaultRollback "defaultRollback"}
   * property, which defaults to "true", determines whether transactions will
   * complete by default.
!  *
!  * <p>It is even possible to end the transaction early; for example, to verify lazy
   * loading behavior of an O/R mapping tool. (This is a valuable away to avoid
   * unexpected errors when testing a web UI, for example.) Simply call the
   * {@link #endTransaction()} method. Execution will then occur without a
   * transactional context.
!  *
!  * <p>The {@link #startNewTransaction()} method may be called after a call to
   * {@link #endTransaction()} if you wish to create a new transaction, quite
   * independent of the old transaction. The new transaction's default fate will
***************
*** 57,62 ****
   * ended in this way. The final transaction will automatically be rolled back
   * when the test case is torn down.
!  * <p>
!  * Transactional behavior requires a single bean in the context implementing the
   * {@link PlatformTransactionManager} interface. This will be set by the
   * superclass's Dependency Injection mechanism. If using the superclass's Field
--- 57,62 ----
   * ended in this way. The final transaction will automatically be rolled back
   * when the test case is torn down.
!  *
!  * <p>Transactional behavior requires a single bean in the context implementing the
   * {@link PlatformTransactionManager} interface. This will be set by the
   * superclass's Dependency Injection mechanism. If using the superclass's Field
***************
*** 65,70 ****
   * {@link AbstractDependencyInjectionSpringContextTests} superclass even when
   * there is more than one transaction manager in the context.
!  * <p>
!  * <b>This base class can also be used without transaction management, if no
   * PlatformTransactionManager bean is found in the context provided.</b> Be
   * careful about using this mode, as it allows the potential to permanently
--- 65,70 ----
   * {@link AbstractDependencyInjectionSpringContextTests} superclass even when
   * there is more than one transaction manager in the context.
!  *
!  * <p><b>This base class can also be used without transaction management, if no
   * PlatformTransactionManager bean is found in the context provided.</b> Be
   * careful about using this mode, as it allows the potential to permanently
***************
*** 82,95 ****
  
  	/** The transaction manager to use */
! 	protected PlatformTransactionManager	transactionManager;
  
  	/** Should we roll back by default? */
! 	private boolean							defaultRollback			= true;
  
  	/** Should we commit the current transaction? */
! 	private boolean							complete				= false;
  
  	/** Number of transactions started */
! 	private int								transactionsStarted		= 0;
  
  	/**
--- 82,95 ----
  
  	/** The transaction manager to use */
! 	protected PlatformTransactionManager transactionManager;
  
  	/** Should we roll back by default? */
! 	private boolean defaultRollback = true;
  
  	/** Should we commit the current transaction? */
! 	private boolean complete = false;
  
  	/** Number of transactions started */
! 	private int transactionsStarted = 0;
  
  	/**
***************
*** 98,107 ****
  	 * different behavior.
  	 */
! 	protected TransactionDefinition			transactionDefinition	= new DefaultTransactionDefinition();
  
  	/**
  	 * TransactionStatus for this test. Typical subclasses won't need to use it.
  	 */
! 	protected TransactionStatus				transactionStatus;
  
  	/**
--- 98,108 ----
  	 * different behavior.
  	 */
! 	protected TransactionDefinition	transactionDefinition= new DefaultTransactionDefinition();
  
  	/**
  	 * TransactionStatus for this test. Typical subclasses won't need to use it.
  	 */
! 	protected TransactionStatus	transactionStatus;
! 
  
  	/**
***************
*** 109,124 ****
  	 */
  	public AbstractTransactionalSpringContextTests() {
- 
  	}
  
  	/**
! 	 * Constructor for AbstractTransactionalSpringContextTests with a JUnit
! 	 * name.
  	 */
! 	public AbstractTransactionalSpringContextTests(final String name) {
! 
  		super(name);
  	}
  
  	/**
  	 * Specify the transaction manager to use. No transaction management will be
--- 110,123 ----
  	 */
  	public AbstractTransactionalSpringContextTests() {
  	}
  
  	/**
! 	 * Constructor for AbstractTransactionalSpringContextTests with a JUnit name.
  	 */
! 	public AbstractTransactionalSpringContextTests(String name) {
  		super(name);
  	}
  
+ 
  	/**
  	 * Specify the transaction manager to use. No transaction management will be
***************
*** 129,170 ****
  	 * {@link AbstractDependencyInjectionSpringContextTests} superclass.
  	 */
! 	public void setTransactionManager(final PlatformTransactionManager transactionManager) {
! 
  		this.transactionManager = transactionManager;
  	}
  
  	/**
  	 * Get the <em>default rollback</em> flag for this test.
- 	 *
  	 * @see #setDefaultRollback(boolean)
  	 * @return The <em>default rollback</em> flag.
  	 */
  	protected boolean isDefaultRollback() {
- 
  		return this.defaultRollback;
  	}
  
  	/**
- 	 * Subclasses can set this value in their constructor to change the default,
- 	 * which is always to roll the transaction back.
- 	 */
- 	public void setDefaultRollback(final boolean defaultRollback) {
- 
- 		this.defaultRollback = defaultRollback;
- 	}
- 
- 	/**
- 	 * <p>
  	 * Determines whether or not to rollback transactions for the current test.
! 	 * </p>
! 	 * <p>
! 	 * The default implementation delegates to {@link #isDefaultRollback()}.
  	 * Subclasses can override as necessary.
- 	 * </p>
- 	 *
- 	 * @return The <em>rollback</em> flag for the current test.
  	 */
  	protected boolean isRollback() {
- 
  		return isDefaultRollback();
  	}
--- 128,157 ----
  	 * {@link AbstractDependencyInjectionSpringContextTests} superclass.
  	 */
! 	public void setTransactionManager(PlatformTransactionManager transactionManager) {
  		this.transactionManager = transactionManager;
  	}
  
  	/**
+ 	 * Subclasses can set this value in their constructor to change the default,
+ 	 * which is always to roll the transaction back.
+ 	 */
+ 	public void setDefaultRollback(final boolean defaultRollback) {
+ 		this.defaultRollback = defaultRollback;
+ 	}
+ 	/**
  	 * Get the <em>default rollback</em> flag for this test.
  	 * @see #setDefaultRollback(boolean)
  	 * @return The <em>default rollback</em> flag.
  	 */
  	protected boolean isDefaultRollback() {
  		return this.defaultRollback;
  	}
  
  	/**
  	 * Determines whether or not to rollback transactions for the current test.
! 	 * <p>The default implementation delegates to {@link #isDefaultRollback()}.
  	 * Subclasses can override as necessary.
  	 */
  	protected boolean isRollback() {
  		return isDefaultRollback();
  	}
***************
*** 175,179 ****
  	 */
  	protected void preventTransaction() {
- 
  		this.transactionDefinition = null;
  	}
--- 162,165 ----
***************
*** 183,191 ****
  	 * the transaction attributes that will be used, so that {@link #setUp()}
  	 * and {@link #tearDown()} behavior is modified.
- 	 *
  	 * @param customDefinition the custom transaction definition
  	 */
! 	protected void setTransactionDefinition(final TransactionDefinition customDefinition) {
! 
  		this.transactionDefinition = customDefinition;
  	}
--- 169,175 ----
  	 * the transaction attributes that will be used, so that {@link #setUp()}
  	 * and {@link #tearDown()} behavior is modified.
  	 * @param customDefinition the custom transaction definition
  	 */
! 	protected void setTransactionDefinition(TransactionDefinition customDefinition) {
  		this.transactionDefinition = customDefinition;
  	}
***************
*** 193,208 ****
  	/**
  	 * This implementation creates a transaction before test execution.
! 	 * <p>
! 	 * Override {@link #onSetUpBeforeTransaction()} and/or
  	 * {@link #onSetUpInTransaction()} to add custom set-up behavior for
  	 * transactional execution. Alternatively, override this method for general
  	 * set-up behavior, calling <code>super.onSetUp()</code> as part of your
  	 * method implementation.
- 	 *
  	 * @throws Exception simply let any exception propagate
  	 * @see #onTearDown()
  	 */
  	protected void onSetUp() throws Exception {
- 
  		this.complete = !this.isRollback();
  
--- 177,189 ----
  	/**
  	 * This implementation creates a transaction before test execution.
! 	 * <p>Override {@link #onSetUpBeforeTransaction()} and/or
  	 * {@link #onSetUpInTransaction()} to add custom set-up behavior for
  	 * transactional execution. Alternatively, override this method for general
  	 * set-up behavior, calling <code>super.onSetUp()</code> as part of your
  	 * method implementation.
  	 * @throws Exception simply let any exception propagate
  	 * @see #onTearDown()
  	 */
  	protected void onSetUp() throws Exception {
  		this.complete = !this.isRollback();
  
***************
*** 232,240 ****
  	 * {@link #preventTransaction()} has not been invoked in an overridden
  	 * {@link #runTest()} method.
- 	 *
  	 * @throws Exception simply let any exception propagate
  	 */
  	protected void onSetUpBeforeTransaction() throws Exception {
- 
  	}
  
--- 213,219 ----
***************
*** 243,281 ****
  	 * as populating a database table, <i>within</i> the transaction created by
  	 * this class.
! 	 * <p>
! 	 * <b>NB:</b> Not called if there is no transaction management, due to no
  	 * transaction manager being provided in the context.
! 	 * <p>
! 	 * If any {@link Throwable} is thrown, the transaction that has been started
  	 * prior to the execution of this method will be
  	 * {@link #endTransaction() ended} (or rather an attempt will be made to
  	 * {@link #endTransaction() end it gracefully}); The offending
  	 * {@link Throwable} will then be rethrown.
- 	 *
  	 * @throws Exception simply let any exception propagate
  	 */
  	protected void onSetUpInTransaction() throws Exception {
- 
  	}
  
  	/**
  	 * This implementation ends the transaction after test execution.
! 	 * <p>
! 	 * Override {@link #onTearDownInTransaction()} and/or
  	 * {@link #onTearDownAfterTransaction()} to add custom tear-down behavior
  	 * for transactional execution. Alternatively, override this method for
  	 * general tear-down behavior, calling <code>super.onTearDown()</code> as
  	 * part of your method implementation.
! 	 * <p>
! 	 * Note that {@link #onTearDownInTransaction()} will only be called if a
  	 * transaction is still active at the time of the test shutdown. In
  	 * particular, it will <i>not</i> be called if the transaction has been
  	 * completed with an explicit {@link #endTransaction()} call before.
- 	 *
  	 * @throws Exception simply let any exception propagate
  	 * @see #onSetUp()
  	 */
  	protected void onTearDown() throws Exception {
- 
  		// Call onTearDownInTransaction and end transaction if the transaction
  		// is still active.
--- 222,252 ----
  	 * as populating a database table, <i>within</i> the transaction created by
  	 * this class.
! 	 * <p><b>NB:</b> Not called if there is no transaction management, due to no
  	 * transaction manager being provided in the context.
! 	 * <p>If any {@link Throwable} is thrown, the transaction that has been started
  	 * prior to the execution of this method will be
  	 * {@link #endTransaction() ended} (or rather an attempt will be made to
  	 * {@link #endTransaction() end it gracefully}); The offending
  	 * {@link Throwable} will then be rethrown.
  	 * @throws Exception simply let any exception propagate
  	 */
  	protected void onSetUpInTransaction() throws Exception {
  	}
  
  	/**
  	 * This implementation ends the transaction after test execution.
! 	 * <p>Override {@link #onTearDownInTransaction()} and/or
  	 * {@link #onTearDownAfterTransaction()} to add custom tear-down behavior
  	 * for transactional execution. Alternatively, override this method for
  	 * general tear-down behavior, calling <code>super.onTearDown()</code> as
  	 * part of your method implementation.
! 	 * <p>Note that {@link #onTearDownInTransaction()} will only be called if a
  	 * transaction is still active at the time of the test shutdown. In
  	 * particular, it will <i>not</i> be called if the transaction has been
  	 * completed with an explicit {@link #endTransaction()} call before.
  	 * @throws Exception simply let any exception propagate
  	 * @see #onSetUp()
  	 */
  	protected void onTearDown() throws Exception {
  		// Call onTearDownInTransaction and end transaction if the transaction
  		// is still active.
***************
*** 288,291 ****
--- 259,263 ----
  			}
  		}
+ 
  		// Call onTearDownAfterTransaction if there was at least one
  		// transaction, even if it has been completed early through an
***************
*** 301,312 ****
  	 * the transaction will still be visible. However, there is no need to clean
  	 * up the database, as a rollback will follow automatically.
! 	 * <p>
! 	 * <b>NB:</b> Not called if there is no actual transaction, for example due
  	 * to no transaction manager being provided in the application context.
- 	 *
  	 * @throws Exception simply let any exception propagate
  	 */
  	protected void onTearDownInTransaction() throws Exception {
- 
  	}
  
--- 273,281 ----
  	 * the transaction will still be visible. However, there is no need to clean
  	 * up the database, as a rollback will follow automatically.
! 	 * <p><b>NB:</b> Not called if there is no actual transaction, for example due
  	 * to no transaction manager being provided in the application context.
  	 * @throws Exception simply let any exception propagate
  	 */
  	protected void onTearDownInTransaction() throws Exception {
  	}
  
***************
*** 314,322 ****
  	 * Subclasses can override this method to perform cleanup after a
  	 * transaction here. At this point, the transaction is <i>not active anymore</i>.
- 	 *
  	 * @throws Exception simply let any exception propagate
  	 */
  	protected void onTearDownAfterTransaction() throws Exception {
- 
  	}
  
--- 283,289 ----
***************
*** 324,333 ****
  	 * Cause the transaction to commit for this test method, even if the test
  	 * method is configured to {@link #isRollback() rollback}.
- 	 *
  	 * @throws IllegalStateException if the operation cannot be set to complete
! 	 *         as no transaction manager was provided
  	 */
  	protected void setComplete() {
- 
  		if (this.transactionManager == null) {
  			throw new IllegalStateException("No transaction manager set");
--- 291,298 ----
  	 * Cause the transaction to commit for this test method, even if the test
  	 * method is configured to {@link #isRollback() rollback}.
  	 * @throws IllegalStateException if the operation cannot be set to complete
! 	 * as no transaction manager was provided
  	 */
  	protected void setComplete() {
  		if (this.transactionManager == null) {
  			throw new IllegalStateException("No transaction manager set");
***************
*** 339,353 ****
  	 * Immediately force a commit or rollback of the transaction, according to
  	 * the <code>complete</code> and {@link #isRollback() rollback} flags.
! 	 * <p>
! 	 * Can be used to explicitly let the transaction end early, for example to
  	 * check whether lazy associations of persistent objects work outside of a
  	 * transaction (that is, have been initialized properly).
- 	 *
  	 * @see #setComplete()
  	 */
  	protected void endTransaction() {
- 
  		final boolean commit = this.complete || !isRollback();
- 
  		if (this.transactionStatus != null) {
  			try {
--- 304,314 ----
  	 * Immediately force a commit or rollback of the transaction, according to
  	 * the <code>complete</code> and {@link #isRollback() rollback} flags.
! 	 * <p>Can be used to explicitly let the transaction end early, for example to
  	 * check whether lazy associations of persistent objects work outside of a
  	 * transaction (that is, have been initialized properly).
  	 * @see #setComplete()
  	 */
  	protected void endTransaction() {
  		final boolean commit = this.complete || !isRollback();
  		if (this.transactionStatus != null) {
  			try {
***************
*** 372,380 ****
  	 * used again in the new transaction. The fate of the new transaction, by
  	 * default, will be the usual rollback.
- 	 *
  	 * @throws TransactionException if starting the transaction failed
  	 */
  	protected void startNewTransaction() throws TransactionException {
- 
  		if (this.transactionStatus != null) {
  			throw new IllegalStateException("Cannot start new transaction without ending existing transaction: "
--- 333,339 ----

[Springframework-cvs] spring/src/org/springframework/beans/factory/access SingletonBeanFactoryLocator.java, 1.37, 1.38

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

Update of /cvsroot/springframework/spring/src/org/springframework/beans/factory/access
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/src/org/springframework/beans/factory/access

Modified Files:
	SingletonBeanFactoryLocator.java 
Log Message:
polishing

Index: SingletonBeanFactoryLocator.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** SingletonBeanFactoryLocator.java	5 Jan 2008 16:49:09 -0000	1.37
--- SingletonBeanFactoryLocator.java	27 Nov 2008 18:04:36 -0000	1.38
***************
*** 278,282 ****
  
  	/** The keyed BeanFactory instances */
! 	private static Map instances = new HashMap();
  
  
--- 278,282 ----
  
  	/** The keyed BeanFactory instances */
! 	private static final Map instances = new HashMap();
  
  

[Springframework-cvs] spring/src/org/springframework/aop/support DelegatePerTargetObjectIntroductionInterceptor.java, 1.2, 1.3

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

Update of /cvsroot/springframework/spring/src/org/springframework/aop/support
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/src/org/springframework/aop/support

Modified Files:
	DelegatePerTargetObjectIntroductionInterceptor.java 
Log Message:
polishing

Index: DelegatePerTargetObjectIntroductionInterceptor.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DelegatePerTargetObjectIntroductionInterceptor.java	29 Jan 2007 10:58:28 -0000	1.2
--- DelegatePerTargetObjectIntroductionInterceptor.java	27 Nov 2008 18:04:35 -0000	1.3
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2007 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2008 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 57,61 ****
  	 * Hold weak references to keys as we don't want to interfere with garbage collection..
  	 */
! 	private Map delegateMap = new WeakHashMap();
  
  	private Class defaultImplType;
--- 57,61 ----
  	 * Hold weak references to keys as we don't want to interfere with garbage collection..
  	 */
! 	private final Map delegateMap = new WeakHashMap();
  
  	private Class defaultImplType;

[Springframework-cvs] spring/src/org/springframework/web/portlet/util PortletUtils.java, 1.7, 1.8

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

Update of /cvsroot/springframework/spring/src/org/springframework/web/portlet/util
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/src/org/springframework/web/portlet/util

Modified Files:
	PortletUtils.java 
Log Message:
polishing

Index: PortletUtils.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/portlet/util/PortletUtils.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PortletUtils.java	17 Nov 2007 17:19:19 -0000	1.7
--- PortletUtils.java	27 Nov 2008 18:04:35 -0000	1.8
***************
*** 279,283 ****
  	public static void exposeRequestAttributes(PortletRequest request, Map attributes) {
  		Assert.notNull(request, "Request must not be null");
! 		Assert.notNull(attributes, "attributes Map must not be null");
  		Iterator it = attributes.entrySet().iterator();
  		while (it.hasNext()) {
--- 279,283 ----
  	public static void exposeRequestAttributes(PortletRequest request, Map attributes) {
  		Assert.notNull(request, "Request must not be null");
! 		Assert.notNull(attributes, "Attributes Map must not be null");
  		Iterator it = attributes.entrySet().iterator();
  		while (it.hasNext()) {

[Springframework-cvs] spring/src/org/springframework/jndi JndiCallback.java, 1.4, 1.5

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

Update of /cvsroot/springframework/spring/src/org/springframework/jndi
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/src/org/springframework/jndi

Modified Files:
	JndiCallback.java 
Log Message:
polishing

Index: JndiCallback.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/jndi/JndiCallback.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JndiCallback.java	12 Sep 2005 20:35:31 -0000	1.4
--- JndiCallback.java	27 Nov 2008 18:04:36 -0000	1.5
***************
*** 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-2008 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,
***************
*** 30,36 ****
   * convenience methods.
   *
   * @see JndiTemplate
   * @see org.springframework.jdbc.core.JdbcTemplate
-  * @author Rod Johnson
   */
  public interface JndiCallback {
--- 30,36 ----
   * convenience methods.
   *
+  * @author Rod Johnson
   * @see JndiTemplate
   * @see org.springframework.jdbc.core.JdbcTemplate
   */
  public interface JndiCallback {
***************
*** 38,42 ****
  	/**
  	 * Do something with the given JNDI context.
! 	 * Implementations don't need to worry about error handling
  	 * or cleanup, as the JndiTemplate class will handle this.
  	 * @param ctx the current JNDI context
--- 38,42 ----
  	/**
  	 * Do something with the given JNDI context.
! 	 * <p>Implementations don't need to worry about error handling
  	 * or cleanup, as the JndiTemplate class will handle this.
  	 * @param ctx the current JNDI context

[Springframework-cvs] spring/tiger/src/org/springframework/orm/jpa JpaOperations.java, 1.6, 1.7

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

Update of /cvsroot/springframework/spring/tiger/src/org/springframework/orm/jpa
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/tiger/src/org/springframework/orm/jpa

Modified Files:
	JpaOperations.java 
Log Message:
polishing

Index: JpaOperations.java
===================================================================
RCS file: /cvsroot/springframework/spring/tiger/src/org/springframework/orm/jpa/JpaOperations.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JpaOperations.java	30 Nov 2006 12:30:58 -0000	1.6
--- JpaOperations.java	27 Nov 2008 18:04:35 -0000	1.7
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2006 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2008 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 74,78 ****
  	List find(String queryString, Object... values) throws DataAccessException;
  
! 	List findByNamedParams(String queryString, Map<String,? extends Object> params) throws DataAccessException;
  
  	List findByNamedQuery(String queryName) throws DataAccessException;
--- 74,78 ----
  	List find(String queryString, Object... values) throws DataAccessException;
  
! 	List findByNamedParams(String queryString, Map<String, ?> params) throws DataAccessException;
  
  	List findByNamedQuery(String queryName) throws DataAccessException;
***************
*** 80,84 ****
  	List findByNamedQuery(String queryName, Object... values) throws DataAccessException;
  
! 	List findByNamedQueryAndNamedParams(String queryName, Map<String,? extends Object> params) throws DataAccessException;
  
  }
--- 80,84 ----
  	List findByNamedQuery(String queryName, Object... values) throws DataAccessException;
  
! 	List findByNamedQueryAndNamedParams(String queryName, Map<String, ?> params) throws DataAccessException;
  
  }

[Springframework-cvs] spring/src/org/springframework/aop/aspectj AspectJExpressionPointcut.java, 1.37, 1.38

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

Update of /cvsroot/springframework/spring/src/org/springframework/aop/aspectj
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/src/org/springframework/aop/aspectj

Modified Files:
	AspectJExpressionPointcut.java 
Log Message:
polishing

Index: AspectJExpressionPointcut.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/aop/aspectj/AspectJExpressionPointcut.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** AspectJExpressionPointcut.java	30 Sep 2008 14:42:20 -0000	1.37
--- AspectJExpressionPointcut.java	27 Nov 2008 18:04:35 -0000	1.38
***************
*** 93,97 ****
  	private static final Log logger = LogFactory.getLog(AspectJExpressionPointcut.class);
  
! 	private final Map shadowMapCache = new HashMap();
  
  	private PointcutParser pointcutParser;
--- 93,97 ----
  	private static final Log logger = LogFactory.getLog(AspectJExpressionPointcut.class);
  
! 	private final Map shadowMatchCache = new HashMap();
  
  	private PointcutParser pointcutParser;
***************
*** 365,370 ****
  
  	private ShadowMatch getShadowMatch(Method targetMethod, Method originalMethod) {
! 		synchronized (this.shadowMapCache) {
! 			ShadowMatch shadowMatch = (ShadowMatch) this.shadowMapCache.get(targetMethod);
  			if (shadowMatch == null) {
  				try {
--- 365,370 ----
  
  	private ShadowMatch getShadowMatch(Method targetMethod, Method originalMethod) {
! 		synchronized (this.shadowMatchCache) {
! 			ShadowMatch shadowMatch = (ShadowMatch) this.shadowMatchCache.get(targetMethod);
  			if (shadowMatch == null) {
  				try {
***************
*** 379,383 ****
  					shadowMatch = this.pointcutExpression.matchesMethodExecution(originalMethod);
  				}
! 				this.shadowMapCache.put(targetMethod, shadowMatch);
  			}
  			return shadowMatch;
--- 379,383 ----
  					shadowMatch = this.pointcutExpression.matchesMethodExecution(originalMethod);
  				}
! 				this.shadowMatchCache.put(targetMethod, shadowMatch);
  			}
  			return shadowMatch;

[Springframework-cvs] spring/src/org/springframework/validation AbstractErrors.java, 1.1, 1.2

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

Update of /cvsroot/springframework/spring/src/org/springframework/validation
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/src/org/springframework/validation

Modified Files:
	AbstractErrors.java 
Log Message:
polishing

Index: AbstractErrors.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/validation/AbstractErrors.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractErrors.java	1 Apr 2008 21:56:20 -0000	1.1
--- AbstractErrors.java	27 Nov 2008 18:04:35 -0000	1.2
***************
*** 199,202 ****
--- 199,203 ----
  		return null;
  	}
+ 
  	/**
  	 * Check whether the given FieldError matches the given field.

[Springframework-cvs] spring/src/org/springframework/web/util WebUtils.java, 1.49, 1.50

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

Update of /cvsroot/springframework/spring/src/org/springframework/web/util
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/src/org/springframework/web/util

Modified Files:
	WebUtils.java 
Log Message:
polishing

Index: WebUtils.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/util/WebUtils.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** WebUtils.java	20 Nov 2008 23:33:21 -0000	1.49
--- WebUtils.java	27 Nov 2008 18:04:35 -0000	1.50
***************
*** 470,473 ****
--- 470,474 ----
  	public static void exposeRequestAttributes(ServletRequest request, Map attributes) {
  		Assert.notNull(request, "Request must not be null");
+ 		Assert.notNull(attributes, "Attributes Map must not be null");
  		Iterator it = attributes.entrySet().iterator();
  		while (it.hasNext()) {

[Springframework-cvs] spring/src/org/springframework/web/util WebUtils.java, 1.48, 1.49

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

Update of /cvsroot/springframework/spring/src/org/springframework/web/util
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30961/src/org/springframework/web/util

Modified Files:
	WebUtils.java 
Log Message:
WebUtils.findParameterValue needs to deal with String array values in the given Map

Index: WebUtils.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/util/WebUtils.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** WebUtils.java	2 Sep 2008 12:09:31 -0000	1.48
--- WebUtils.java	20 Nov 2008 23:33:21 -0000	1.49
***************
*** 563,569 ****
  	public static String findParameterValue(Map parameters, String name) {
  		// First try to get it as a normal name=value parameter
! 		String value = (String) parameters.get(name);
! 		if (value != null) {
! 			return value;
  		}
  		// If no value yet, try to get it as a name_value=xyz parameter
--- 563,573 ----
  	public static String findParameterValue(Map parameters, String name) {
  		// First try to get it as a normal name=value parameter
! 		Object value = parameters.get(name);
! 		if (value instanceof String[]) {
! 			String[] values = (String[]) value;
! 			return (values.length > 0 ? values[0] : null);
! 		}
! 		else if (value != null) {
! 			return value.toString();
  		}
  		// If no value yet, try to get it as a name_value=xyz parameter

[Springframework-cvs] spring/test/org/springframework/web/util WebUtilsTests.java, 1.2, 1.3

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

Update of /cvsroot/springframework/spring/test/org/springframework/web/util
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30961/test/org/springframework/web/util

Modified Files:
	WebUtilsTests.java 
Log Message:
WebUtils.findParameterValue needs to deal with String array values in the given Map

Index: WebUtilsTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/test/org/springframework/web/util/WebUtilsTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WebUtilsTests.java	2 Sep 2008 12:09:31 -0000	1.2
--- WebUtilsTests.java	20 Nov 2008 23:33:21 -0000	1.3
***************
*** 32,36 ****
  		params.put("myKey2_myValue2", "xxx");
  		params.put("myKey3_myValue3.x", "xxx");
! 		params.put("myKey4_myValue4.y", "yyy");
  
  		assertNull(WebUtils.findParameterValue(params, "myKey0"));
--- 32,36 ----
  		params.put("myKey2_myValue2", "xxx");
  		params.put("myKey3_myValue3.x", "xxx");
! 		params.put("myKey4_myValue4.y", new String[] {"yyy"});
  
  		assertNull(WebUtils.findParameterValue(params, "myKey0"));

[Springframework-cvs] spring/src/org/springframework/jms/support JmsUtils.java, 1.21, 1.22

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

Update of /cvsroot/springframework/spring/src/org/springframework/jms/support
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25367/src/org/springframework/jms/support

Modified Files:
	JmsUtils.java 
Log Message:
fixed buildExceptionMessage to avoid potential NPE (SPR-5275)

Index: JmsUtils.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/jms/support/JmsUtils.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** JmsUtils.java	17 Jul 2008 07:46:27 -0000	1.21
--- JmsUtils.java	20 Nov 2008 22:17:59 -0000	1.22
***************
*** 253,258 ****
  		String message = ex.getMessage();
  		Exception linkedEx = ex.getLinkedException();
! 		if (linkedEx != null && message.indexOf(linkedEx.getMessage()) == -1) {
! 			message = message + "; nested exception is " + linkedEx;
  		}
  		return message;
--- 253,263 ----
  		String message = ex.getMessage();
  		Exception linkedEx = ex.getLinkedException();
! 		if (linkedEx != null) {
! 			if (message == null) {
! 				message = linkedEx.toString();
! 			}
! 			else if (!message.contains(linkedEx.getMessage())) {
! 				message = message + "; nested exception is " + linkedEx;
! 			}
  		}
  		return message;

[Springframework-cvs] spring/osgi/bundlor org.springframework.mf, 1.3, 1.4 org.springframework.beans.mf, 1.4, 1.5

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

Update of /cvsroot/springframework/spring/osgi/bundlor
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24075/osgi/bundlor

Modified Files:
	org.springframework.mf org.springframework.beans.mf 
Log Message:
fixed javax.el version range (following 2.5.6.A)

Index: org.springframework.beans.mf
===================================================================
RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.beans.mf,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** org.springframework.beans.mf	28 Oct 2008 17:12:08 -0000	1.4
--- org.springframework.beans.mf	20 Nov 2008 12:54:54 -0000	1.5
***************
*** 4,8 ****
  Bundle-ManifestVersion: 2
  Import-Template: 
!  javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional,
   net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional,
   org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
--- 4,8 ----
  Bundle-ManifestVersion: 2
  Import-Template: 
!  javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional,
   net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional,
   org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",

Index: org.springframework.mf
===================================================================
RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.mf,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** org.springframework.mf	30 Oct 2008 14:45:16 -0000	1.3
--- org.springframework.mf	20 Nov 2008 12:54:54 -0000	1.4
***************
*** 41,45 ****
   javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional,
   javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional,
!  javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional,
   javax.faces.*;version="[1.2.0.08, 2.0.0)";resolution:=optional,
   javax.interceptor.*;version="[3.0.0, 4.0.0)";resolution:=optional,
--- 41,45 ----
   javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional,
   javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional,
!  javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional,
   javax.faces.*;version="[1.2.0.08, 2.0.0)";resolution:=optional,
   javax.interceptor.*;version="[3.0.0, 4.0.0)";resolution:=optional,

[Springframework-cvs] spring/osgi/bundlor org.springframework.web.mf, 1.5, 1.6

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

Update of /cvsroot/springframework/spring/osgi/bundlor
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23281/osgi/bundlor

Modified Files:
	org.springframework.web.mf 
Log Message:
fixed javax.el version range (following 2.5.6.A)

Index: org.springframework.web.mf
===================================================================
RCS file: /cvsroot/springframework/spring/osgi/bundlor/org.springframework.web.mf,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** org.springframework.web.mf	30 Oct 2008 14:45:16 -0000	1.5
--- org.springframework.web.mf	20 Nov 2008 12:40:25 -0000	1.6
***************
*** 5,9 ****
  Import-Template: 
   com.caucho.*;version="[3.1.3, 4.0.0)";resolution:=optional,
!  javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional,
   javax.faces.*;version="[1.2.0.08, 2.0.0)";resolution:=optional,
   javax.servlet;version="[2.4.0, 3.0.0)",
--- 5,9 ----
  Import-Template: 
   com.caucho.*;version="[3.1.3, 4.0.0)";resolution:=optional,
!  javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional,
   javax.faces.*;version="[1.2.0.08, 2.0.0)";resolution:=optional,
   javax.servlet;version="[2.4.0, 3.0.0)",

[Springframework-cvs] spring/src/org/springframework/web/context/request FacesWebRequest.java, 1.2, 1.3

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

Update of /cvsroot/springframework/spring/src/org/springframework/web/context/request
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15797/src/org/springframework/web/context/request

Modified Files:
	FacesWebRequest.java 
Log Message:
FacesWebRequest.getParameterMap() maps onto ExternalContext.getRequestParameterValuesMap() due to String array value type

Index: FacesWebRequest.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/context/request/FacesWebRequest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FacesWebRequest.java	24 Oct 2008 10:33:26 -0000	1.2
--- FacesWebRequest.java	19 Nov 2008 17:07:41 -0000	1.3
***************
*** 62,66 ****
  
  	public Map getParameterMap() {
! 		return getExternalContext().getRequestParameterMap();
  	}
  
--- 62,66 ----
  
  	public Map getParameterMap() {
! 		return getExternalContext().getRequestParameterValuesMap();
  	}
  

[Springframework-cvs] spring/src/org/springframework/web/context/request FacesRequestAttributes.java, 1.1, 1.2

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

Update of /cvsroot/springframework/spring/src/org/springframework/web/context/request
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14293/src/org/springframework/web/context/request

Modified Files:
	FacesRequestAttributes.java 
Log Message:
fixed FacesRequestAttributes getAttributeNames to expose keys rather than entries

Index: FacesRequestAttributes.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/context/request/FacesRequestAttributes.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FacesRequestAttributes.java	20 Feb 2008 12:38:19 -0000	1.1
--- FacesRequestAttributes.java	19 Nov 2008 16:45:52 -0000	1.2
***************
*** 114,118 ****
  
  	public String[] getAttributeNames(int scope) {
! 		return StringUtils.toStringArray(getAttributeMap(scope).entrySet());
  	}
  
--- 114,118 ----
  
  	public String[] getAttributeNames(int scope) {
! 		return StringUtils.toStringArray(getAttributeMap(scope).keySet());
  	}