From a68cfbd98f547069a4bf2de6cf531ec1fe6afa27 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 18 Sep 2009 15:31:20 +0000
Subject: [PATCH] Introduce Server OSGi

git-svn-id: https://svn.argeo.org/commons/trunk@2970 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF | 10 ++++++++++
 .../org/argeo/server/json/JsonServerMapperTest.java    |  2 +-
 server/runtime/pom.xml                                 |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF

diff --git a/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF b/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..223bbd9c7
--- /dev/null
+++ b/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Web-ContextPath: org.argeo.server.osgi.monitor
+Bundle-SymbolicName: org.argeo.server.osgi.monitor
+Bundle-Version: 0.1.1.SNAPSHOT
+Import-Package: javax.servlet,
+ javax.servlet.http,
+ javax.servlet.jsp,
+ javax.servlet.jsp.jstl.core,
+ javax.servlet.jsp.jstl.fmt,
+ javax.servlet.jsp.jstl.tlv,
+ javax.servlet.resources
diff --git a/server/runtime/org.argeo.server.json/src/test/java/org/argeo/server/json/JsonServerMapperTest.java b/server/runtime/org.argeo.server.json/src/test/java/org/argeo/server/json/JsonServerMapperTest.java
index d73c598a3..52846dec2 100644
--- a/server/runtime/org.argeo.server.json/src/test/java/org/argeo/server/json/JsonServerMapperTest.java
+++ b/server/runtime/org.argeo.server.json/src/test/java/org/argeo/server/json/JsonServerMapperTest.java
@@ -2,7 +2,7 @@ package org.argeo.server.json;
 
 public class JsonServerMapperTest {
 	public void testDeserialize() {
-		JsonServerMapper mapper = new JsonServerMapper();
+//		JsonServerMapper mapper = new JsonServerMapper();
 		//mapper.setTargetClass(targetClass)
 	}
 }
diff --git a/server/runtime/pom.xml b/server/runtime/pom.xml
index a90fe0c9a..f496689b9 100644
--- a/server/runtime/pom.xml
+++ b/server/runtime/pom.xml
@@ -15,5 +15,6 @@
 	<modules>
 		<module>org.argeo.server.core</module>
 		<module>org.argeo.server.json</module>
+		<module>org.argeo.server.osgi</module>
 	</modules>
 </project>
\ No newline at end of file
-- 
2.30.2