Adapt web app to test result collection marshalling

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

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java
index dfb4713eaddaffb76f616958a7c82b3e3f46ed32..127188b842a8caf112ea357dc6e18751d4c11eb4 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java
@@ -5,19 +5,18 @@ import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMResult;\r
 import javax.xml.transform.dom.DOMSource;\r
 \r
+import org.argeo.slc.core.SlcException;\r
 import org.springframework.oxm.Marshaller;\r
 import org.springframework.web.servlet.view.xslt.XsltView;\r
 import org.w3c.dom.Document;\r
 \r
-import org.argeo.slc.core.test.tree.TreeTestResult;\r
-\r
 public class XsltMarshallerView extends XsltView {\r
 \r
        private Marshaller marshaller;\r
 \r
        @Override\r
        protected Class<?>[] getSourceTypes() {\r
-               return new Class[] { TreeTestResult.class };\r
+               return new Class[] { Object.class };\r
        }\r
 \r
        @Override\r
@@ -25,6 +24,9 @@ public class XsltMarshallerView extends XsltView {
                Document document = DocumentBuilderFactory.newInstance()\r
                                .newDocumentBuilder().newDocument();\r
                DOMResult result = new DOMResult(document);\r
+               if (!marshaller.supports(source.getClass()))\r
+                       throw new SlcException("Object of type " + source.getClass()\r
+                                       + " not supported.");\r
                marshaller.marshal(source, result);\r
                return new DOMSource(result.getNode());\r
        }\r

diff --git a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml
index 63db273bd4a83c33320749dec96faecbf4a6bf6e..06d7cebf4c14c193943bb1c5d07eb661581c61a9 100644 (file)
--- a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml
+++ b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-web-servlet.xml
@@ -2,8 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
-       default-lazy-init="true">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
        <bean name="/home.web"
                class="org.argeo.slc.web.mvc.admin.HomeController">

diff --git a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-xslt-servlet.xml b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-xslt-servlet.xml
index 2103da13cec51c4c7b3fc5a1f1e27f3a55ab3263..f4b2d98ecf20bbc151de8aa668054cd4edc59dfe 100644 (file)
--- a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-xslt-servlet.xml
+++ b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-xslt-servlet.xml
@@ -8,12 +8,6 @@
        <import
                resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />
 
-       <bean name="/resultView.xslt"
-               class="org.argeo.slc.web.mvc.result.ResultViewController">
-               <constructor-arg ref="testResultDao" />
-               <property name="viewName" value="resultView" />
-       </bean>
-
        <bean
                class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
                <property name="interceptors">