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 (file)
index 0000000..7e429ad
--- /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"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">\r
+\r
+       <import resource="classpath:/org/argeo/slc/spring/templates.xml" />\r
+\r
+       <bean id="sessionFactory"\r
+               parent="slcTemplates.sessionFactory.hibernateTestHSQL">\r
+       </bean>\r
+\r
+       <bean id="treeSPathDao"\r
+               class="org.argeo.slc.hibernate.structure.tree.TreeSPathDaoHibernate">\r
+               <property name="sessionFactory" ref="sessionFactory" />\r
+       </bean>\r
+\r
+       <bean id="treeSRegistryDao"\r
+               class="org.argeo.slc.hibernate.structure.tree.TreeSRegistryDaoHibernate">\r
+               <property name="sessionFactory" ref="sessionFactory" />\r
+       </bean>\r
+\r
+       <bean id="testResultDao"\r
+               class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">\r
+               <property name="sessionFactory" ref="sessionFactory" />\r
+       </bean>\r
+\r
+       <bean id="slcExecutionDao"\r
+               class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate">\r
+               <property name="sessionFactory" ref="sessionFactory" />\r
+       </bean>\r
+</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 c1b0252b512a01e93f643d7f8f6c579cf618953b..1dcb0db6abb031ab0d5adc471304012280350841 100644 (file)
--- 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">\r
 <h1>SLC Home</h1>\r
 \r
-<a href="slcService/slcDefinition.wsdl">WSDL Definiton</a>\r
+<h2>Web</h2>\r
+<a href="slcExecutionList.web">SLC Executions</a>\r
+\r
+<h2>Web Services</h2>\r
+<a href="slcService/slcDefinition.wsdl">WSDL Definition</a>\r
+\r
 </div>\r
 \r
 <%@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 (file)
index 0000000..16ec295
--- /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" ?>\r
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
+       pageEncoding="ISO-8859-1"%>\r
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
+\r
+<%@include file="header.txt"%>\r
+<jsp:include page="common.jsp" />\r
+\r
+<div id="main">\r
+<h1>SLC Execution List</h1>\r
+\r
+<table>\r
+       <c:forEach items="${slcExecutions}" var="slcExecution">\r
+               <tr>\r
+                       <td>${slcExecution.uuid}</td>\r
+                       <td>${slcExecution.status}</td>\r
+               </tr>\r
+       </c:forEach>\r
+</table>\r
+\r
+</div>\r
+\r
+<%@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 98283b7681eee3efcad6ba899d5b6c597a110040..6b5b425d62fbb3cef0c1c3dac5ee521d629ef0ba 100644 (file)
--- 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" />\r
        </bean>\r
 \r
+       <bean name="/slcExecutionList.web"\r
+               class="org.argeo.slc.web.mvc.process.SlcExecutionListController">\r
+               <constructor-arg ref="slcExecutionDao" />\r
+               <property name="viewName" value="slcExecutionList" />\r
+       </bean>\r
+\r
 \r
        <bean id="handlerMapping"\r
                class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">\r

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 723587138bdda8b0f1a46d44a6018ba0d31b3f74..78df3eac037699a7da892879a7af48caa6ab2c9d 100644 (file)
--- 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" />\r
                <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 be80877ed3b976631fc56bd954507ec39f5ff0b7..85b87a247b976e5613578bd6b5ee0bb8ff8f8d02 100644 (file)
--- 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>\r
-        <servlet-name>slc-ws</servlet-name>\r
-        <servlet-class>org.springframework.ws.transport.http.MessageDispatcherServlet</servlet-class>\r
-    </servlet>\r
-\r
-    <servlet-mapping>\r
-        <servlet-name>slc-ws</servlet-name>\r
-        <url-pattern>/slcService/*</url-pattern>\r
-    </servlet-mapping>\r
-\r
-    <servlet>\r
-        <servlet-name>slc-web</servlet-name>\r
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>\r
-    </servlet>\r
-\r
-    <servlet-mapping>\r
-        <servlet-name>slc-web</servlet-name>\r
-        <url-pattern>*.web</url-pattern>\r
-    </servlet-mapping>\r
-\r
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"\r
+       version="2.4">\r
+\r
+       <display-name>SLC Web Application</display-name>\r
+\r
+       <servlet>\r
+               <servlet-name>slc-ws</servlet-name>\r
+               <servlet-class>\r
+                       org.springframework.ws.transport.http.MessageDispatcherServlet\r
+               </servlet-class>\r
+       </servlet>\r
+\r
+       <servlet-mapping>\r
+               <servlet-name>slc-ws</servlet-name>\r
+               <url-pattern>/slcService/*</url-pattern>\r
+       </servlet-mapping>\r
+\r
+       <servlet>\r
+               <servlet-name>slc-web</servlet-name>\r
+               <servlet-class>\r
+                       org.springframework.web.servlet.DispatcherServlet\r
+               </servlet-class>\r
+       </servlet>\r
+\r
+       <servlet-mapping>\r
+               <servlet-name>slc-web</servlet-name>\r
+               <url-pattern>*.web</url-pattern>\r
+       </servlet-mapping>\r
+\r
+       <context-param>\r
+               <param-name>contextConfigLocation</param-name>\r
+               <param-value>/WEB-INF/applicationContext.xml</param-value>\r
+       </context-param>\r
+\r
+       <listener>\r
+               <listener-class>\r
+                       org.springframework.web.context.ContextLoaderListener\r
+               </listener-class>\r
+       </listener>\r
+\r
+\r
+</web-app>\r