From: Mathieu Baudier Date: Fri, 27 Jun 2008 22:02:59 +0000 (+0000) Subject: Adapt web services to lazy loading X-Git-Tag: argeo-slc-2.1.7~2744 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=7c371ee1cc4bbf7c751828e492215a1321bda9d0;p=gpl%2Fargeo-slc.git Adapt web services to lazy loading git-svn-id: https://svn.argeo.org/slc/trunk@1298 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties index 05241b75f..86ac8ce28 100644 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties @@ -1,7 +1,7 @@ # Rename this file to local.properties # For in memory database switch following lines -sessionFactoryParentBean=slcDefault.dataSource.inMemoryTestHSQL +sessionFactoryParentBean=slcDefault.sessionFactory.hibernateTestHSQL #sessionFactoryParentBean=slcServerDefault.sessionFactory.persistentHSQL # URL of the persistent database 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 new file mode 100644 index 000000000..cc1ed800d --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/log4j.properties @@ -0,0 +1,25 @@ +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=WARN, console + +## Levels +# Slc +log4j.logger.org.argeo.slc=DEBUG + +# Spring +log4j.logger.org.springframework=WARN + +# Hibernate +log4j.logger.org.hibernate=WARN +#log4j.logger.org.hibernate.SQL=TRACE +#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE +#log4j.logger.org.hibernate.type=TRACE + + +## Appenders +# A1 is set to be a ConsoleAppender. +log4j.appender.console=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n + 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 29499de2f..963139a32 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 @@ -57,8 +57,26 @@ *.jsp ISO-8859-1 - /WEB-INF/specific/prelude.jspf + + /WEB-INF/specific/prelude.jspf + /WEB-INF/specific/coda.jspf + + + + + org.springframework.web.util.Log4jConfigListener + + + + log4jConfigLocation + /WEB-INF/log4j.properties + + + log4jRefreshInterval + 5000 + + diff --git a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java index 47d584f23..d097900d8 100644 --- a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java +++ b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java @@ -1,29 +1,84 @@ package org.argeo.slc.ws; +import java.util.List; +import java.util.Vector; + import org.springframework.ws.client.core.WebServiceTemplate; +import org.springframework.ws.soap.client.SoapFaultClientException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.core.process.SlcExecutionStep; import org.argeo.slc.msg.process.SlcExecutionRequest; +import org.argeo.slc.msg.process.SlcExecutionStatusRequest; +import org.argeo.slc.msg.process.SlcExecutionStepsRequest; import org.argeo.slc.unit.AbstractSpringTestCase; import org.argeo.slc.unit.process.SlcExecutionTestUtils; +import org.argeo.slc.ws.client.WebServiceUtils; public class SlcExecutionWsIntegrationTest extends AbstractSpringTestCase { private Log log = LogFactory.getLog(getClass()); - public void testSendSlcExecutionrequest() { - WebServiceTemplate template = getBean(WebServiceTemplate.class); + WebServiceTemplate template; + + public void setUp() { + template = getBean(WebServiceTemplate.class); + ; + } + + public void testSlcExecutionRequests() { SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution(); - SlcExecutionRequest req = new SlcExecutionRequest(); - req.setSlcExecution(slcExec); + log.info("Send create SlcExecutionRequest for SlcExecution #" + + slcExec.getUuid()); + template.marshalSendAndReceive(new SlcExecutionRequest(slcExec)); + + slcExec.setUser("otherUser"); + log.info("Send update SlcExecutionRequest for SlcExecution #" + + slcExec.getUuid()); + template.marshalSendAndReceive(new SlcExecutionRequest(slcExec)); + } + + public void testSlcExecutionStatusRequest() { + SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution(); - log.info("Send SlcExecutionRequest for SlcExecution " + log.info("Send create SlcExecutionRequest for SlcExecution #" + slcExec.getUuid()); + template.marshalSendAndReceive(new SlcExecutionRequest(slcExec)); - Object resp = template.marshalSendAndReceive(req); - log.info("Resp: " + resp); + slcExec.setStatus(SlcExecution.STATUS_FINISHED); + log.info("Send update SlcExecutionStatusRequest for SlcExecution #" + + slcExec.getUuid()); + template.marshalSendAndReceive(new SlcExecutionStatusRequest(slcExec + .getUuid(), slcExec.getStatus())); + } + + public void testSendSlcExecutionStepRequest() { + SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution(); + + log.info("Send create SlcExecutionRequest for SlcExecution #" + + slcExec.getUuid()); + template.marshalSendAndReceive(new SlcExecutionRequest(slcExec)); + + SlcExecutionStep step1 = new SlcExecutionStep( + "Logline\nAnother log line."); + SlcExecutionStep step2 = new SlcExecutionStep( + "Logline2\nAnother log line2."); + List steps = new Vector(); + steps.add(step1); + steps.add(step2); + + slcExec.setStatus(SlcExecution.STATUS_FINISHED); + log.info("Send SlcExecutionStepsRequest for SlcExecution #" + + slcExec.getUuid()); + try { + template.marshalSendAndReceive(new SlcExecutionStepsRequest(slcExec + .getUuid(), steps)); + } catch (SoapFaultClientException e) { + WebServiceUtils.manageSoapException(e); + throw e; + } } } diff --git a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java index 7796c26d7..d27c795dd 100644 --- a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java +++ b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/TreeTestResultWsIntegrationTest.java @@ -26,8 +26,7 @@ public class TreeTestResultWsIntegrationTest extends AbstractSpringTestCase { log.info("Send CreateTreeTestResultRequest for result " + req.getTreeTestResult().getUuid()); - Object resp = template.marshalSendAndReceive(req); - log.info("Resp: " + resp); + template.marshalSendAndReceive(req); } public void testResultPartRequest() { @@ -43,8 +42,7 @@ public class TreeTestResultWsIntegrationTest extends AbstractSpringTestCase { ResultPartRequest req = createSimpleResultPartRequest(ttr); log.info("Send ResultPartRequest for result " + req.getResultUuid()); - Object resp = template.marshalSendAndReceive(req); - log.info("Resp: " + resp); + template.marshalSendAndReceive(req); } public void testCloseTreeTestResultRequest() { @@ -64,7 +62,6 @@ public class TreeTestResultWsIntegrationTest extends AbstractSpringTestCase { log.info("Send CloseTreeTestResultRequest for result " + req.getResultUuid()); - Object resp = template.marshalSendAndReceive(req); - log.info("Resp: " + resp); + template.marshalSendAndReceive(req); } }