From 117fa8f73a5b4bc0a79d596fc61b46e2dc2daf7c Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Mon, 8 Nov 2010 16:14:37 +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@3877 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.slc.client.oxm/.classpath       |  7 ---
 .../plugins/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 --
 .../org/argeo/slc/client/oxm/OxmBean.java     | 48 -------------------
 .../argeo/slc/client/oxm/OxmInterface.java    |  9 ----
 8 files changed, 146 deletions(-)
 delete mode 100644 eclipse/plugins/org.argeo.slc.client.oxm/.classpath
 delete mode 100644 eclipse/plugins/org.argeo.slc.client.oxm/.project
 delete mode 100644 eclipse/plugins/org.argeo.slc.client.oxm/META-INF/MANIFEST.MF
 delete mode 100644 eclipse/plugins/org.argeo.slc.client.oxm/META-INF/spring/osgi.xml
 delete mode 100644 eclipse/plugins/org.argeo.slc.client.oxm/META-INF/spring/oxm.xml
 delete mode 100644 eclipse/plugins/org.argeo.slc.client.oxm/build.properties
 delete mode 100644 eclipse/plugins/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmBean.java
 delete mode 100644 eclipse/plugins/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmInterface.java

diff --git a/eclipse/plugins/org.argeo.slc.client.oxm/.classpath b/eclipse/plugins/org.argeo.slc.client.oxm/.classpath
deleted file mode 100644
index 54b896ef3..000000000
--- a/eclipse/plugins/org.argeo.slc.client.oxm/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/eclipse/plugins/org.argeo.slc.client.oxm/.project b/eclipse/plugins/org.argeo.slc.client.oxm/.project
deleted file mode 100644
index 02b4cb480..000000000
--- a/eclipse/plugins/org.argeo.slc.client.oxm/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.argeo.slc.client.oxm</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/eclipse/plugins/org.argeo.slc.client.oxm/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.oxm/META-INF/MANIFEST.MF
deleted file mode 100644
index df483c676..000000000
--- a/eclipse/plugins/org.argeo.slc.client.oxm/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-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/org.argeo.slc.client.oxm/META-INF/spring/osgi.xml b/eclipse/plugins/org.argeo.slc.client.oxm/META-INF/spring/osgi.xml
deleted file mode 100644
index cac01bb38..000000000
--- a/eclipse/plugins/org.argeo.slc.client.oxm/META-INF/spring/osgi.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
-       http://www.springframework.org/schema/beans   
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<beans:description>
-		This bundle is a dummy one to try to solve issues on
-		the OSGI dep management
-	</beans:description>
-
-	<!-- Services exposed by the bundle -->
-	<service ref="oxmBean" interface="org.argeo.slc.client.oxm.OxmInterface" />
-
-
-	<!-- References Needed -->
-	<reference id="marshaller" interface="org.springframework.oxm.Marshaller" />
-	<reference id="unmarshaller" interface="org.springframework.oxm.Unmarshaller" />
-
-</beans:beans>
\ No newline at end of file
diff --git a/eclipse/plugins/org.argeo.slc.client.oxm/META-INF/spring/oxm.xml b/eclipse/plugins/org.argeo.slc.client.oxm/META-INF/spring/oxm.xml
deleted file mode 100644
index b1bc1f9bf..000000000
--- a/eclipse/plugins/org.argeo.slc.client.oxm/META-INF/spring/oxm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-	       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-	       ">
-	<!-- beans -->
-	<bean id="oxmBean" class="org.argeo.slc.client.oxm.OxmBean" scope="prototype"
-		init-method="init" lazy-init="false">
-		<property name="marshaller" ref="marshaller" />
-		<property name="unmarshaller" ref="unmarshaller" />
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/eclipse/plugins/org.argeo.slc.client.oxm/build.properties b/eclipse/plugins/org.argeo.slc.client.oxm/build.properties
deleted file mode 100644
index 5fc538bc8..000000000
--- a/eclipse/plugins/org.argeo.slc.client.oxm/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .
diff --git a/eclipse/plugins/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmBean.java b/eclipse/plugins/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmBean.java
deleted file mode 100644
index 5ea94d2b8..000000000
--- a/eclipse/plugins/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmBean.java
+++ /dev/null
@@ -1,48 +0,0 @@
-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/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmInterface.java b/eclipse/plugins/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmInterface.java
deleted file mode 100644
index dd430106c..000000000
--- a/eclipse/plugins/org.argeo.slc.client.oxm/src/main/java/org/argeo/slc/client/oxm/OxmInterface.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.argeo.slc.client.oxm;
-
-public interface OxmInterface {
-
-	public String marshal(Object graph);
-
-	public Object unmarshal(String result);
-
-}
-- 
2.39.2