From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 3 Jul 2008 22:23:39 +0000 (+0000)
Subject: Introduce XSL URI Resolver
X-Git-Tag: argeo-slc-2.1.7~2692
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=f52df32b1191a6aff40b917d14db4911683fc72e;hp=0ca771c2e4483674bfdb80b7ce43ce19427f18e3;p=gpl%2Fargeo-slc.git

Introduce XSL URI Resolver

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

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/log4j.properties b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/log4j.properties
index 32f4cc5cb..95a344f05 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/log4j.properties
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/log4j.properties
@@ -3,7 +3,7 @@ log4j.rootLogger=WARN, console
 
 ## Levels
 # Slc
-log4j.logger.org.argeo.slc=DEBUG
+log4j.logger.org.argeo.slc=TRACE
 
 # Spring
 log4j.logger.org.springframework=WARN
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionList.jsp
index 9b11de4bd..576361f23 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionList.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionList.jsp
@@ -10,8 +10,10 @@
 	<c:forEach items="${resultCollections}" var="resultCollection">
 		<tr>
 			<td>${resultCollection.id}</td>
-			<td><a
-				href="resultCollectionView.web?id=${resultCollection.id}">view</a></td>
+			<td><a
+				href="resultCollectionView.web?id=${resultCollection.id}">view</a></td>
+			<td><a
+				href="resultCollectionViewXml.xslt?id=${resultCollection.id}">xml</a></td>
 		</tr>
 	</c:forEach>
 </table>
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp
index 3ae2101dd..e4e516a8b 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp
@@ -20,7 +20,8 @@
 				</c:otherwise>
 			</c:choose>
 			<td style="padding-right: 5px"><a href="resultView.web?uuid=${result.uuid}">view</a></td>
-			<td><a href="resultView.xslt?uuid=${result.uuid}">xsl</a></td>
+			<td><a href="resultView.xslt?uuid=${result.uuid}">xsl</a></td>
+			<td><a href="resultViewXml.xslt?uuid=${result.uuid}">xml</a></td>
 		</tr>
 	</c:forEach>
 </table>
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml
index c8278fbd0..a334e911c 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-	
-	<import resource="classpath:/org/argeo/slc/server/spring/slc-web-servlet.xml"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+	<import
+		resource="classpath:/org/argeo/slc/server/spring/slc-web-servlet.xml" />
 </beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
index 755973f07..18dce9a8a 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-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">
 
 	<import resource="classpath:/org/argeo/slc/server/spring/slc-ws-servlet.xml"/>
 </beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml
index e8e1d7ebf..34ae15987 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml
@@ -1,9 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-
-	<import resource="classpath:/org/argeo/slc/server/spring/slc-xslt-servlet.xml"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+	<import
+		resource="classpath:/org/argeo/slc/server/spring/slc-xslt-servlet.xml" />
+
+	<bean name="/resultView.xslt"
+		class="org.argeo.slc.web.mvc.result.ResultViewController">
+		<constructor-arg ref="testResultDao" />
+		<property name="viewName" value="resultView" />
+	</bean>
+
+	<bean name="/resultViewXml.xslt"
+		class="org.argeo.slc.web.mvc.result.ResultViewController">
+		<constructor-arg ref="testResultDao" />
+		<property name="viewName" value="viewXml" />
+	</bean>
+
+	<bean name="/resultCollectionViewXml.xslt"
+		class="org.argeo.slc.web.mvc.result.ResultCollectionViewController">
+		<constructor-arg ref="testResultCollectionDao" />
+		<property name="viewName" value="viewXml" />
+	</bean>
+
+
 </beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl
index 947cef0f9..e9989bdbe 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl
@@ -4,7 +4,8 @@
 	xmlns:slc="http://argeo.org/projects/slc/schemas"
 	exclude-result-prefixes="slc">
 
-	<xsl:output method="html" omit-xml-declaration="yes" />
+	<xsl:output method="html" omit-xml-declaration="yes" />
+	
 
 	<xsl:template match="/">
 		<html>
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/viewXml.xsl b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/viewXml.xsl
new file mode 100644
index 000000000..87d63716f
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/viewXml.xsl
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:slc="http://argeo.org/projects/slc/schemas"
+	exclude-result-prefixes="slc">
+
+	<xsl:template match="/">
+		<xsl:copy-of select="*"/>
+	</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file