From fb6a76920a3e403ae0a1b6b764d65ae12bf8f757 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 21 Apr 2008 16:58:05 +0000 Subject: [PATCH 01/16] Merge web service sandbox git-svn-id: https://svn.argeo.org/slc/trunk@1011 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.slc.server/.classpath | 1 + org.argeo.slc.server/.project | 13 ++++++++++ .../org.eclipse.wst.common.component | 6 +++++ ....eclipse.wst.common.project.facet.core.xml | 7 +++++ org.argeo.slc.server/pom.xml | 26 ------------------- .../src/main/java/META-INF/MANIFEST.MF | 3 +++ .../slc/ws/process/SlcExecutionRequestEp.java | 23 ++++++++++++++++ 7 files changed, 53 insertions(+), 26 deletions(-) create mode 100644 org.argeo.slc.server/.settings/org.eclipse.wst.common.component create mode 100644 org.argeo.slc.server/.settings/org.eclipse.wst.common.project.facet.core.xml create mode 100644 org.argeo.slc.server/src/main/java/META-INF/MANIFEST.MF create mode 100644 org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java diff --git a/org.argeo.slc.server/.classpath b/org.argeo.slc.server/.classpath index 5c3f68c5a..40adf69ad 100644 --- a/org.argeo.slc.server/.classpath +++ b/org.argeo.slc.server/.classpath @@ -3,5 +3,6 @@ + diff --git a/org.argeo.slc.server/.project b/org.argeo.slc.server/.project index 26efbecd6..26b479f98 100644 --- a/org.argeo.slc.server/.project +++ b/org.argeo.slc.server/.project @@ -5,6 +5,11 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder @@ -15,9 +20,17 @@ + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.jdt.core.javanature org.maven.ide.eclipse.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jem.workbench.JavaEMFNature diff --git a/org.argeo.slc.server/.settings/org.eclipse.wst.common.component b/org.argeo.slc.server/.settings/org.eclipse.wst.common.component new file mode 100644 index 000000000..66f90d6f7 --- /dev/null +++ b/org.argeo.slc.server/.settings/org.eclipse.wst.common.component @@ -0,0 +1,6 @@ + + + + + + diff --git a/org.argeo.slc.server/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.argeo.slc.server/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 000000000..55c9972e3 --- /dev/null +++ b/org.argeo.slc.server/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.argeo.slc.server/pom.xml b/org.argeo.slc.server/pom.xml index 6e54c7381..d670ad101 100644 --- a/org.argeo.slc.server/pom.xml +++ b/org.argeo.slc.server/pom.xml @@ -36,31 +36,5 @@ ${project.version} - - org.springframework.ws - spring-ws-core - - - org.springframework.ws - spring-oxm - - - - org.codehaus.castor - castor - - - xerces - xercesImpl - - - - javax.xml.soap - saaj-api - - - com.sun.xml.messaging.saaj - saaj-impl - \ No newline at end of file diff --git a/org.argeo.slc.server/src/main/java/META-INF/MANIFEST.MF b/org.argeo.slc.server/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 000000000..5e9495128 --- /dev/null +++ b/org.argeo.slc.server/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java new file mode 100644 index 000000000..477e59678 --- /dev/null +++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java @@ -0,0 +1,23 @@ +package org.argeo.slc.ws.process; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.msg.process.SlcExecutionRequest; +import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint; + +public class SlcExecutionRequestEp extends + AbstractMarshallingPayloadEndpoint { + + private Log log = LogFactory.getLog(getClass()); + + @Override + protected Object invokeInternal(Object requestObject) throws Exception { + SlcExecutionRequest msg = (SlcExecutionRequest) requestObject; + SlcExecution slcExecution = msg.getSlcExecution(); + log.info("Received save or update request fro SlcExecution " + + slcExecution.getUuid()); + return null; + } + +} -- 2.39.2 From e289cc763e013843c52e0fa68fec024b7bd054d3 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 21 Apr 2008 16:58:54 +0000 Subject: [PATCH 02/16] Merge web service sandbox git-svn-id: https://svn.argeo.org/slc/trunk@1012 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.slc.core/.classpath | 1 + org.argeo.slc.core/.project | 13 ++ .../org.eclipse.wst.common.component | 9 ++ ....eclipse.wst.common.project.facet.core.xml | 7 ++ .../org.eclipse.wst.validation.prefs | 6 + org.argeo.slc.core/pom.xml | 32 ++++- .../argeo/slc/core/process/SlcExecution.java | 65 ++++++++++ .../slc/core/process/SlcExecutionStep.java | 57 +++++++++ .../slc/msg/process/SlcExecutionRequest.java | 16 +++ .../msg/process/SlcExecutionStepsRequest.java | 31 +++++ .../org/argeo/slc/castor/process/mapping.xml | 38 ++++++ .../core/process/SlcExecutionCastorTest.java | 116 ++++++++++++++++++ .../SlcExecutionWsIntegrationTest.java | 26 ++++ .../slc/core/process/applicationContext.xml | 24 ++++ 14 files changed, 439 insertions(+), 2 deletions(-) create mode 100644 org.argeo.slc.core/.settings/org.eclipse.wst.common.component create mode 100644 org.argeo.slc.core/.settings/org.eclipse.wst.common.project.facet.core.xml create mode 100644 org.argeo.slc.core/.settings/org.eclipse.wst.validation.prefs create mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecution.java create mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java create mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionRequest.java create mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionStepsRequest.java create mode 100644 org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/process/mapping.xml create mode 100644 org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java create mode 100644 org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionWsIntegrationTest.java create mode 100644 org.argeo.slc.core/src/test/resources/org/argeo/slc/core/process/applicationContext.xml diff --git a/org.argeo.slc.core/.classpath b/org.argeo.slc.core/.classpath index cd4156453..fe44ac962 100644 --- a/org.argeo.slc.core/.classpath +++ b/org.argeo.slc.core/.classpath @@ -7,5 +7,6 @@ + diff --git a/org.argeo.slc.core/.project b/org.argeo.slc.core/.project index 15b8bfab0..469224f87 100644 --- a/org.argeo.slc.core/.project +++ b/org.argeo.slc.core/.project @@ -5,6 +5,11 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.maven.ide.eclipse.maven2Builder @@ -15,9 +20,17 @@ + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.jdt.core.javanature org.maven.ide.eclipse.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jem.workbench.JavaEMFNature diff --git a/org.argeo.slc.core/.settings/org.eclipse.wst.common.component b/org.argeo.slc.core/.settings/org.eclipse.wst.common.component new file mode 100644 index 000000000..ecc11d82b --- /dev/null +++ b/org.argeo.slc.core/.settings/org.eclipse.wst.common.component @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/org.argeo.slc.core/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.argeo.slc.core/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 000000000..55c9972e3 --- /dev/null +++ b/org.argeo.slc.core/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.argeo.slc.core/.settings/org.eclipse.wst.validation.prefs b/org.argeo.slc.core/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 000000000..ab6929475 --- /dev/null +++ b/org.argeo.slc.core/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,6 @@ +#Mon Apr 21 18:01:59 CEST 2008 +DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator; +USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator; +USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator; +USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.1.102.v200709122200 +eclipse.preferences.version=1 diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml index 5535e4cef..ec7e4afae 100644 --- a/org.argeo.slc.core/pom.xml +++ b/org.argeo.slc.core/pom.xml @@ -67,7 +67,8 @@ org.hibernate hibernate - + + org.springframework spring-context @@ -79,7 +80,34 @@ org.springframework spring-jdbc - + + + org.springframework.ws + spring-ws-core + + + org.springframework.ws + spring-oxm + + + + org.codehaus.castor + castor + + + xerces + xercesImpl + + + + javax.xml.soap + saaj-api + + + com.sun.xml.messaging.saaj + saaj-impl + + org.apache.ant ant diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecution.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecution.java new file mode 100644 index 000000000..1450cda9e --- /dev/null +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecution.java @@ -0,0 +1,65 @@ +package org.argeo.slc.core.process; + +import java.util.List; +import java.util.Vector; + +public class SlcExecution { + private String uuid; + private String host; + private String path; + private String type; + private String status; + + private List steps = new Vector(); + + + + public List getSteps() { + return steps; + } + + public void setSteps(List steps) { + this.steps = steps; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getHost() { + return host; + } + + public void setHost(String host) { + this.host = host; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + +} diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java new file mode 100644 index 000000000..0237e47b1 --- /dev/null +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java @@ -0,0 +1,57 @@ +package org.argeo.slc.core.process; + +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.Date; +import java.util.List; +import java.util.Vector; + +import org.apache.commons.io.IOUtils; + +public class SlcExecutionStep { + private String type; + private Date begin; + private List logLines = new Vector(); + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Date getBegin() { + return begin; + } + + public void setBegin(Date begin) { + this.begin = begin; + } + + public List getLogLines() { + return logLines; + } + + public void setLogLines(List logLines) { + this.logLines = logLines; + } + + public String logAsString() { + StringWriter writer = new StringWriter(); + String log = writer.toString(); + IOUtils.closeQuietly(writer); + return log; + } + + public void addLog(String log) { + try { + List lines = IOUtils.readLines(new StringReader(log)); + logLines.addAll(lines); + } catch (IOException e) { + throw new RuntimeException("Cannot add log", e); + } + } + +} diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionRequest.java new file mode 100644 index 000000000..84d582681 --- /dev/null +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionRequest.java @@ -0,0 +1,16 @@ +package org.argeo.slc.msg.process; + +import org.argeo.slc.core.process.SlcExecution; + +public class SlcExecutionRequest { + private SlcExecution slcExecution; + + public SlcExecution getSlcExecution() { + return slcExecution; + } + + public void setSlcExecution(SlcExecution slcExecution) { + this.slcExecution = slcExecution; + } + +} diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionStepsRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionStepsRequest.java new file mode 100644 index 000000000..237f05f87 --- /dev/null +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionStepsRequest.java @@ -0,0 +1,31 @@ +package org.argeo.slc.msg.process; + +import java.util.List; +import java.util.Vector; + +import org.argeo.slc.core.process.SlcExecutionStep; + +public class SlcExecutionStepsRequest { + private String slcExecutionUuid; + private List steps = new Vector(); + + public String getSlcExecutionUuid() { + return slcExecutionUuid; + } + + public void setSlcExecutionUuid(String slcExecutionUuid) { + this.slcExecutionUuid = slcExecutionUuid; + } + + public List getSteps() { + return steps; + } + + public void setSteps(List step) { + this.steps = step; + } + + public void addStep(SlcExecutionStep step) { + steps.add(step); + } +} diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/process/mapping.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/process/mapping.xml new file mode 100644 index 000000000..0bfae5989 --- /dev/null +++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/process/mapping.xml @@ -0,0 +1,38 @@ + + + + + + Process objects XML mapping + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java new file mode 100644 index 000000000..6405ca7bb --- /dev/null +++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java @@ -0,0 +1,116 @@ +package org.argeo.slc.core.process; + +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; +import java.text.SimpleDateFormat; +import java.util.UUID; + +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.argeo.slc.msg.process.SlcExecutionRequest; +import org.argeo.slc.msg.process.SlcExecutionStepsRequest; +import org.argeo.slc.unit.AbstractSpringTestCase; +import org.springframework.oxm.Marshaller; +import org.springframework.oxm.Unmarshaller; + +public class SlcExecutionCastorTest extends AbstractSpringTestCase { + private Log log = LogFactory.getLog(getClass()); + + public void testMarshalling() throws Exception { + Marshaller marshaller = getBean("marshaller"); + Unmarshaller unmarshaller = getBean("marshaller"); + + SlcExecution slcExec = createSimpleSlcExecution(); + + SlcExecutionRequest msgSave = new SlcExecutionRequest(); + msgSave.setSlcExecution(slcExec); + + String msgSaveXml = marshallAndLog(marshaller, msgSave); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + SlcExecutionStep step0 = new SlcExecutionStep(); + step0.setBegin(sdf.parse("2008-04-17 18:21")); + step0.setType("LOG"); + step0.addLog("A log message\nand another line"); + + SlcExecutionStep step1 = new SlcExecutionStep(); + step1.setBegin(sdf.parse("2008-04-17 18:25")); + step1.setType("LOG"); + step1.addLog("A nother log message"); + + SlcExecutionStepsRequest msgNotif = new SlcExecutionStepsRequest(); + msgNotif.addStep(step0); + msgNotif.addStep(step1); + msgNotif.setSlcExecutionUuid(slcExec.getUuid()); + + String msgNotifXml = marshallAndLog(marshaller, msgNotif); + + SlcExecutionRequest msgSaveUnm = unmarshall(unmarshaller, msgSaveXml); + assertNotNull(msgSaveUnm); + assertSlcExecution(slcExec, msgSaveUnm.getSlcExecution()); + + SlcExecutionStepsRequest msgNotifUnm = unmarshall(unmarshaller, + msgNotifXml); + assertNotNull(msgNotifUnm); + assertEquals(slcExec.getUuid(), msgNotifUnm.getSlcExecutionUuid()); + assertEquals(2, msgNotifUnm.getSteps().size()); + assertSlcExecutionStep(step0, msgNotifUnm.getSteps().get(0)); + assertSlcExecutionStep(step1, msgNotifUnm.getSteps().get(1)); + + SlcExecution slcExecUnm = msgSaveUnm.getSlcExecution(); + slcExecUnm.getSteps().addAll(msgNotifUnm.getSteps()); + + SlcExecutionRequest msgUpdate = new SlcExecutionRequest(); + msgUpdate.setSlcExecution(slcExecUnm); + String msgUpdateXml = marshallAndLog(marshaller, msgUpdate); + } + + private String marshallAndLog(Marshaller marshaller, Object obj) + throws IOException { + StringWriter writer = new StringWriter(); + marshaller.marshal(obj, new StreamResult(writer)); + String xml = writer.toString(); + log.info(xml); + IOUtils.closeQuietly(writer); + return xml; + } + + private T unmarshall(Unmarshaller unmarshaller, String xml) + throws IOException { + StringReader reader = new StringReader(xml); + Object obj = unmarshaller.unmarshal(new StreamSource(reader)); + IOUtils.closeQuietly(reader); + return (T) obj; + } + + private void assertSlcExecution(SlcExecution expected, SlcExecution reached) { + assertNotNull(reached); + assertEquals(expected.getHost(), reached.getHost()); + assertEquals(expected.getPath(), reached.getPath()); + assertEquals(expected.getType(), reached.getType()); + assertEquals(expected.getStatus(), reached.getStatus()); + } + + private void assertSlcExecutionStep(SlcExecutionStep expected, + SlcExecutionStep reached) { + assertNotNull(reached); + assertEquals(expected.getType(), reached.getType()); + assertEquals(expected.logAsString(), reached.logAsString()); + assertEquals(expected.getBegin(), reached.getBegin()); + } + + public static SlcExecution createSimpleSlcExecution() { + SlcExecution slcExec = new SlcExecution(); + slcExec.setUuid(UUID.randomUUID().toString()); + slcExec.setHost("localhost"); + slcExec.setPath("/test"); + slcExec.setType("slcAnt"); + slcExec.setStatus("STARTED"); + return slcExec; + } +} diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionWsIntegrationTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionWsIntegrationTest.java new file mode 100644 index 000000000..275c7aabf --- /dev/null +++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionWsIntegrationTest.java @@ -0,0 +1,26 @@ +package org.argeo.slc.core.process; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.argeo.slc.msg.process.SlcExecutionRequest; +import org.argeo.slc.unit.AbstractSpringTestCase; +import org.springframework.ws.client.core.WebServiceTemplate; + +public class SlcExecutionWsIntegrationTest extends AbstractSpringTestCase { + private Log log = LogFactory.getLog(getClass()); + + public void testSendSlcExecutionrequest() { + WebServiceTemplate template = getBean("webServiceTemplate"); + SlcExecution slcExec = SlcExecutionCastorTest + .createSimpleSlcExecution(); + + SlcExecutionRequest req = new SlcExecutionRequest(); + req.setSlcExecution(slcExec); + + log.info("Send SlcExecutionRequest for SlcExecution " + + slcExec.getUuid()); + + Object resp = template.marshalSendAndReceive(req); + log.info("Resp: " + resp); + } +} diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/process/applicationContext.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/process/applicationContext.xml new file mode 100644 index 000000000..c295d4510 --- /dev/null +++ b/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/process/applicationContext.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file -- 2.39.2 From 1c693323456b95b4a59e1929f44153bf6c5e2245 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 21 Apr 2008 16:59:11 +0000 Subject: [PATCH 03/16] Merge web service sandbox git-svn-id: https://svn.argeo.org/slc/trunk@1013 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.slc/pom.xml | 82 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 69 insertions(+), 13 deletions(-) diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml index d5b9a0499..531c80990 100644 --- a/org.argeo.slc/pom.xml +++ b/org.argeo.slc/pom.xml @@ -16,6 +16,9 @@ ../org.argeo.slc.core ../org.argeo.slc.example + + 2.5.3 + scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc @@ -148,36 +151,53 @@ - - log4j - log4j - 1.2.14 - - - commons-logging - commons-logging - 1.1.1 - + + log4j + log4j + 1.2.14 + + + commons-logging + commons-logging + 1.1.1 + org.hibernate hibernate 3.2.5.ga + org.springframework spring-context - 2.5 + ${version.spring} org.springframework spring-orm - 2.5 + ${version.spring} org.springframework spring-jdbc - 2.5 + ${version.spring} + + + org.springframework + spring-webmvc + ${version.spring} + + org.springframework.ws + spring-ws-core + 1.5.0 + + + org.springframework.ws + spring-oxm + 1.5.0 + + org.apache.ant ant @@ -203,6 +223,42 @@ hsqldb 1.8.0.9 + + + org.codehaus.castor + castor + 1.1.2.1 + + + xerces + xerces + + + + + xerces + xercesImpl + 2.8.1 + + + + javax.xml.soap + saaj-api + 1.3 + runtime + + + com.sun.xml.messaging.saaj + saaj-impl + 1.3 + runtime + + + javax.activation + activation + 1.1 + runtime + -- 2.39.2 From 0ec353a501c1e4f36fd336de3282c806b20c7955 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 21 Apr 2008 17:01:18 +0000 Subject: [PATCH 05/16] Initial import. git-svn-id: https://svn.argeo.org/slc/trunk@1015 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.slc.webapp/.classpath | 14 +++++ org.argeo.slc.webapp/.project | 38 +++++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 7 +++ ...clipse.jst.common.project.facet.core.prefs | 4 ++ .../org.eclipse.wst.common.component | 15 +++++ ....eclipse.wst.common.project.facet.core.xml | 8 +++ .../.settings/org.maven.ide.eclipse.prefs | 9 +++ org.argeo.slc.webapp/pom.xml | 50 +++++++++++++++++ .../src/main/webapp/META-INF/MANIFEST.MF | 2 + .../src/main/webapp/WEB-INF/slc.xsd | 55 +++++++++++++++++++ .../main/webapp/WEB-INF/spring-ws-servlet.xml | 49 +++++++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 18 ++++++ .../src/main/webapp/index.html | 0 13 files changed, 269 insertions(+) create mode 100644 org.argeo.slc.webapp/.classpath create mode 100644 org.argeo.slc.webapp/.project create mode 100644 org.argeo.slc.webapp/.settings/org.eclipse.jdt.core.prefs create mode 100644 org.argeo.slc.webapp/.settings/org.eclipse.jst.common.project.facet.core.prefs create mode 100644 org.argeo.slc.webapp/.settings/org.eclipse.wst.common.component create mode 100644 org.argeo.slc.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml create mode 100644 org.argeo.slc.webapp/.settings/org.maven.ide.eclipse.prefs create mode 100644 org.argeo.slc.webapp/pom.xml create mode 100644 org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF create mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc.xsd create mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/spring-ws-servlet.xml create mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml create mode 100644 org.argeo.slc.webapp/src/main/webapp/index.html diff --git a/org.argeo.slc.webapp/.classpath b/org.argeo.slc.webapp/.classpath new file mode 100644 index 000000000..71631531e --- /dev/null +++ b/org.argeo.slc.webapp/.classpath @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/org.argeo.slc.webapp/.project b/org.argeo.slc.webapp/.project new file mode 100644 index 000000000..9c84f1a57 --- /dev/null +++ b/org.argeo.slc.webapp/.project @@ -0,0 +1,38 @@ + + + org.argeo.slc.webapp + + + org.argeo.slc.server + org.argeo.slc.core + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.maven.ide.eclipse.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jem.workbench.JavaEMFNature + + diff --git a/org.argeo.slc.webapp/.settings/org.eclipse.jdt.core.prefs b/org.argeo.slc.webapp/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..1b86a29da --- /dev/null +++ b/org.argeo.slc.webapp/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +#Mon Apr 21 18:27:09 CEST 2008 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/org.argeo.slc.webapp/.settings/org.eclipse.jst.common.project.facet.core.prefs b/org.argeo.slc.webapp/.settings/org.eclipse.jst.common.project.facet.core.prefs new file mode 100644 index 000000000..7060fbfed --- /dev/null +++ b/org.argeo.slc.webapp/.settings/org.eclipse.jst.common.project.facet.core.prefs @@ -0,0 +1,4 @@ +#Mon Apr 21 18:27:10 CEST 2008 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jre1.5.0_07/owners=jst.java\:5.0 +classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5/owners=jst.web\:2.4 +eclipse.preferences.version=1 diff --git a/org.argeo.slc.webapp/.settings/org.eclipse.wst.common.component b/org.argeo.slc.webapp/.settings/org.eclipse.wst.common.component new file mode 100644 index 000000000..d88dd1789 --- /dev/null +++ b/org.argeo.slc.webapp/.settings/org.eclipse.wst.common.component @@ -0,0 +1,15 @@ + + + + + + +uses + + +uses + + + + + diff --git a/org.argeo.slc.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.argeo.slc.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 000000000..8e832a1bf --- /dev/null +++ b/org.argeo.slc.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/org.argeo.slc.webapp/.settings/org.maven.ide.eclipse.prefs b/org.argeo.slc.webapp/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..fe0690360 --- /dev/null +++ b/org.argeo.slc.webapp/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Mon Apr 21 18:40:20 CEST 2008 +activeProfiles= +eclipse.preferences.version=1 +filterResources=false +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +useMavenFolders=false +version=1 diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml new file mode 100644 index 000000000..ccc457f1f --- /dev/null +++ b/org.argeo.slc.webapp/pom.xml @@ -0,0 +1,50 @@ + + + 4.0.0 + + org.argeo.slc + argeo-slc + 0.9-SNAPSHOT + ../org.argeo.slc + + org.argeo.slc.webapp + war + SLC Web Application + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + + + + org.argeo.slc + argeo-slc-core + ${project.version} + + + org.argeo.slc + argeo-slc-server + ${project.version} + + + + + central + http://www.argeo.org/maven/proxy + + true + daily + warn + + + + \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF b/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF new file mode 100644 index 000000000..58630c02e --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc.xsd b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc.xsd new file mode 100644 index 000000000..8bbd467f2 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc.xsd @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/spring-ws-servlet.xml new file mode 100644 index 000000000..ef42eaa35 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/spring-ws-servlet.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + slcExecutionRequestEp + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 new file mode 100644 index 000000000..1948bd494 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,18 @@ + + + + Archetype Created Web Application + + + spring-ws + org.springframework.ws.transport.http.MessageDispatcherServlet + + + + spring-ws + /* + + + diff --git a/org.argeo.slc.webapp/src/main/webapp/index.html b/org.argeo.slc.webapp/src/main/webapp/index.html new file mode 100644 index 000000000..e69de29bb -- 2.39.2 From d1ebd88759319dfdd05cf0da7bbc3b47c67f80ad Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 21 Apr 2008 17:50:22 +0000 Subject: [PATCH 06/16] First basic controller git-svn-id: https://svn.argeo.org/slc/trunk@1016 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/main/webapp/WEB-INF/jsp/common.jsp | 13 ++ .../src/main/webapp/WEB-INF/jsp/footer.txt | 2 + .../src/main/webapp/WEB-INF/jsp/header.txt | 12 ++ .../src/main/webapp/WEB-INF/jsp/home.jsp | 15 ++ .../main/webapp/WEB-INF/slc-web-servlet.xml | 32 ++++ ...ring-ws-servlet.xml => slc-ws-servlet.xml} | 0 .../src/main/webapp/WEB-INF/web.xml | 32 ++-- .../src/main/webapp/index.html | 0 .../src/main/webapp/index.jsp | 12 ++ .../src/main/webapp/style.css | 159 ++++++++++++++++++ 10 files changed, 266 insertions(+), 11 deletions(-) create mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp create mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/footer.txt create mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/header.txt create mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp create mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{spring-ws-servlet.xml => slc-ws-servlet.xml} (100%) delete mode 100644 org.argeo.slc.webapp/src/main/webapp/index.html create mode 100644 org.argeo.slc.webapp/src/main/webapp/index.jsp create mode 100644 org.argeo.slc.webapp/src/main/webapp/style.css diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp new file mode 100644 index 000000000..a7cca86de --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp @@ -0,0 +1,13 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + + + + diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/footer.txt b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/footer.txt new file mode 100644 index 000000000..d733a1ffd --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/footer.txt @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/header.txt b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/header.txt new file mode 100644 index 000000000..dc83a3783 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/header.txt @@ -0,0 +1,12 @@ + +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + + +SLC Web + + + 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 new file mode 100644 index 000000000..c1b0252b5 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp @@ -0,0 +1,15 @@ + +<%@ 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"%> + + +

SLC Home

+ +WSDL Definiton +

+ +<%@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 new file mode 100644 index 000000000..98283b768 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + org.springframework.web.servlet.view.JstlView + + + WEB-INF/jsp/ + + + .jsp + + + + + \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/spring-ws-servlet.xml rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml 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 1948bd494..be80877ed 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 @@ -3,16 +3,26 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - Archetype Created Web Application - - - spring-ws - org.springframework.ws.transport.http.MessageDispatcherServlet - - - - spring-ws - /* - + SLC Web Application + + slc-ws + org.springframework.ws.transport.http.MessageDispatcherServlet + + + + slc-ws + /slcService/* + + + + slc-web + org.springframework.web.servlet.DispatcherServlet + + + + slc-web + *.web + + diff --git a/org.argeo.slc.webapp/src/main/webapp/index.html b/org.argeo.slc.webapp/src/main/webapp/index.html deleted file mode 100644 index e69de29bb..000000000 diff --git a/org.argeo.slc.webapp/src/main/webapp/index.jsp b/org.argeo.slc.webapp/src/main/webapp/index.jsp new file mode 100644 index 000000000..dd825aee7 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/index.jsp @@ -0,0 +1,12 @@ + +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + +<%@include file="WEB-INF/jsp/header.txt"%> + + +<% +response.sendRedirect("slcWeb/home"); +%> + +<%@include file="WEB-INF/jsp/footer.txt"%> \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/style.css b/org.argeo.slc.webapp/src/main/webapp/style.css new file mode 100644 index 000000000..828612e53 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/style.css @@ -0,0 +1,159 @@ +/* Generic Selectors */ +body { + font-family: sans-serif; + font-size: 12px; + color: black; + background-color: white; +} + +li { + list-style-type: none; +} + +h1 { + font-family: sans-serif; + font-size: 16px; + font-weight: bold; + color: #000000; + padding: 0px 0px 5px 0px; + margin: 0px; +} + +h2 { + font-family: sans-serif; + font-size: 14px; + font-weight: bold; + color: #000000; + padding: 5px 0px 5px 0px; + margin: 0px; + margin-top: 5px; +} + +table,form { + margin: 0px; +} + +img { + border: none; +} + +div { + font-size: 100%; +} + +tr.list:hover { + background-color: lightgrey; +} + +td.list { + border-top: 1px solid lighgrey; + padding: 2px 20px 2px 2px; + padding-right: 15px; +} + +th { + font-size: 12px; + padding: 2px 20px 2px 2px; + vertical-align: top; + text-align: left; +} + +td { + font-size: 12px; + padding: 1px; + vertical-align: middle; + text-align: left; +} + +.passed { + color: green; +} + +.failed { + color: red; +} + +/**************** Navigation ****************/ +td.nav1 { + padding: 5px 0px 0px 0px; + font-size: 12px; + font-weight: bold; +} + +td.nav2 { + padding: 0px 0px 0px 5px; + font-size: 12px; +} + +/**************** Forms ****************/ +input.submit { + border: solid 1px grey; + background-color: lightgrey; + align: right; +} + +input.submit:hover { + border: solid 1px #3399FF; + background-color: white; + color: #3399FF; +} + +input.std { + border: solid 1px lightgrey; + padding: 1px; + margin: 2px; +} + +.formError { + color: red; + padding: 1px; + margin: 2px; + font-weight: bold; +} + +/**************** Pseudo classes ****************/ +a:link { + color: #0066CC; + text-decoration: none; +} + +a:visited { + color: #0066CC; + text-decoration: none; +} + +a:hover { + color: #3399FF; + text-decoration: none; +} + +/************************* ID's *************************/ +#main { + position: absolute; + margin-left: 120px; + padding-top: 110px; +} + +#navigation { + position: absolute; + width: 100px; + height: 800px; + border-right: 1px solid #0066CC; + font-weight: normal; + margin-top: 110px; + margin-left: 10px; +} + +#banner { + position: absolute; + width: 400px; + height: 100px; +} + +#upperRight { + position: absolute; + top: 0; + right: 0; + margin-top: 20px; + margin-right: 10px; +} \ No newline at end of file -- 2.39.2 From 5ab586b602a234fe36f1cb8aafb0f0f096b460b3 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 21 Apr 2008 19:42:43 +0000 Subject: [PATCH 07/16] SlcExecution hibernate persistence git-svn-id: https://svn.argeo.org/slc/trunk@1017 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.slc.server/pom.xml | 21 +++++++++++++++++++ .../slc/web/mvc/admin/HomeController.java | 16 ++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/admin/HomeController.java diff --git a/org.argeo.slc.server/pom.xml b/org.argeo.slc.server/pom.xml index d670ad101..87965f928 100644 --- a/org.argeo.slc.server/pom.xml +++ b/org.argeo.slc.server/pom.xml @@ -36,5 +36,26 @@ ${project.version} + + javax.servlet + jstl + + + taglibs + standard + + + org.springframework + spring-webmvc + + + javax.servlet + servlet-api + compile + + + c3p0 + c3p0 + \ No newline at end of file diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/admin/HomeController.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/admin/HomeController.java new file mode 100644 index 000000000..7d294d594 --- /dev/null +++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/admin/HomeController.java @@ -0,0 +1,16 @@ +package org.argeo.slc.web.mvc.admin; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.ParameterizableViewController; + +public class HomeController extends ParameterizableViewController { + @Override + protected ModelAndView handleRequestInternal(HttpServletRequest request, + HttpServletResponse response) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + return modelAndView; + } +} -- 2.39.2 From 8d05b68f46cccfcea47117b6116abbd14d1dfcee Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 21 Apr 2008 19:43:51 +0000 Subject: [PATCH 08/16] SlcExecution hibernate persistence git-svn-id: https://svn.argeo.org/slc/trunk@1018 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../slc/core/process/SlcExecutionStep.java | 21 +++++ .../slc/dao/process/SlcExecutionDao.java | 8 ++ .../process/SlcExecutionDaoHibernate.java | 20 +++++ .../org/argeo/slc/castor/process/mapping.xml | 77 +++++++++--------- .../hibernate/process/SlcExecution.hbm.xml | 21 +++++ .../process/SlcExecutionStep.hbm.xml | 18 +++++ .../org/argeo/slc/spring/templates.xml | 80 +++++++++++++++++++ .../main/resources/org/argeo/slc/xml/slc.xsd | 56 +++++++++++++ .../core/process/SlcExecutionCastorTest.java | 36 ++------- .../core/process/SlcExecutionTestUtils.java | 39 +++++++++ .../SlcExecutionWsIntegrationTest.java | 2 +- .../process/SlcExecutionHibernateTest.java | 34 ++++++++ .../src/test/resources/log4j.properties | 2 +- .../slc/hibernate/applicationContext.xml | 54 +++---------- 14 files changed, 354 insertions(+), 114 deletions(-) create mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java create mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java create mode 100644 org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml create mode 100644 org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml create mode 100644 org.argeo.slc.core/src/main/resources/org/argeo/slc/spring/templates.xml create mode 100644 org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd create mode 100644 org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java create mode 100644 org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/process/SlcExecutionHibernateTest.java diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java index 0237e47b1..b18411136 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java @@ -5,15 +5,36 @@ import java.io.StringReader; import java.io.StringWriter; import java.util.Date; import java.util.List; +import java.util.UUID; import java.util.Vector; import org.apache.commons.io.IOUtils; public class SlcExecutionStep { + private String uuid; private String type; private Date begin; private List logLines = new Vector(); + /** Empty constructor */ + public SlcExecutionStep() { + } + + public SlcExecutionStep(String type, String log) { + this.type = type; + this.begin = new Date(); + this.uuid = UUID.randomUUID().toString(); + addLog(log); + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + public String getType() { return type; } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java new file mode 100644 index 000000000..71292e637 --- /dev/null +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java @@ -0,0 +1,8 @@ +package org.argeo.slc.dao.process; + +import org.argeo.slc.core.process.SlcExecution; + +public interface SlcExecutionDao { + public void create(SlcExecution slcExecution); + public SlcExecution getSlcExecution(String uuid); +} diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java new file mode 100644 index 000000000..c761e8dda --- /dev/null +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java @@ -0,0 +1,20 @@ +package org.argeo.slc.hibernate.process; + +import org.springframework.orm.hibernate3.support.HibernateDaoSupport; + +import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.dao.process.SlcExecutionDao; + +public class SlcExecutionDaoHibernate extends HibernateDaoSupport implements + SlcExecutionDao { + + public void create(SlcExecution slcExecution) { + getHibernateTemplate().save(slcExecution); + } + + public SlcExecution getSlcExecution(String uuid) { + return (SlcExecution) getHibernateTemplate().get(SlcExecution.class, + uuid); + } + +} diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/process/mapping.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/process/mapping.xml index 0bfae5989..a22159eb3 100644 --- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/process/mapping.xml +++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/process/mapping.xml @@ -1,38 +1,41 @@ - - - - - - Process objects XML mapping - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + Process objects XML mapping + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml new file mode 100644 index 000000000..bc41c4d67 --- /dev/null +++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml new file mode 100644 index 000000000..ce22c71a4 --- /dev/null +++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/spring/templates.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/spring/templates.xml new file mode 100644 index 000000000..dc4cdd500 --- /dev/null +++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/spring/templates.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml + + + org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml + + + org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml + + + org/argeo/slc/hibernate/test/NumericTRId.hbm.xml + + + org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml + + + org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml + + + org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml + + + org/argeo/slc/hibernate/process/SlcExecution.hbm.xml + + + org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd b/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd new file mode 100644 index 000000000..93cbb9270 --- /dev/null +++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java index 6405ca7bb..a9bc47e2c 100644 --- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java +++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java @@ -25,7 +25,7 @@ public class SlcExecutionCastorTest extends AbstractSpringTestCase { Marshaller marshaller = getBean("marshaller"); Unmarshaller unmarshaller = getBean("marshaller"); - SlcExecution slcExec = createSimpleSlcExecution(); + SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution(); SlcExecutionRequest msgSave = new SlcExecutionRequest(); msgSave.setSlcExecution(slcExec); @@ -34,11 +34,13 @@ public class SlcExecutionCastorTest extends AbstractSpringTestCase { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); SlcExecutionStep step0 = new SlcExecutionStep(); + step0.setUuid(UUID.randomUUID().toString()); step0.setBegin(sdf.parse("2008-04-17 18:21")); step0.setType("LOG"); step0.addLog("A log message\nand another line"); SlcExecutionStep step1 = new SlcExecutionStep(); + step1.setUuid(UUID.randomUUID().toString()); step1.setBegin(sdf.parse("2008-04-17 18:25")); step1.setType("LOG"); step1.addLog("A nother log message"); @@ -52,15 +54,15 @@ public class SlcExecutionCastorTest extends AbstractSpringTestCase { SlcExecutionRequest msgSaveUnm = unmarshall(unmarshaller, msgSaveXml); assertNotNull(msgSaveUnm); - assertSlcExecution(slcExec, msgSaveUnm.getSlcExecution()); + SlcExecutionTestUtils.assertSlcExecution(slcExec, msgSaveUnm.getSlcExecution()); SlcExecutionStepsRequest msgNotifUnm = unmarshall(unmarshaller, msgNotifXml); assertNotNull(msgNotifUnm); assertEquals(slcExec.getUuid(), msgNotifUnm.getSlcExecutionUuid()); assertEquals(2, msgNotifUnm.getSteps().size()); - assertSlcExecutionStep(step0, msgNotifUnm.getSteps().get(0)); - assertSlcExecutionStep(step1, msgNotifUnm.getSteps().get(1)); + SlcExecutionTestUtils.assertSlcExecutionStep(step0, msgNotifUnm.getSteps().get(0)); + SlcExecutionTestUtils.assertSlcExecutionStep(step1, msgNotifUnm.getSteps().get(1)); SlcExecution slcExecUnm = msgSaveUnm.getSlcExecution(); slcExecUnm.getSteps().addAll(msgNotifUnm.getSteps()); @@ -87,30 +89,4 @@ public class SlcExecutionCastorTest extends AbstractSpringTestCase { IOUtils.closeQuietly(reader); return (T) obj; } - - private void assertSlcExecution(SlcExecution expected, SlcExecution reached) { - assertNotNull(reached); - assertEquals(expected.getHost(), reached.getHost()); - assertEquals(expected.getPath(), reached.getPath()); - assertEquals(expected.getType(), reached.getType()); - assertEquals(expected.getStatus(), reached.getStatus()); - } - - private void assertSlcExecutionStep(SlcExecutionStep expected, - SlcExecutionStep reached) { - assertNotNull(reached); - assertEquals(expected.getType(), reached.getType()); - assertEquals(expected.logAsString(), reached.logAsString()); - assertEquals(expected.getBegin(), reached.getBegin()); - } - - public static SlcExecution createSimpleSlcExecution() { - SlcExecution slcExec = new SlcExecution(); - slcExec.setUuid(UUID.randomUUID().toString()); - slcExec.setHost("localhost"); - slcExec.setPath("/test"); - slcExec.setType("slcAnt"); - slcExec.setStatus("STARTED"); - return slcExec; - } } diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java new file mode 100644 index 000000000..fd6dd87ad --- /dev/null +++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java @@ -0,0 +1,39 @@ +package org.argeo.slc.core.process; + +import java.util.UUID; + +import junit.framework.TestCase; + +public abstract class SlcExecutionTestUtils extends TestCase{ + + public static SlcExecution createSimpleSlcExecution() { + SlcExecution slcExec = new SlcExecution(); + slcExec.setUuid(UUID.randomUUID().toString()); + slcExec.setHost("localhost"); + slcExec.setPath("/test"); + slcExec.setType("slcAnt"); + slcExec.setStatus("STARTED"); + return slcExec; + } + + public static void assertSlcExecution(SlcExecution expected, SlcExecution reached) { + assertNotNull(reached); + assertEquals(expected.getHost(), reached.getHost()); + assertEquals(expected.getPath(), reached.getPath()); + assertEquals(expected.getType(), reached.getType()); + assertEquals(expected.getStatus(), reached.getStatus()); + } + + public static void assertSlcExecutionStep(SlcExecutionStep expected, + SlcExecutionStep reached) { + assertNotNull(reached); + assertEquals(expected.getUuid(), reached.getUuid()); + assertEquals(expected.getType(), reached.getType()); + assertEquals(expected.logAsString(), reached.logAsString()); + assertEquals(expected.getBegin(), reached.getBegin()); + } + + private SlcExecutionTestUtils(){ + + } +} diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionWsIntegrationTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionWsIntegrationTest.java index 275c7aabf..d117cc047 100644 --- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionWsIntegrationTest.java +++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionWsIntegrationTest.java @@ -11,7 +11,7 @@ public class SlcExecutionWsIntegrationTest extends AbstractSpringTestCase { public void testSendSlcExecutionrequest() { WebServiceTemplate template = getBean("webServiceTemplate"); - SlcExecution slcExec = SlcExecutionCastorTest + SlcExecution slcExec = SlcExecutionTestUtils .createSimpleSlcExecution(); SlcExecutionRequest req = new SlcExecutionRequest(); diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/process/SlcExecutionHibernateTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/process/SlcExecutionHibernateTest.java new file mode 100644 index 000000000..5aed60d35 --- /dev/null +++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/process/SlcExecutionHibernateTest.java @@ -0,0 +1,34 @@ +package org.argeo.slc.hibernate.process; + +import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.core.process.SlcExecutionStep; +import org.argeo.slc.core.process.SlcExecutionTestUtils; +import org.argeo.slc.dao.process.SlcExecutionDao; +import org.argeo.slc.unit.AbstractSpringTestCase; + +public class SlcExecutionHibernateTest extends AbstractSpringTestCase { + + public void testSave() { + SlcExecutionDao dao = getBean("slcExecutionDao"); + + SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution(); + slcExec.getSteps().add(new SlcExecutionStep("LOG", "A log line")); + slcExec.getSteps().add(new SlcExecutionStep("LOG", "Two log\nlines")); + + dao.create(slcExec); + + SlcExecution slcExecPersisted = dao.getSlcExecution(slcExec.getUuid()); + SlcExecutionTestUtils.assertSlcExecution(slcExec, slcExecPersisted); + assertEquals(2, slcExecPersisted.getSteps().size()); + SlcExecutionTestUtils.assertSlcExecutionStep(slcExec.getSteps().get(0), + slcExecPersisted.getSteps().get(0)); + SlcExecutionTestUtils.assertSlcExecutionStep(slcExec.getSteps().get(1), + slcExecPersisted.getSteps().get(1)); + } + + @Override + protected String getApplicationContextLocation() { + return "org/argeo/slc/hibernate/applicationContext.xml"; + } + +} diff --git a/org.argeo.slc.core/src/test/resources/log4j.properties b/org.argeo.slc.core/src/test/resources/log4j.properties index 8eb8b0c9c..3b925523b 100644 --- a/org.argeo.slc.core/src/test/resources/log4j.properties +++ b/org.argeo.slc.core/src/test/resources/log4j.properties @@ -7,7 +7,7 @@ log4j.logger.org.argeo.slc=DEBUG # Spring log4j.logger.org.springframework=INFO # Hibernate -log4j.logger.org.hibernate=WARN +log4j.logger.org.hibernate=DEBUG #log4j.logger.org.hibernate.SQL=TRACE #log4j.logger.org.hibernate.tool.hbm2ddl=TRACE #log4j.logger.org.hibernate.type=TRACE diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml index cf320fdb5..7e429ad6b 100644 --- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml +++ b/org.argeo.slc.core/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml @@ -3,65 +3,29 @@ 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"> - - - - - - - - + - - - - - org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml - - - org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml - - - org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml - - - org/argeo/slc/hibernate/test/NumericTRId.hbm.xml - - - org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml - - - org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml - - - org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml - - - - - - hibernate.dialect=org.hibernate.dialect.HSQLDialect - hibernate.hbm2ddl.auto=create - - + parent="slcTemplates.sessionFactory.hibernateTestHSQL"> - + - + + + + + \ No newline at end of file -- 2.39.2 From 2f019a181af68f997a23ffac61cbf56e207712d9 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 21 Apr 2008 19:44:08 +0000 Subject: [PATCH 09/16] SlcExecution hibernate persistence git-svn-id: https://svn.argeo.org/slc/trunk@1019 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.slc/pom.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml index 531c80990..59f88b4c3 100644 --- a/org.argeo.slc/pom.xml +++ b/org.argeo.slc/pom.xml @@ -259,6 +259,27 @@ 1.1 runtime + + + javax.servlet + jstl + 1.1.2 + + + taglibs + standard + 1.1.2 + + + javax.servlet + servlet-api + 2.5 + + + c3p0 + c3p0 + 0.9.1.2 + -- 2.39.2 From 7152051a2d1fa624104ad673efd1f214447be8bf Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 21 Apr 2008 19:44:19 +0000 Subject: [PATCH 10/16] SlcExecution hibernate persistence git-svn-id: https://svn.argeo.org/slc/trunk@1020 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../main/webapp/WEB-INF/slc-ws-servlet.xml | 2 +- .../src/main/webapp/WEB-INF/slc.xsd | 55 ------------------- 2 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc.xsd 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 ef42eaa35..723587138 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 @@ -44,6 +44,6 @@ - + \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc.xsd b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc.xsd deleted file mode 100644 index 8bbd467f2..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc.xsd +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- 2.39.2 From c3ae2336076d0c1b7b2408133639158cc69f8b12 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 22 Apr 2008 10:04:14 +0000 Subject: [PATCH 11/16] First end-to-end SlcExecution with web service git-svn-id: https://svn.argeo.org/slc/trunk@1021 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../process/SlcExecutionListController.java | 41 +++++++++++++++++++ .../slc/ws/process/SlcExecutionRequestEp.java | 14 +++++-- 2 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionListController.java diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionListController.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionListController.java new file mode 100644 index 000000000..7641d249f --- /dev/null +++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionListController.java @@ -0,0 +1,41 @@ +package org.argeo.slc.web.mvc.process; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.ParameterizableViewController; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.dao.process.SlcExecutionDao; + +public class SlcExecutionListController extends ParameterizableViewController { + private Log log = LogFactory.getLog(getClass()); + + private final SlcExecutionDao slcExecutionDao; + + public SlcExecutionListController(SlcExecutionDao slcExecutionDao) { + this.slcExecutionDao = slcExecutionDao; + } + + @Override + protected ModelAndView handleRequestInternal(HttpServletRequest request, + HttpServletResponse response) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + + List slcExecutions = slcExecutionDao.listSlcExecutions(); + if (log.isDebugEnabled()) { + log.debug("SlcExecutions (" + slcExecutions.getClass() + "): " + + slcExecutions); + } + modelAndView.addObject("slcExecutions", slcExecutions); + modelAndView.setViewName(getViewName()); + return modelAndView; + } + +} diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java index 477e59678..a9782aca7 100644 --- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java +++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java @@ -3,20 +3,26 @@ package org.argeo.slc.ws.process; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.dao.process.SlcExecutionDao; import org.argeo.slc.msg.process.SlcExecutionRequest; import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint; -public class SlcExecutionRequestEp extends - AbstractMarshallingPayloadEndpoint { +public class SlcExecutionRequestEp extends AbstractMarshallingPayloadEndpoint { private Log log = LogFactory.getLog(getClass()); + private final SlcExecutionDao slcExecutionDao; + + public SlcExecutionRequestEp(SlcExecutionDao slcExecutionDao) { + this.slcExecutionDao = slcExecutionDao; + } + @Override protected Object invokeInternal(Object requestObject) throws Exception { SlcExecutionRequest msg = (SlcExecutionRequest) requestObject; SlcExecution slcExecution = msg.getSlcExecution(); - log.info("Received save or update request fro SlcExecution " - + slcExecution.getUuid()); + slcExecutionDao.create(slcExecution); + log.debug("Created SlcExecution with uuid " + slcExecution.getUuid()); return null; } -- 2.39.2 From a9652ebdcf0463eebe62c5071eddec0ecbcabd92 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 22 Apr 2008 10:04:17 +0000 Subject: [PATCH 12/16] First end-to-end SlcExecution with web service git-svn-id: https://svn.argeo.org/slc/trunk@1022 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../java/org/argeo/slc/dao/process/SlcExecutionDao.java | 3 +++ .../slc/hibernate/process/SlcExecutionDaoHibernate.java | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java index 71292e637..243e31c88 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java @@ -1,8 +1,11 @@ package org.argeo.slc.dao.process; +import java.util.List; + import org.argeo.slc.core.process.SlcExecution; public interface SlcExecutionDao { public void create(SlcExecution slcExecution); public SlcExecution getSlcExecution(String uuid); + public List listSlcExecutions(); } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java index c761e8dda..27656ef2a 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java @@ -1,5 +1,7 @@ package org.argeo.slc.hibernate.process; +import java.util.List; + import org.springframework.orm.hibernate3.support.HibernateDaoSupport; import org.argeo.slc.core.process.SlcExecution; @@ -17,4 +19,9 @@ public class SlcExecutionDaoHibernate extends HibernateDaoSupport implements uuid); } + public List listSlcExecutions() { + return (List) getHibernateTemplate().loadAll( + SlcExecution.class); + } + } -- 2.39.2 From 38087bceeb3d6bd73fb6942c9d7bfd6a7d0abca5 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 22 Apr 2008 10:04:25 +0000 Subject: [PATCH 13/16] First end-to-end SlcExecution with web service git-svn-id: https://svn.argeo.org/slc/trunk@1023 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../webapp/WEB-INF/applicationContext.xml | 31 ++++++++ .../src/main/webapp/WEB-INF/jsp/home.jsp | 7 +- .../webapp/WEB-INF/jsp/slcExecutionList.jsp | 23 ++++++ .../main/webapp/WEB-INF/slc-web-servlet.xml | 6 ++ .../main/webapp/WEB-INF/slc-ws-servlet.xml | 1 + .../src/main/webapp/WEB-INF/web.xml | 73 ++++++++++++------- 6 files changed, 112 insertions(+), 29 deletions(-) create mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml create mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@

SLC Home

-WSDL Definiton +

Web

+SLC Executions + +

Web Services

+WSDL Definition +

<%@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 @@ + +<%@ 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"%> + + +

SLC Execution List

+ + + + + + + + +

${slcExecution.uuid}

${slcExecution.status}

+ +