Merge web service sandbox

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

diff --git a/org.argeo.slc.server/.classpath b/org.argeo.slc.server/.classpath
index 5c3f68c5aee678b0ae877873b007b8e0dcc538d2..40adf69ad75f72410157bc2879565c4b7a2a4311 100644 (file)
--- a/org.argeo.slc.server/.classpath
+++ b/org.argeo.slc.server/.classpath
@@ -3,5 +3,6 @@
        <classpathentry kind="src" path="src/main/java"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+       <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/org.argeo.slc.server/.project b/org.argeo.slc.server/.project
index 26efbecd6d4da1d5051f1a53008bc54bad84aba8..26b479f9872ca9e9d573d414153448df591c621d 100644 (file)
--- a/org.argeo.slc.server/.project
+++ b/org.argeo.slc.server/.project
@@ -5,6 +5,11 @@
        <projects>\r
        </projects>\r
        <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.wst.common.project.facet.core.builder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
                <buildCommand>\r
                        <name>org.eclipse.jdt.core.javabuilder</name>\r
                        <arguments>\r
@@ -15,9 +20,17 @@
                        <arguments>\r
                        </arguments>\r
                </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.wst.validation.validationbuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
        </buildSpec>\r
        <natures>\r
                <nature>org.eclipse.jdt.core.javanature</nature>\r
                <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
+               <nature>org.eclipse.wst.common.project.facet.core.nature</nature>\r
+               <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>\r
+               <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>\r
        </natures>\r
 </projectDescription>\r

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 (file)
index 0000000..66f90d6
--- /dev/null
+++ b/org.argeo.slc.server/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project-modules id="moduleCoreId" project-version="1.5.0">\r
+<wb-module deploy-name="org.argeo.slc.server">\r
+<wb-resource deploy-path="/" source-path="/src/main/java"/>\r
+</wb-module>\r
+</project-modules>\r

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 (file)
index 0000000..55c9972
--- /dev/null
+++ b/org.argeo.slc.server/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<faceted-project>\r
+  <fixed facet="jst.utility"/>\r
+  <fixed facet="jst.java"/>\r
+  <installed facet="jst.java" version="5.0"/>\r
+  <installed facet="jst.utility" version="1.0"/>\r
+</faceted-project>\r

diff --git a/org.argeo.slc.server/pom.xml b/org.argeo.slc.server/pom.xml
index 6e54c73816417a88b4234bf248267bceac4db20b..d670ad101b859831bbeabdb536e7e2dcb252c1be 100644 (file)
--- a/org.argeo.slc.server/pom.xml
+++ b/org.argeo.slc.server/pom.xml
@@ -36,31 +36,5 @@
                        <version>${project.version}</version>\r
                </dependency>\r
 \r
-               <dependency>\r
-                       <groupId>org.springframework.ws</groupId>\r
-                       <artifactId>spring-ws-core</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework.ws</groupId>\r
-                       <artifactId>spring-oxm</artifactId>\r
-               </dependency>\r
-\r
-               <dependency>\r
-                       <groupId>org.codehaus.castor</groupId>\r
-                       <artifactId>castor</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>xerces</groupId>\r
-                       <artifactId>xercesImpl</artifactId>\r
-               </dependency>\r
-\r
-               <dependency>\r
-                       <groupId>javax.xml.soap</groupId>\r
-                       <artifactId>saaj-api</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.sun.xml.messaging.saaj</groupId>\r
-                       <artifactId>saaj-impl</artifactId>\r
-               </dependency>\r
        </dependencies>\r
 </project>
\ 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 (file)
index 0000000..5e94951
--- /dev/null
+++ b/org.argeo.slc.server/src/main/java/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0\r
+Class-Path: \r
+\r

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 (file)
index 0000000..477e596
--- /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;
+       }
+
+}