From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 22 Apr 2008 10:04:25 +0000 (+0000)
Subject: First end-to-end SlcExecution with web service
X-Git-Tag: argeo-slc-2.1.7~3017
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=38087bceeb3d6bd73fb6942c9d7bfd6a7d0abca5;p=gpl%2Fargeo-slc.git

First end-to-end SlcExecution with web service

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

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
new file mode 100644
index 000000000..7e429ad6b
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -0,0 +1,31 @@
+<?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.0.xsd">
+
+	<import resource="classpath:/org/argeo/slc/spring/templates.xml" />
+
+	<bean id="sessionFactory"
+		parent="slcTemplates.sessionFactory.hibernateTestHSQL">
+	</bean>
+
+	<bean id="treeSPathDao"
+		class="org.argeo.slc.hibernate.structure.tree.TreeSPathDaoHibernate">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+
+	<bean id="treeSRegistryDao"
+		class="org.argeo.slc.hibernate.structure.tree.TreeSRegistryDaoHibernate">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+
+	<bean id="testResultDao"
+		class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+
+	<bean id="slcExecutionDao"
+		class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp
index c1b0252b5..1dcb0db6a 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp
@@ -9,7 +9,12 @@
 <div id="main">
 <h1>SLC Home</h1>
 
-<a href="slcService/slcDefinition.wsdl">WSDL Definiton</a>
+<h2>Web</h2>
+<a href="slcExecutionList.web">SLC Executions</a>
+
+<h2>Web Services</h2>
+<a href="slcService/slcDefinition.wsdl">WSDL Definition</a>
+
 </div>
 
 <%@include file="footer.txt"%>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp
new file mode 100644
index 000000000..16ec29560
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+	pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+
+<%@include file="header.txt"%>
+<jsp:include page="common.jsp" />
+
+<div id="main">
+<h1>SLC Execution List</h1>
+
+<table>
+	<c:forEach items="${slcExecutions}" var="slcExecution">
+		<tr>
+			<td>${slcExecution.uuid}</td>
+			<td>${slcExecution.status}</td>
+		</tr>
+	</c:forEach>
+</table>
+
+</div>
+
+<%@include file="footer.txt"%>
\ No newline at end of file
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 98283b768..6b5b425d6 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
@@ -10,6 +10,12 @@
 		<property name="viewName" value="home.jsp" />
 	</bean>
 
+	<bean name="/slcExecutionList.web"
+		class="org.argeo.slc.web.mvc.process.SlcExecutionListController">
+		<constructor-arg ref="slcExecutionDao" />
+		<property name="viewName" value="slcExecutionList" />
+	</bean>
+
 
 	<bean id="handlerMapping"
 		class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
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 723587138..78df3eac0 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
@@ -5,6 +5,7 @@
 
 	<bean name="slcExecutionRequestEp"
 		class="org.argeo.slc.ws.process.SlcExecutionRequestEp">
+		<constructor-arg ref="slcExecutionDao" />
 		<property name="marshaller" ref="marshaller" />
 		<property name="unmarshaller" ref="marshaller" />
 	</bean>
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
index be80877ed..85b87a247 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,28 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
-
-    <display-name>SLC Web Application</display-name>
-
-    <servlet>
-        <servlet-name>slc-ws</servlet-name>
-        <servlet-class>org.springframework.ws.transport.http.MessageDispatcherServlet</servlet-class>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>slc-ws</servlet-name>
-        <url-pattern>/slcService/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet>
-        <servlet-name>slc-web</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>slc-web</servlet-name>
-        <url-pattern>*.web</url-pattern>
-    </servlet-mapping>
-
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+	version="2.4">
+
+	<display-name>SLC Web Application</display-name>
+
+	<servlet>
+		<servlet-name>slc-ws</servlet-name>
+		<servlet-class>
+			org.springframework.ws.transport.http.MessageDispatcherServlet
+		</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>slc-ws</servlet-name>
+		<url-pattern>/slcService/*</url-pattern>
+	</servlet-mapping>
+
+	<servlet>
+		<servlet-name>slc-web</servlet-name>
+		<servlet-class>
+			org.springframework.web.servlet.DispatcherServlet
+		</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>slc-web</servlet-name>
+		<url-pattern>*.web</url-pattern>
+	</servlet-mapping>
+
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>/WEB-INF/applicationContext.xml</param-value>
+	</context-param>
+
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
+
+
+</web-app>