[java-identity-provider COMMIT] in /trunk: idp-admin-impl/pom.xml idp-admin-impl/src/main/java/net/shibboleth/idp/adm...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Oct 23 19:46:23 2016
New Revision: 8527

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8527&view=rev
Log:
Convert storage REST API from a view to a flow action.
Move metrics output action to admin-impl module.

Added:
    trunk/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/DoStorageOperation.java   (with props)
    trunk/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/OutputMetrics.java
      - copied, changed from r8522, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/OutputMetrics.java
Modified:
    trunk/idp-admin-impl/pom.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/storage-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/storage-flow.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/OutputMetrics.java
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/storage.jsp

Modified: trunk/idp-admin-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-admin-impl/pom.xml?rev=8527&r1=8526&r2=8527&view=diff
==============================================================================
--- trunk/idp-admin-impl/pom.xml	(original)
+++ trunk/idp-admin-impl/pom.xml	Sun Oct 23 19:46:23 2016
@@ -18,6 +18,11 @@
 
     <dependencies>
         <!-- Compile Dependencies -->
+        <dependency>
+          <groupId>com.github.jasminb</groupId>
+          <artifactId>jsonapi-converter</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-admin-api</artifactId>

Copied: trunk/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/OutputMetrics.java (from r8522, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/OutputMetrics.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/OutputMetrics.java?p2=trunk/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/OutputMetrics.java&p1=trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/OutputMetrics.java&r1=8522&r2=8527&rev=8527&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/OutputMetrics.java	(original)
+++ trunk/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/OutputMetrics.java	Sun Oct 23 19:46:23 2016
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.profile.impl;
+package net.shibboleth.idp.admin.impl;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=8527&r1=8526&r2=8527&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml	Sun Oct 23 19:46:23 2016
@@ -335,6 +335,14 @@
     <!-- Default Jackson ObjectMapper with JodaTime support. -->
     
     <bean id="shibboleth.JSONObjectMapper" class="com.fasterxml.jackson.databind.ObjectMapper" />
+
+    <bean class="org.springframework.beans.factory.config.MethodInvokingBean"
+            p:targetObject-ref="shibboleth.JSONObjectMapper"
+            p:targetMethod="setSerializationInclusion">
+        <property name="arguments">
+            <util:constant static-field="com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL" />
+        </property>
+    </bean>
     
     <bean class="org.springframework.beans.factory.config.MethodInvokingBean"
             p:targetObject-ref="shibboleth.JSONObjectMapper"

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml?rev=8527&r1=8526&r2=8527&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml	Sun Oct 23 19:46:23 2016
@@ -31,7 +31,7 @@
     <!-- Work beans. -->
 
     <bean id="OutputMetrics"
-        class="net.shibboleth.idp.profile.impl.OutputMetrics" scope="prototype"
+        class="net.shibboleth.idp.admin.impl.OutputMetrics" scope="prototype"
         p:httpServletResponse-ref="shibboleth.HttpServletResponse"
         p:metricFilter-ref="shibboleth.metrics.LoggerDrivenMetricFilter"
         p:metricRegistry-ref="shibboleth.metrics.MetricRegistry"

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/storage-beans.xml

[... 60 lines stripped ...]