Introduce Server OSGi

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

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 (file)
index 0000000..223bbd9
--- /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 d73c598a35d5686a9b6f6bd3f6a1c3e0fa1e2a9c..52846dec2561c3ae88cedb41903612370b438b37 100644 (file)
--- 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 a90fe0c9a8f61772814350ee1a6ce5dcf624da84..f496689b9fbeb61d55567befa946236c199e0729 100644 (file)
--- 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