Add simple OSGi Web Application
A hello world style OSGi Web Application for testing purposes.
diff --git a/build.gradle b/build.gradle
index d9b4576..14bcf82 100644
--- a/build.gradle
+++ b/build.gradle
@@ -131,6 +131,9 @@
project(':apps:org.eclipse.virgo.apps.repository.core'),
project(':apps:org.eclipse.virgo.apps.repository.web'),
+
+ // test-apps
+ project(':web:test-apps:osgi-webapp'),
]
aspectjProjects = [
diff --git a/run_virgo_for_apache_tomcat.sh b/run_virgo_for_apache_tomcat.sh
index c4a712a..a6eb993 100755
--- a/run_virgo_for_apache_tomcat.sh
+++ b/run_virgo_for_apache_tomcat.sh
@@ -2,5 +2,13 @@
./gradlew -Dskip.normalize.bundles=true -Dskip.local.signing=true -Dskip.compress.bundles=true packaging:tomcat-server:installDist -x test
+# build and deploy test app(s)
+
+./gradlew -Dskip.normalize.bundles=true -Dskip.compress.bundles=true -Dskip.local.signing=true -Dci.build.signjars=false web:test-apps:osgi-webapp:jar
+cp web/test-apps/osgi-webapp/build/libs/osgi-webapp-3.8.0.BUILD-SNAPSHOT.jar packaging/tomcat-server/build/install/virgo-tomcat-server/pickup
+
+#./gradlew -Dskip.normalize.bundles=true -Dskip.compress.bundles=true -Dskip.local.signing=true -Dci.build.signjars=false web:test-apps:classpath-context-config-locations:war
+#cp web/test-apps/classpath-context-config-locations/build/libs/classpath-context-config-locations-3.8.0.BUILD-SNAPSHOT.war packaging/tomcat-server/build/install/virgo-tomcat-server/pickup
+
cd packaging/tomcat-server/build/install/virgo-tomcat-server || exit
./bin/startup.sh
diff --git a/settings.gradle b/settings.gradle
index c484408..cdce096 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -100,6 +100,8 @@
include ':web:org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer'
include ':web:org.eclipse.virgo.web.enterprise.openejb.tomcat.factory'
+include ':web:test-apps:osgi-webapp'
+
// 3rd party bundles
include ':3rd-party'
diff --git a/web/test-apps/osgi-webapp/build.gradle b/web/test-apps/osgi-webapp/build.gradle
new file mode 100644
index 0000000..f604031
--- /dev/null
+++ b/web/test-apps/osgi-webapp/build.gradle
@@ -0,0 +1,7 @@
+jar.manifest.attributes(
+ '-wab': 'src/main/webapp'
+)
+
+dependencies {
+ compileOnly 'javax.servlet:javax.servlet-api'
+}
diff --git a/web/test-apps/osgi-webapp/bundle.bnd b/web/test-apps/osgi-webapp/bundle.bnd
new file mode 100644
index 0000000..2a6129f
--- /dev/null
+++ b/web/test-apps/osgi-webapp/bundle.bnd
@@ -0,0 +1,4 @@
+Bundle-ManifestVersion: 2
+Bundle-Name: Virgo Web Test-App osgi-webapp
+Bundle-SymbolicName: org.eclipse.virgo.web.test.osgi-webapp
+Web-ContextPath: /osgi-webapp
diff --git a/web/test-apps/osgi-webapp/src/main/java/org/eclipse/virgo/web/test/app/HelloServlet.java b/web/test-apps/osgi-webapp/src/main/java/org/eclipse/virgo/web/test/app/HelloServlet.java
new file mode 100644
index 0000000..aefff54
--- /dev/null
+++ b/web/test-apps/osgi-webapp/src/main/java/org/eclipse/virgo/web/test/app/HelloServlet.java
@@ -0,0 +1,15 @@
+package org.eclipse.virgo.web.test.app;
+
+import javax.servlet.Servlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class HelloServlet extends HttpServlet implements Servlet {
+
+ protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException {
+ response.getOutputStream().println("Hello");
+ }
+
+}
diff --git a/web/test-apps/osgi-webapp/src/main/webapp/WEB-INF/web.xml b/web/test-apps/osgi-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..69bbc1d
--- /dev/null
+++ b/web/test-apps/osgi-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>Virgo Test App 'osgi-webapp' - A simple OSGi Web Application</display-name>
+
+ <servlet>
+ <servlet-name>HelloServlet</servlet-name>
+ <servlet-class>org.eclipse.virgo.web.test.app.HelloServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>HelloServlet</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
