From e5e9a93b6ef2d1ae951d1151ba5916779a72affd Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 14 Sep 2009 10:29:26 +0000 Subject: [PATCH] Introduce minimal webapp git-svn-id: https://svn.argeo.org/commons/trunk@2903 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../META-INF/MANIFEST.MF | 1 + .../index.jsp | 8 +++++ server/demo/pom.xml | 30 ++++++++++++------- .../META-INF/MANIFEST.MF | 8 +++-- 4 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 server/demo/org.argeo.server.demo.miniwebapp/index.jsp diff --git a/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF b/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF index 2c95ac4a4..ba07660ce 100644 --- a/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF +++ b/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF @@ -1,3 +1,4 @@ +Web-ContextPath: org.argeo.server.demo.miniwebapp Bundle-SymbolicName: org.argeo.server.demo.miniwebapp Bundle-Version: 0.1.1.SNAPSHOT Import-Package: javax.servlet, diff --git a/server/demo/org.argeo.server.demo.miniwebapp/index.jsp b/server/demo/org.argeo.server.demo.miniwebapp/index.jsp new file mode 100644 index 000000000..4bc71249f --- /dev/null +++ b/server/demo/org.argeo.server.demo.miniwebapp/index.jsp @@ -0,0 +1,8 @@ + +

Hello World Title

+ +

Hello World! section

+Hello World! from HTML
+<% out.println("Hello World! from Java"); %>
+ + diff --git a/server/demo/pom.xml b/server/demo/pom.xml index a4b22ff5e..76f5720eb 100644 --- a/server/demo/pom.xml +++ b/server/demo/pom.xml @@ -29,6 +29,8 @@ org.springframework.osgi.extender, + org.springframework.osgi.web.extender, + org.argeo.dep.osgi.catalina.start, org.argeo.server.demo.miniwebapp @@ -123,8 +125,6 @@ javax.xml.stream com.springsource.javax.xml.stream - - javax.servlet com.springsource.javax.servlet.jsp @@ -138,13 +138,20 @@ com.springsource.javax.el - org.apache.el - com.springsource.org.apache.el + javax.xml.ws + com.springsource.javax.xml.ws + + javax.xml.bind + com.springsource.javax.xml.bind + + + + @@ -160,12 +167,13 @@ com.springsource.org.apache.jasper - javax.xml.ws - com.springsource.javax.xml.ws - - - javax.xml.bind - com.springsource.javax.xml.bind + org.apache.el + com.springsource.org.apache.el + + \ No newline at end of file diff --git a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF index 8336c3364..01d0fcca0 100644 --- a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF @@ -3,6 +3,8 @@ Fragment-Host: com.springsource.org.apache.catalina;bundle-version="[6 .0.16,7.0.0)" Bundle-Version: 0.1.1.SNAPSHOT Bundle-SymbolicName: org.argeo.server.catalina -Import-Package: org.springframework.security,org.springframework.secur - ity.providers,org.springframework.security.ui,org.springframework.sec - urity.userdetails,org.springframework.security.ui.savedrequest +Import-Package: org.springframework.security;resolution:=optional, + org.springframework.security.providers;resolution:=optional, + org.springframework.security.ui;resolution:=optional, + org.springframework.security.ui.savedrequest;resolution:=optional, + org.springframework.security.userdetails;resolution:=optional -- 2.30.2