From: Mathieu Baudier Date: Thu, 7 May 2009 09:17:37 +0000 (+0000) Subject: Remove ActiveMQ Web and Spring Web Services X-Git-Tag: argeo-slc-2.1.7~1910 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=5ec2895100c0f8dc1b47f7ffaff8ce164902714a;p=gpl%2Fargeo-slc.git Remove ActiveMQ Web and Spring Web Services git-svn-id: https://svn.argeo.org/slc/trunk@2414 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml index fc33ff5ea..12eb55d7b 100644 --- a/org.argeo.slc/pom.xml +++ b/org.argeo.slc/pom.xml @@ -20,7 +20,7 @@ 3.4.2.R34x_v20080826-1230 2.0.0 5.2.0.0006 - 5.2.0.0005 + 0.1.8 @@ -441,12 +441,13 @@ limitations under the License. org.springframework.jms ${version.spring} - + org.springframework.ws org.springframework.oxm @@ -770,13 +771,18 @@ limitations under the License. org.apache.activemq com.springsource.org.apache.activemq.pool 5.2.0 - - - org.argeo.dep.osgi + + + org.apache.activemq + com.springsource.org.apache.activemq + + + + javax.xml.soap com.springsource.javax.xml.soap diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml index 2c5925ddf..782495b41 100644 --- a/runtime/org.argeo.slc.server/pom.xml +++ b/runtime/org.argeo.slc.server/pom.xml @@ -75,10 +75,12 @@ + org.springframework org.springframework.web.servlet diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/CustomSoapExceptionResolver.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/CustomSoapExceptionResolver.java deleted file mode 100644 index 0c59c1c6d..000000000 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/CustomSoapExceptionResolver.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.argeo.slc.ws; - -import javax.xml.namespace.QName; - -import org.springframework.ws.context.MessageContext; -import org.springframework.ws.soap.SoapFault; -import org.springframework.ws.soap.SoapFaultDetail; -import org.springframework.ws.soap.server.endpoint.SimpleSoapExceptionResolver; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -public class CustomSoapExceptionResolver extends SimpleSoapExceptionResolver { - private Log log = LogFactory.getLog(getClass()); - - @Override - protected void customizeFault(MessageContext messageContext, - Object endpoint, Exception ex, SoapFault fault) { - log.error("Exception " + ex.getMessage() + " in end point " + endpoint, - ex); - SoapFaultDetail detail = fault.addFaultDetail(); - for (StackTraceElement elem : ex.getStackTrace()) { - detail.addFaultDetailElement(new QName("StackElement")).addText( - elem.toString()); - } - } - -} diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java deleted file mode 100644 index fe416c593..000000000 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.argeo.slc.ws.process; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.argeo.slc.SlcException; -import org.argeo.slc.dao.process.SlcExecutionDao; -import org.argeo.slc.msg.process.SlcExecutionRequest; -import org.argeo.slc.msg.process.SlcExecutionStatusRequest; -import org.argeo.slc.process.SlcExecution; - -import org.springframework.ws.server.endpoint.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 { - if (requestObject instanceof SlcExecutionRequest) { - - SlcExecutionRequest msg = (SlcExecutionRequest) requestObject; - SlcExecution slcExecutionMsg = msg.getSlcExecution(); - - SlcExecution slcExecutionPersisted = slcExecutionDao - .getSlcExecution(slcExecutionMsg.getUuid()); - if (slcExecutionPersisted == null) { - if (log.isTraceEnabled()) - log.trace("Creating SLC execution #" - + slcExecutionMsg.getUuid()); - - slcExecutionDao.create(slcExecutionMsg); - } else { - if (log.isTraceEnabled()) - log.trace("Updating SLC execution #" - + slcExecutionMsg.getUuid()); - - slcExecutionDao.merge(slcExecutionMsg); - } - return null; - - } else if (requestObject instanceof SlcExecutionStatusRequest) { - SlcExecutionStatusRequest msg = (SlcExecutionStatusRequest) requestObject; - SlcExecution slcExecution = slcExecutionDao.getSlcExecution(msg - .getSlcExecutionUuid()); - if (slcExecution == null) - throw new SlcException("Could not find SLC execution #" - + msg.getSlcExecutionUuid()); - - slcExecution.setStatus(msg.getNewStatus()); - - if (log.isTraceEnabled()) - log.trace("Updating status for SLC execution #" - + slcExecution.getUuid()); - - slcExecutionDao.update(slcExecution); - return null; - } else { - throw new SlcException("Unrecognized request format: " - + requestObject.getClass()); - } - } -} diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java deleted file mode 100644 index 4295c182b..000000000 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.argeo.slc.ws.process; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.slc.dao.process.SlcExecutionDao; -import org.argeo.slc.msg.process.SlcExecutionStepsRequest; -import org.argeo.slc.process.SlcExecutionStep; -import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint; - -public class SlcExecutionStepsRequestEp extends - AbstractMarshallingPayloadEndpoint { - - private Log log = LogFactory.getLog(getClass()); - - private final SlcExecutionDao slcExecutionDao; - - public SlcExecutionStepsRequestEp(SlcExecutionDao slcExecutionDao) { - this.slcExecutionDao = slcExecutionDao; - } - - @Override - protected Object invokeInternal(Object requestObject) throws Exception { - String uuid = null; - try { - SlcExecutionStepsRequest msg = (SlcExecutionStepsRequest) requestObject; - uuid = msg.getSlcExecutionUuid(); - if (log.isTraceEnabled()) { - log.trace("Trying to add additional steps to SLC execution #" - + uuid + ":"); - for (SlcExecutionStep step : msg.getSteps()) { - log.trace("Step " + step.getUuid() + " (in SLC execution #" - + uuid + ")"); - } - log.trace("Adding " + msg.getSteps().size() - + " steps to SLC execution #" + uuid); - } - - slcExecutionDao.addSteps(uuid, msg.getSteps()); - return null; - } catch (Exception e) { - log.error("Could not update SLC execution #" + uuid - + " with additional steps", e); - throw e; - } - } - -} diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CloseTreeTestResultRequestEp.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CloseTreeTestResultRequestEp.java deleted file mode 100644 index 507dc3440..000000000 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CloseTreeTestResultRequestEp.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.argeo.slc.ws.test.tree; - -import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.argeo.slc.dao.test.tree.TreeTestResultDao; -import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest; - -public class CloseTreeTestResultRequestEp extends - AbstractMarshallingPayloadEndpoint { - - private Log log = LogFactory.getLog(getClass()); - - private final TreeTestResultDao treeTestResultDao; - - public CloseTreeTestResultRequestEp(TreeTestResultDao treeTestResultDao) { - this.treeTestResultDao = treeTestResultDao; - } - - @Override - protected Object invokeInternal(Object requestObject) throws Exception { - CloseTreeTestResultRequest msg = (CloseTreeTestResultRequest) requestObject; - - if (log.isTraceEnabled()) - log.trace("Closing result #" + msg.getResultUuid() + " at date " - + msg.getCloseDate()); - - treeTestResultDao.close(msg.getResultUuid(), msg.getCloseDate()); - - return null; - } - -} diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java deleted file mode 100644 index f61d86666..000000000 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.argeo.slc.ws.test.tree; - -import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.argeo.slc.core.test.tree.TreeTestResult; -import org.argeo.slc.dao.test.tree.TreeTestResultDao; -import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest; -import org.argeo.slc.services.test.TestManagerService; - -public class CreateTreeTestResultRequestEp extends - AbstractMarshallingPayloadEndpoint { - - private Log log = LogFactory.getLog(getClass()); - - private final TreeTestResultDao treeTestResultDao; - private final TestManagerService testManagerService; - - public CreateTreeTestResultRequestEp(TreeTestResultDao treeTestResultDao, - TestManagerService testManagerService) { - this.treeTestResultDao = treeTestResultDao; - this.testManagerService = testManagerService; - } - - @Override - protected Object invokeInternal(Object requestObject) throws Exception { - CreateTreeTestResultRequest msg = (CreateTreeTestResultRequest) requestObject; - TreeTestResult treeTestResult = msg.getTreeTestResult(); - - if (log.isTraceEnabled()) - log.trace("Creating result #" + treeTestResult.getUuid()); - treeTestResultDao.create(treeTestResult); - - if (log.isTraceEnabled()) - log.trace("Registering test run descriptor #" - + msg.getTestRunDescriptor().getTestRunUuid()); - testManagerService - .registerTestRunDescriptor(msg.getTestRunDescriptor()); - - return null; - } - -} diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java deleted file mode 100644 index d8ebbfd9f..000000000 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.argeo.slc.ws.test.tree; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.slc.dao.test.tree.TreeTestResultDao; -import org.argeo.slc.msg.test.tree.ResultPartRequest; -import org.argeo.slc.services.test.TestManagerService; -import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint; - -public class ResultPartRequestEp extends AbstractMarshallingPayloadEndpoint { - - private Log log = LogFactory.getLog(getClass()); - - private final TreeTestResultDao treeTestResultDao; - private final TestManagerService testManagerService; - - public ResultPartRequestEp(TreeTestResultDao treeTestResultDao, - TestManagerService testManagerService) { - this.treeTestResultDao = treeTestResultDao; - this.testManagerService = testManagerService; - } - - @Override - protected Object invokeInternal(Object requestObject) throws Exception { - ResultPartRequest msg = (ResultPartRequest) requestObject; - - if (log.isTraceEnabled()) - log.trace("Registering test run descriptor #" - + msg.getTestRunDescriptor().getTestRunUuid()); - - testManagerService - .registerTestRunDescriptor(msg.getTestRunDescriptor()); - - if (log.isTraceEnabled()) - log.trace("Adding result part to test result #" - + msg.getResultUuid()); - - treeTestResultDao.addResultPart(msg.getResultUuid(), msg.getPath(), msg - .getResultPart(), msg.getRelatedElements()); -// treeTestResultDao.updateAttributes(msg.getResultUuid(), msg -// .getAttributes()); - - return null; - } - -} diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF index 8e1837520..68ce804ae 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF @@ -12,7 +12,6 @@ Import-Package: com.sun.xml.messaging.saaj.soap;optional=true, javax.servlet.jsp.jstl.tlv, javax.servlet.resources, org.aopalliance.aop, - org.apache.activemq.web, org.apache.taglibs.standard.resources, org.apache.taglibs.standard.tag.common.core, org.apache.taglibs.standard.tag.rt.core, @@ -39,13 +38,6 @@ Import-Package: com.sun.xml.messaging.saaj.soap;optional=true, org.springframework.web.servlet.handler, org.springframework.web.servlet.view, org.springframework.web.util, - org.springframework.ws.context, - org.springframework.ws.server.endpoint, - org.springframework.ws.server.endpoint.interceptor, - org.springframework.ws.server.endpoint.mapping, - org.springframework.ws.soap.saaj, - org.springframework.ws.transport.http, - org.springframework.ws.wsdl.wsdl11, org.springframework.xml.xsd Require-Bundle: org.argeo.slc.server, org.argeo.slc.specs, diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/slc-ws-servlet.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/slc-ws-servlet.xml deleted file mode 100644 index 1e0da9382..000000000 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/slc-ws-servlet.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - slcExecutionRequestEp - - - slcExecutionRequestEp - - - slcExecutionStepsRequestEp - - - createTreeTestResultRequestEp - - - closeTreeTestResultRequestEp - - - resultPartRequestEp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml index b18721157..a7477347e 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml @@ -21,22 +21,6 @@ *.service - - - slc-ws - - org.springframework.ws.transport.http.MessageDispatcherServlet - - contextClass - org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext - - - - - slc-ws - /slcService/* - - xslt @@ -86,13 +70,6 @@ org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext - - Log4j @@ -108,35 +85,22 @@ - - + diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml index 286b1daca..587c6e690 100644 --- a/server/org.argeo.slc.siteserver/pom.xml +++ b/server/org.argeo.slc.siteserver/pom.xml @@ -136,11 +136,11 @@ com.springsource.com.sun.xml.messaging.saaj - + \ No newline at end of file