master
Juergen Hoeller 15 years ago
parent 364641e9bc
commit ea8f628c9c
  1. 14
      org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
  2. 7
      org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java
  3. 9
      org.springframework.jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java

@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2009 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.
@ -1687,17 +1687,11 @@ public final class BeanWrapperTests {
public void setMyStringss(String string) {}
}
private static class Employee extends TestBean {
private String co;
/**
* Constructor for Employee.
*/
public Employee() {
super();
}
public String getCompany() {
return co;
}
@ -1705,9 +1699,9 @@ public final class BeanWrapperTests {
public void setCompany(String co) {
this.co = co;
}
}
@SuppressWarnings("serial")
public static class ReadOnlyMap extends HashMap<Object, Object> {
@ -1733,7 +1727,7 @@ public final class BeanWrapperTests {
}
}
public Set<Entry<Object, Object>> entrySet() {
public Set<Map.Entry<Object, Object>> entrySet() {
this.accessed = true;
return super.entrySet();
}

@ -1,5 +1,5 @@
/*
* Copyright 2002-2007 the original author or authors.
* Copyright 2002-2009 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.
@ -16,11 +16,10 @@
package org.springframework.jdbc.core.metadata;
import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
import java.sql.Connection;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
import org.springframework.dao.InvalidDataAccessApiUsageException;

@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2009 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.
@ -16,8 +16,7 @@
package org.springframework.jms.listener.endpoint;
import java.util.Properties;
import java.util.Map;
import javax.jms.JMSException;
import javax.jms.Queue;
import javax.jms.Session;
@ -53,7 +52,7 @@ public class StandardJmsActivationSpecFactory implements JmsActivationSpecFactor
private Class activationSpecClass;
private Properties defaultProperties;
private Map<String, String> defaultProperties;
private DestinationResolver destinationResolver;
@ -72,7 +71,7 @@ public class StandardJmsActivationSpecFactory implements JmsActivationSpecFactor
* listener-specific settings. Allows for configuring vendor-specific properties
* beyond the Spring-defined settings in {@link JmsActivationSpecConfig}.
*/
public void setDefaultProperties(Properties defaultProperties) {
public void setDefaultProperties(Map<String, String> defaultProperties) {
this.defaultProperties = defaultProperties;
}

Loading…
Cancel
Save