Crednetials

git-svn-id: https://svn.argeo.org/slc/trunk@2695 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml
index d5e7e2cc2255946add5c10dcb0633aa2c6991522..e7cf1649fe3940d5e073fc41885d5ca598366701 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml
+++ b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml
@@ -6,5 +6,36 @@
 
        <description>Deprecated</description>
 
-       <import resource="../spring.xml" />
+       <bean id="slcDefault.test.resultLogger" class="org.argeo.slc.core.test.tree.TreeTestResultLogger">
+       </bean>
+
+       <bean name="slcDefault.test.testRun" class="org.argeo.slc.core.test.SimpleTestRun"
+               scope="prototype">
+       </bean>
+
+       <bean name="slcDefault.test.uuid" class="java.util.UUID"
+               factory-method="randomUUID" scope="prototype">
+       </bean>
+
+       <bean id="slcDefault.test.basicTreeTestResult" class="org.argeo.slc.core.test.tree.TreeTestResult"
+               abstract="true" destroy-method="close">
+               <property name="uuid">
+                       <bean factory-bean="slcDefault.test.uuid" factory-method="toString">
+                       </bean>
+               </property>
+               <property name="listeners">
+                       <list>
+                               <ref bean="slcDefault.test.resultLogger" />
+                       </list>
+               </property>
+       </bean>
+
+       <bean id="slcDefault.test.basicSimpleTestResult" class="org.argeo.slc.core.test.SimpleTestResult"
+               abstract="true">
+               <property name="uuid">
+                       <bean factory-bean="slcDefault.test.uuid" factory-method="toString">
+                       </bean>
+               </property>
+       </bean>
+
 </beans>
\ No newline at end of file

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/management/GetCredentials.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/management/GetCredentials.java
index 0e68ffe2b790b335dc4bd59c25cff77a48da81b5..9cac10af8aed0b8324d1690efe991d1c75ad066b 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/management/GetCredentials.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/management/GetCredentials.java
@@ -18,6 +18,8 @@ public class GetCredentials implements HttpRequestHandler {
 
        public void handleRequest(HttpServletRequest request,
                        HttpServletResponse response) throws ServletException, IOException {
+               response.setContentType("application/json");
+
                Authentication authentication = SecurityContextHolder.getContext()
                                .getAuthentication();