[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/idp.properties idp-conf/src/main/resource...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct  6 16:47:54 2014
New Revision: 6640

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6640&view=rev
Log:
Check point work on service reload flow.

Added:
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-flow.xml   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java
      - copied, changed from r6635, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadService.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadServiceConfigurationTest.java
      - copied, changed from r6635, trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadTest.java
Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadService.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadTest.java

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6640&r1=6639&r2=6640&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon Oct  6 16:47:54 2014
@@ -158,6 +158,7 @@
 # May differ to direct SAML 2 artifact lookups to specific server nodes
 #idp.artifact.endpointIndex = 1
 
-# Name of access control policy for various flows
+# Name of access control policy for various admin flows
 idp.status.accessPolicy = AccessByIPAddress
 idp.resolvertest.accessPolicy = AccessByIPAddress
+idp.reload.accessPolicy = AccessByIPAddress

Modified: trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml?rev=6640&r1=6639&r2=6640&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml Mon Oct  6 16:47:54 2014
@@ -23,6 +23,7 @@
 
         <!-- New administrative and debugging flows. -->
         <webflow:flow-location id="admin/resolvertest" path="../system/flows/admin/resolvertest-flow.xml" />
+        <webflow:flow-location id="admin/reload" path="../system/flows/admin/reload-flow.xml" />
         
         <!-- Proprietary logout flow. -->
         <webflow:flow-location id="Logout" path="../system/flows/logout/logout-flow.xml" />

Copied: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java (from r6635, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadService.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java?p2=trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java&p1=trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadService.java&r1=6635&r2=6640&rev=6640&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadService.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java Mon Oct  6 16:47:54 2014
@@ -17,39 +17,104 @@
 
 package net.shibboleth.idp.profile.impl;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.servlet.http.HttpServletResponse;
+
 import net.shibboleth.idp.profile.AbstractProfileAction;
+import net.shibboleth.idp.profile.context.SpringRequestContext;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.service.ReloadableService;
+import net.shibboleth.utilities.java.support.service.ServiceException;
 
+import org.opensaml.profile.action.ActionSupport;
+import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.webflow.execution.RequestContext;
 
-/** Action that refreshes a service manually. */
-public class ReloadService extends AbstractProfileAction {
+/**
+ * Action that refreshes a {@link ReloadableService} manually.
+ * 
+ * <p>The service to reload is indicated by supplying {@link #SERVICE_ID} as a query parameter.</p>
+ * 

[... 164 lines stripped ...]