Removed deprecated helper classes and methods (that have been deprecated since 3.0 or before)

spring-beans/src/main/java/org/springframework/beans/factory/config/PropertiesFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -95,21 +95,6 @@ public class PropertiesFactoryBean extends PropertiesLoaderSupport
 	 * @see #mergeProperties()
 	 */
 	protected Properties createProperties() throws IOException {
-		return (Properties) createInstance();
-	}
-
-	/**
-	 * Template method that subclasses may override to construct the object
-	 * returned by this factory. The default implementation returns the
-	 * plain merged Properties instance.
-	 * <p>Invoked on initialization of this FactoryBean in case of a
-	 * shared singleton; else, on each {@link #getObject()} call.
-	 * @return the object returned by this factory
-	 * @throws IOException if an exception occured during properties loading
-	 * @deprecated as of Spring 3.0, in favor of {@link #createProperties()}
-	 */
-	@Deprecated
-	protected Object createInstance() throws IOException {
 		return mergeProperties();
 	}
 

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -204,17 +204,6 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 		setPropertyValues(pvs);
 	}
 
-	/**
-	 * Create a new AbstractBeanDefinition as a deep copy of the given
-	 * bean definition.
-	 * @param original the original bean definition to copy from
-	 * @deprecated since Spring 2.5, in favor of {@link #AbstractBeanDefinition(BeanDefinition)}
-	 */
-	@Deprecated
-	protected AbstractBeanDefinition(AbstractBeanDefinition original) {
-		this((BeanDefinition) original);
-	}
-
 	/**
 	 * Create a new AbstractBeanDefinition as a deep copy of the given
 	 * bean definition.
@@ -261,17 +250,6 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	}
 
 
-	/**
-	 * Override settings in this bean definition (presumably a copied parent
-	 * from a parent-child inheritance relationship) from the given bean
-	 * definition (presumably the child).
-	 * @deprecated since Spring 2.5, in favor of {@link #overrideFrom(BeanDefinition)}
-	 */
-	@Deprecated
-	public void overrideFrom(AbstractBeanDefinition other) {
-		overrideFrom((BeanDefinition) other);
-	}
-
 	/**
 	 * Override settings in this bean definition (presumably a copied parent
 	 * from a parent-child inheritance relationship) from the given bean