projects / lgpl / argeo-commons.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e470fc4)
Introduce minimal webapp
authorMathieu Baudier <mbaudier@argeo.org>
Mon, 14 Sep 2009 10:29:26 +0000 (10:29 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Mon, 14 Sep 2009 10:29:26 +0000 (10:29 +0000)
git-svn-id: https://svn.argeo.org/commons/trunk@2903 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF patch | blob | history
server/demo/org.argeo.server.demo.miniwebapp/index.jsp [new file with mode: 0644] patch | blob
server/demo/pom.xml patch | blob | history
server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF patch | blob | history

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 2c95ac4a4206bf00536f4583dfadb9317ddf1676..ba07660cef4509b511199cd3e576fce31144de54 100644 (file)
--- 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 (file)
index 0000000..4bc7124
--- /dev/null
+++ b/server/demo/org.argeo.server.demo.miniwebapp/index.jsp
@@ -0,0 +1,8 @@
+<html>
+<header><title>Hello World Title</title></header>
+<body>
+<h1>Hello World! section</h1>
+Hello World! from HTML<br/>
+<% out.println("Hello World! from Java"); %><br/>
+</body>
+</html>
diff --git a/server/demo/pom.xml b/server/demo/pom.xml
index a4b22ff5eed2de5f9376f134ba9e11030ddba30b..76f5720eb84cc25659454b16025f9866e7da6387 100644 (file)
--- a/server/demo/pom.xml
+++ b/server/demo/pom.xml
@@ -29,6 +29,8 @@
                                        <systemProperties>
                                                <slc.osgi.start>
                                                        org.springframework.osgi.extender,
+                                                       org.springframework.osgi.web.extender,
+                                                       org.argeo.dep.osgi.catalina.start,
                                                        org.argeo.server.demo.miniwebapp
                                                </slc.osgi.start>
                                                <slc.osgi.bundles>
@@ -123,8 +125,6 @@
                        <groupId>javax.xml.stream</groupId>
                        <artifactId>com.springsource.javax.xml.stream</artifactId>
                </dependency>
-
-               <!-- JSP -->
                <dependency>
                        <groupId>javax.servlet</groupId>
                        <artifactId>com.springsource.javax.servlet.jsp</artifactId>
@@ -138,13 +138,20 @@
                        <artifactId>com.springsource.javax.el</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.el</groupId>
-                       <artifactId>com.springsource.org.apache.el</artifactId>
+                       <groupId>javax.xml.ws</groupId>
+                       <artifactId>com.springsource.javax.xml.ws</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>javax.xml.bind</groupId>
+                       <artifactId>com.springsource.javax.xml.bind</artifactId>
+               </dependency>
+
+               <!-- Taglibs
                <dependency>
                        <groupId>org.apache.taglibs</groupId>
                        <artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
-               </dependency>
+               </dependency> -->
+
 
                <!-- Tomcat -->
                <dependency>
@@ -160,12 +167,13 @@
                        <artifactId>com.springsource.org.apache.jasper</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.xml.ws</groupId>
-                       <artifactId>com.springsource.javax.xml.ws</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.bind</groupId>
-                       <artifactId>com.springsource.javax.xml.bind</artifactId>
+                       <groupId>org.apache.el</groupId>
+                       <artifactId>com.springsource.org.apache.el</artifactId>
                </dependency>
+
+               <!--
+                       ActiveMQ <dependency> <groupId>org.argeo.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.activemq</artifactId> </dependency>
+               -->
        </dependencies>
 </project>
\ 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 8336c33648cc133bb78c71f4992bdb0e1a069f97..01d0fcca005e2565290b0ce40ab85e7faa3a4536 100644 (file)
--- 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
Argeo Commons - Lightweight integration framework in pure Java/OSGi