329770 Adding in a simple web app that makes no use of Spring.
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/resources/META-INF/MANIFEST.MF b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/resources/META-INF/MANIFEST.MF
index be88176..f9bf475 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/resources/META-INF/MANIFEST.MF
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/src/main/resources/META-INF/MANIFEST.MF
@@ -1,7 +1,6 @@
Manifest-Version: 1.0
Export-Package: org.eclipse.virgo.samples.formtags.sharedservices.domain,
- org.eclipse.virgo.samples.formtags.sharedservices.service,
- org.eclipse.virgo.samples.formtags.sharedservices.service.internal
+ org.eclipse.virgo.samples.formtags.sharedservices.service
Bundle-Version: 3.0.0
Tool: Bundlor 1.1.0.RELEASE
Bundle-Name: FormTags Service (and implementation)
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/.jsdtscope b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/.jsdtscope
deleted file mode 100644
index 8fbc6ca..0000000
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.settings/.jsdtscope
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"/>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
- <classpathentry kind="output" path=""/>
-</classpath>
diff --git a/no-spring-web/.classpath b/no-spring-web/.classpath
index 930e51d..e5c668c 100644
--- a/no-spring-web/.classpath
+++ b/no-spring-web/.classpath
@@ -15,17 +15,17 @@
<attribute name="org.eclipse.virgo.ide.jdt.core.test.classpathentry" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/APPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar">
+ <classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/APPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar">
<attributes>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar">
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar">
<attributes>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar" sourcepath="/APPS_IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar" sourcepath="/APPS_IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/no-spring-web/src/main/java/org/eclipse/virgo/apps/splash/ContentServlet.java b/no-spring-web/src/main/java/org/eclipse/virgo/samples/no/spring/ContentServlet.java
similarity index 95%
rename from no-spring-web/src/main/java/org/eclipse/virgo/apps/splash/ContentServlet.java
rename to no-spring-web/src/main/java/org/eclipse/virgo/samples/no/spring/ContentServlet.java
index 2da0dbd..1ec43df 100644
--- a/no-spring-web/src/main/java/org/eclipse/virgo/apps/splash/ContentServlet.java
+++ b/no-spring-web/src/main/java/org/eclipse/virgo/samples/no/spring/ContentServlet.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.eclipse.virgo.apps.splash;
+package org.eclipse.virgo.samples.no.spring;
import java.io.File;
import java.io.FileInputStream;
@@ -61,9 +61,9 @@
private static final String PATH_TO_VERSION_FILE = "lib/.version";
- private static final String VERSION_HOLDER = "<!--@<version@-->";
+ private static final String SAMPLE_HOLDER = "<!--@<sample-string@-->";
- private String view = "/WEB-INF/splash.html";
+ private String view = "/WEB-INF/sample.html";
private boolean gzipEnabled = true;
@@ -121,9 +121,9 @@
}
private String parseLine(String line) {
- if(line.contains(VERSION_HOLDER)){
- int offset = line.indexOf(VERSION_HOLDER);
- line = String.format("%s%s%s", line.substring(0, offset), this.version, line.substring(offset + VERSION_HOLDER.length()));
+ if(line.contains(SAMPLE_HOLDER)){
+ int offset = line.indexOf(SAMPLE_HOLDER);
+ line = String.format("%s%s%s", line.substring(0, offset), this.version, line.substring(offset + SAMPLE_HOLDER.length()));
}
return line;
}
diff --git a/no-spring-web/src/main/java/org/eclipse/virgo/apps/splash/GZIPResponseStream.java b/no-spring-web/src/main/java/org/eclipse/virgo/samples/no/spring/GZIPResponseStream.java
similarity index 97%
rename from no-spring-web/src/main/java/org/eclipse/virgo/apps/splash/GZIPResponseStream.java
rename to no-spring-web/src/main/java/org/eclipse/virgo/samples/no/spring/GZIPResponseStream.java
index 11ea83b..fcb617c 100644
--- a/no-spring-web/src/main/java/org/eclipse/virgo/apps/splash/GZIPResponseStream.java
+++ b/no-spring-web/src/main/java/org/eclipse/virgo/samples/no/spring/GZIPResponseStream.java
@@ -1,4 +1,4 @@
-package org.eclipse.virgo.apps.splash;
+package org.eclipse.virgo.samples.no.spring;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/no-spring-web/src/main/webapp/WEB-INF/splash.html b/no-spring-web/src/main/webapp/WEB-INF/sample.html
similarity index 95%
rename from no-spring-web/src/main/webapp/WEB-INF/splash.html
rename to no-spring-web/src/main/webapp/WEB-INF/sample.html
index c7f0da3..2c87575 100644
--- a/no-spring-web/src/main/webapp/WEB-INF/splash.html
+++ b/no-spring-web/src/main/webapp/WEB-INF/sample.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
- <title>Virgo Splash Screen</title>
+ <title>Virgo Sample with No Spring</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<link rel="shortcut icon" href="images/favicon.ico" />
<link rel="stylesheet" href="styles/main.css" type="text/css" />
@@ -33,7 +33,7 @@
<div id="content-no-nav">
<div id="splash-container"><img class="splash" src="images/server-splash.png" alt="EclipseRT Virgo Server" />
- <div id="version-text"><!--@<version@--></div>
+ <div id="version-text"><!--@<sample-string@--></div>
</div>
<h1>Welcome</h1>
diff --git a/no-spring-web/src/main/webapp/WEB-INF/web.xml b/no-spring-web/src/main/webapp/WEB-INF/web.xml
index c71acd3..72b9a55 100644
--- a/no-spring-web/src/main/webapp/WEB-INF/web.xml
+++ b/no-spring-web/src/main/webapp/WEB-INF/web.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
- <display-name>Virgo Splash Screen</display-name>
- <description>Virgo Server - Splash Screen</description>
+ <display-name>Virgo Sample Simple Web</display-name>
+ <description>Virgo Server - Sample Web</description>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
<servlet>
<servlet-name>content</servlet-name>
- <servlet-class>org.eclipse.virgo.apps.splash.ContentServlet</servlet-class>
+ <servlet-class>org.eclipse.virgo.samples.no.spring.ContentServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>content</servlet-name>
- <url-pattern>/splash/*</url-pattern>
+ <url-pattern>/sample/*</url-pattern>
</servlet-mapping>
</web-app>
\ No newline at end of file
diff --git a/no-spring-web/src/main/webapp/index.html b/no-spring-web/src/main/webapp/index.html
index 3f1e743..9e01d06 100644
--- a/no-spring-web/src/main/webapp/index.html
+++ b/no-spring-web/src/main/webapp/index.html
@@ -1,8 +1,8 @@
<!DOCTYPE html>
<html lang="en">
<head>
- <title>Virgo Splash Screen</title>
- <meta http-equiv="REFRESH" content="0;url=/splash">
+ <title>Virgo Sample Web</title>
+ <meta http-equiv="REFRESH" content="0;url=/sample">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="images/favicon.ico" />
</head>
diff --git a/no-spring-web/template.mf b/no-spring-web/template.mf
index 9503fd3..4cdfc55 100644
--- a/no-spring-web/template.mf
+++ b/no-spring-web/template.mf
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
-Bundle-Name: Splash Screen
+Bundle-Name: Sample No Spring
Bundle-Version: ${version}
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.virgo.apps.splash
+Bundle-SymbolicName: org.eclipse.virgo.samples.no.spring
Bundle-ClassPath: WEB-INF/classes
Web-ContextPath: /
Import-Template:
