From 328d06a6f9d10624020aa5dce94e01c998bb422e Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Mon, 8 Nov 2010 16:07:54 +0000 Subject: [PATCH] + refactor to separate runtime and module project under eclipse plugin. + add some pom to prepare the deployment + clean client rcp & ui project (change src & target folder) git-svn-id: https://svn.argeo.org/slc/trunk@3869 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org.argeo.slc.client.oxm/.classpath | 7 +++ .../runtime/org.argeo.slc.client.oxm/.project | 28 +++++++++++ .../META-INF/MANIFEST.MF | 13 +++++ .../META-INF/spring/osgi.xml | 22 +++++++++ .../META-INF/spring/oxm.xml | 15 ++++++ .../org.argeo.slc.client.oxm/build.properties | 4 ++ .../runtime/org.argeo.slc.client.oxm/pom.xml | 41 ++++++++++++++++ .../org/argeo/slc/client/oxm/OxmBean.java | 48 +++++++++++++++++++ .../argeo/slc/client/oxm/OxmInterface.java | 9 ++++ 9 files changed, 187 insertions(+) create mode 100644 eclipse/plugins/runtime/org.argeo.slc.client.oxm/.classpath create mode 100644 eclipse/plugins/runtime/org.argeo.slc.client.oxm/.project create mode 100644 eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/MANIFEST.MF create mode 100644 eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/spring/osgi.xml create mode 100644 eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/spring/oxm.xml create mode 100644 eclipse/plugins/runtime/org.argeo.slc.client.oxm/build.properties create mode 100644 eclipse/plugins/runtime/org.argeo.slc.client.oxm/pom.xml create mode 100644 eclipse/plugins/runtime/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmBean.java create mode 100644 eclipse/plugins/runtime/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmInterface.java diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.oxm/.classpath b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/.classpath new file mode 100644 index 000000000..54b896ef3 --- /dev/null +++ b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.oxm/.project b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/.project new file mode 100644 index 000000000..02b4cb480 --- /dev/null +++ b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/.project @@ -0,0 +1,28 @@ + + + org.argeo.slc.client.oxm + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/MANIFEST.MF b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/MANIFEST.MF new file mode 100644 index 000000000..df483c676 --- /dev/null +++ b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/MANIFEST.MF @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Version: 1.0.0.qualifier +Bundle-Name: Test Bundle to solve use case issues +Bundle-SymbolicName: org.argeo.slc.client.oxm +Export-Package: org.argeo.slc.client.oxm +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.ui +Import-Package: org.argeo.slc, + org.springframework.core, + org.springframework.oxm, + org.springframework.xml.transform + diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/spring/osgi.xml b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/spring/osgi.xml new file mode 100644 index 000000000..cac01bb38 --- /dev/null +++ b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/spring/osgi.xml @@ -0,0 +1,22 @@ + + + + + This bundle is a dummy one to try to solve issues on + the OSGI dep management + + + + + + + + + + + \ No newline at end of file diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/spring/oxm.xml b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/spring/oxm.xml new file mode 100644 index 000000000..b1bc1f9bf --- /dev/null +++ b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/META-INF/spring/oxm.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.oxm/build.properties b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/build.properties new file mode 100644 index 000000000..5fc538bc8 --- /dev/null +++ b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/build.properties @@ -0,0 +1,4 @@ +source.. = src/main/java/ +output.. = target/classes/ +bin.includes = META-INF/,\ + . diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.oxm/pom.xml b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/pom.xml new file mode 100644 index 000000000..c92200e4a --- /dev/null +++ b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/pom.xml @@ -0,0 +1,41 @@ + + 4.0.0 + + org.argeo.slc.eclipse + plugins + 0.13.0-SNAPSHOT + .. + + org.argeo.slc.client.oxm + SLC Client OXM + jar + + + + + org.argeo.slc.runtime + org.argeo.slc.core + ${project.version} + + + + org.eclipse.ui + org.eclipse.ui + + + org.eclipse.core + org.eclipse.core.runtime + + + + org.springframework.ws + org.springframework.oxm + + + org.springframework.ws + org.springframework.xml + + + + diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmBean.java b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmBean.java new file mode 100644 index 000000000..5ea94d2b8 --- /dev/null +++ b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmBean.java @@ -0,0 +1,48 @@ +package org.argeo.slc.client.oxm; + +import org.argeo.slc.SlcException; +import org.springframework.oxm.Marshaller; +import org.springframework.oxm.Unmarshaller; +import org.springframework.xml.transform.StringResult; +import org.springframework.xml.transform.StringSource; + +public class OxmBean implements OxmInterface { + + private Marshaller marshaller; + private Unmarshaller unmarshaller; + + public void init() { + } + + public Object unmarshal(String result) { + Object res; + if (result == null) + throw new SlcException("Cannot unmarshall empty string "); + try { + res = unmarshaller.unmarshal(new StringSource(result)); + } catch (Exception e) { + throw new SlcException("Could not unmarshall " + result, e); + } + return res; + } + + public String marshal(Object graph) { + StringResult result = new StringResult(); + try { + marshaller.marshal(graph, result); + } catch (Exception e) { + throw new SlcException("Cannot Marshal object " + graph.toString() + + " - " + e); + } + return result.toString(); + } + + // IoC + public void setMarshaller(Marshaller marshaller) { + this.marshaller = marshaller; + } + + public void setUnmarshaller(Unmarshaller unmarshaller) { + this.unmarshaller = unmarshaller; + } +} diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmInterface.java b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmInterface.java new file mode 100644 index 000000000..dd430106c --- /dev/null +++ b/eclipse/plugins/runtime/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmInterface.java @@ -0,0 +1,9 @@ +package org.argeo.slc.client.oxm; + +public interface OxmInterface { + + public String marshal(Object graph); + + public Object unmarshal(String result); + +} -- 2.39.2