[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: Wed Oct  8 16:31:50 2014
New Revision: 6656

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6656&view=rev
Log:
IDP-72 - add metadata reload flow and CLI, rename service reloading flow files

Added:
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml
      - copied unchanged from r6653, trunk/idp-conf/src/main/resources/system/flows/admin/reload-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-flow.xml
      - copied, changed from r6653, trunk/idp-conf/src/main/resources/system/flows/admin/reload-flow.xml
    trunk/idp-core/src/main/java/net/shibboleth/idp/cli/ReloadMetadataArguments.java   (with props)
    trunk/idp-distribution/src/main/resources/bin/reload-metadata.bar
    trunk/idp-distribution/src/main/resources/bin/reload-metadata.sh   (with props)
    trunk/idp-distribution/src/main/resources/bin/reload-service.bat
      - copied unchanged from r6653, trunk/idp-distribution/src/main/resources/bin/reload.bat
    trunk/idp-distribution/src/main/resources/bin/reload-service.sh
      - copied unchanged from r6653, trunk/idp-distribution/src/main/resources/bin/reload.sh
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-conf/src/main/resources/system/flows/admin/reload-flow.xml
    trunk/idp-distribution/src/main/resources/bin/reload.bat
    trunk/idp-distribution/src/main/resources/bin/reload.sh
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.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=6656&r1=6655&r2=6656&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 Wed Oct  8 16:31:50 2014
@@ -23,7 +23,8 @@
 
         <!-- New administrative and debugging flows. -->
         <webflow:flow-location id="admin/resolvertest" path="../system/flows/admin/resolvertest-flow.xml" />
-        <webflow:flow-location id="admin/reload-service" path="../system/flows/admin/reload-flow.xml" />
+        <webflow:flow-location id="admin/reload-service" path="../system/flows/admin/reload-service-flow.xml" />
+        <webflow:flow-location id="admin/reload-metadata" path="../system/flows/admin/reload-metadata-flow.xml" />
         
         <!-- Proprietary logout flow. -->
         <webflow:flow-location id="Logout" path="../system/flows/logout/logout-flow.xml" />

Copied: trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-flow.xml (from r6653, trunk/idp-conf/src/main/resources/system/flows/admin/reload-flow.xml)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-flow.xml?p2=trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-flow.xml&p1=trunk/idp-conf/src/main/resources/system/flows/admin/reload-flow.xml&r1=6653&r2=6656&rev=6656&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/reload-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-flow.xml Wed Oct  8 16:31:50 2014
@@ -34,6 +34,6 @@
         <transition on="#{!'proceed'.equals(currentEvent.id)}" to="HandleErrorWithView" />
     </global-transitions>
 
-    <bean-import resource="reload-beans.xml" />
+    <bean-import resource="reload-service-beans.xml" />
 
 </flow>

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.java?rev=6656&r1=6655&r2=6656&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/ReloadMetadata.java Wed Oct  8 16:31:50 2014
@@ -144,7 +144,7 @@
                 toRefresh.refresh();
                 log.debug("{} Reloaded metadata from '{}'", getLogPrefix(), id);
                 getHttpServletResponse().setStatus(HttpServletResponse.SC_OK);
-                getHttpServletResponse().getWriter().println("Configuration reloaded.");
+                getHttpServletResponse().getWriter().println("Metadata reloaded.");
             } else {

[... 3 lines stripped ...]