[java-identity-provider COMMIT] /trunk/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationConte...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Nov  4 11:17:52 2015
New Revision: 7932

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7932&view=rev
Log:
IDP-812 - Rename a not-yet-released method, cleanup.

Modified:
    trunk/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java?rev=7932&r1=7931&r2=7932&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java	(original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java	Wed Nov  4 11:17:52 2015
@@ -97,7 +97,7 @@
 
                 logProperties(properties);
 
-                addPropertySourceToApplicationContext(applicationContext, resource.toString(), properties);
+                appendPropertySource(applicationContext, resource.toString(), properties);
 
                 return;
             }
@@ -107,18 +107,18 @@
     }
 
     /**
-     * Get the target resource to be searched for {@link #IDP_PROPERTIES}.
-     * 
-     * @return the target resource to be searched for {@link #IDP_PROPERTIES}
+     * Get the target resource to be searched for. Defaults to {@link #IDP_PROPERTIES}.
+     * 
+     * @return the target resource to be searched for
      */
     @Nonnull public String getSearchTarget() {
         return IDP_PROPERTIES;
     }
 
     /**
-     * Get the well known search locations {@link #SEARCH_LOCATIONS}.
-     * 
-     * @return the well known search locations {@link #SEARCH_LOCATIONS}
+     * Get the well known search locations. Defaults to {@link #SEARCH_LOCATIONS}.
+     * 
+     * @return the well known search locations
      */
     @Nonnull public String[] getSearchLocations() {
         return SEARCH_LOCATIONS;
@@ -226,7 +226,7 @@
      * @param name the name of the property source to be added to the application context
      * @param properties the properties added to the application context
      */
-    public void addPropertySourceToApplicationContext(@Nonnull final ConfigurableApplicationContext applicationContext,
+    public void appendPropertySource(@Nonnull final ConfigurableApplicationContext applicationContext,
             @Nonnull final String name, @Nonnull final Properties properties) {
         applicationContext.getEnvironment().getPropertySources()
                 .addLast(new PropertiesPropertySource(name, properties));