[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/webflow-config.xml idp-conf/src/ma...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct  6 22:35:01 2014
New Revision: 6642

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6642&view=rev
Log:
IDP-72 - Working flow and CLI for service reload.

Added:
    trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ReloadServiceArguments.java   (with props)
    trunk/idp-distribution/src/main/resources/bin/reload.bat   (with props)
    trunk/idp-distribution/src/main/resources/bin/reload.sh   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-beans.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadServiceConfigurationTest.java

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=6642&r1=6641&r2=6642&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 22:35:01 2014
@@ -23,7 +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" />
+        <webflow:flow-location id="admin/reload-service" path="../system/flows/admin/reload-flow.xml" />
         
         <!-- Proprietary logout flow. -->
         <webflow:flow-location id="Logout" path="../system/flows/logout/logout-flow.xml" />

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/reload-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/reload-beans.xml?rev=6642&r1=6641&r2=6642&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/reload-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/reload-beans.xml Mon Oct  6 22:35:01 2014
@@ -33,7 +33,7 @@
         p:policyName="%{idp.reload.accessPolicy}" />
 
     <bean id="ReloadServiceConfiguration"
-        class="org.opensaml.profile.action.impl.ReloadServiceConfiguration" scope="prototype"
+        class="net.shibboleth.idp.profile.impl.ReloadServiceConfiguration" scope="prototype"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest"
         p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
         

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java?rev=6642&r1=6641&r2=6642&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadServiceConfiguration.java Mon Oct  6 22:35:01 2014
@@ -17,6 +17,8 @@
 
 package net.shibboleth.idp.profile.impl;
 
+import java.io.IOException;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.servlet.http.HttpServletResponse;
@@ -24,6 +26,9 @@
 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.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
+import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.service.ReloadableService;
 import net.shibboleth.utilities.java.support.service.ServiceException;
@@ -33,7 +38,10 @@
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
 import org.springframework.webflow.execution.RequestContext;
+
+import com.google.common.base.Function;
 
 /**
  * Action that refreshes a {@link ReloadableService} manually.
@@ -45,6 +53,7 @@
  * 
  * @event {@link EventIds#PROCEED_EVENT_ID}
  * @event {@link EventIds#INVALID_PROFILE_CTX}
+ * @event {@link EventIds#IO_ERROR}
  * @event {@link EventIds#UNABLE_TO_DECODE}
  */
 public class ReloadServiceConfiguration extends AbstractProfileAction {
@@ -55,49 +64,47 @@
     /** Class logger. */

[... 284 lines stripped ...]