Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2013-02-22 12:35:06 -0500
committerChristopher Frost2013-02-22 12:35:06 -0500
commit60c195573c44d08cad0840f21367900abb17aa30 (patch)
treeccc52227089d1e88b8bfde17e9dc28b315b41744
parentf131bfc167db04991a70203e8660f8dea7671c2a (diff)
downloadorg.eclipse.virgo.samples-60c195573c44d08cad0840f21367900abb17aa30.tar.gz
org.eclipse.virgo.samples-60c195573c44d08cad0840f21367900abb17aa30.tar.xz
org.eclipse.virgo.samples-60c195573c44d08cad0840f21367900abb17aa30.zip
Work on samples finished and ready for release
-rw-r--r--README1
-rw-r--r--REST/org.eclipse.virgo.samples.rest/ivy.xml2
-rw-r--r--build-samples/README3
-rw-r--r--build-samples/build.xml35
-rw-r--r--build-samples/resources/README50
-rw-r--r--build-samples/resources/about_files/epl-v10.html (renamed from build-samples/resources/epl-v10.html)0
-rw-r--r--build.versions1
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/ivy.xml2
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/ivy.xml2
-rw-r--r--formtags/README.TXT14
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/.classpath (renamed from no-spring-web/.classpath)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/.project (renamed from no-spring-web/.project)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.jdt.core.prefs (renamed from no-spring-web/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.virgo.ide.bundlor.core.prefs (renamed from no-spring-web/.settings/org.eclipse.virgo.ide.bundlor.core.prefs)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.wst.common.component (renamed from no-spring-web/.settings/org.eclipse.wst.common.component)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.wst.common.project.facet.core.xml (renamed from no-spring-web/.settings/org.eclipse.wst.common.project.facet.core.xml)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.wst.jsdt.ui.superType.container (renamed from no-spring-web/.settings/org.eclipse.wst.jsdt.ui.superType.container)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.wst.jsdt.ui.superType.name (renamed from no-spring-web/.settings/org.eclipse.wst.jsdt.ui.superType.name)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/build.xml (renamed from no-spring-web/build.xml)6
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/ivy.xml (renamed from no-spring-web/ivy.xml)2
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/java/org/eclipse/virgo/samples/no/spring/ContentServlet.java (renamed from no-spring-web/src/main/java/org/eclipse/virgo/samples/no/spring/ContentServlet.java)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/java/org/eclipse/virgo/samples/no/spring/GZIPResponseStream.java (renamed from no-spring-web/src/main/java/org/eclipse/virgo/samples/no/spring/GZIPResponseStream.java)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/resources/.gitignore (renamed from no-spring-web/src/main/resources/.gitignore)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/META-INF/MANIFEST.MF (renamed from no-spring-web/src/main/webapp/META-INF/MANIFEST.MF)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/WEB-INF/sample.html (renamed from no-spring-web/src/main/webapp/WEB-INF/sample.html)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/WEB-INF/web.xml (renamed from no-spring-web/src/main/webapp/WEB-INF/web.xml)0
-rwxr-xr-xno-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/favicon.ico (renamed from no-spring-web/src/main/webapp/images/favicon.ico)bin1150 -> 1150 bytes
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/footer-left.png (renamed from no-spring-web/src/main/webapp/images/footer-left.png)bin2792 -> 2792 bytes
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/footer-right.png (renamed from no-spring-web/src/main/webapp/images/footer-right.png)bin2792 -> 2792 bytes
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/footer-stretch.png (renamed from no-spring-web/src/main/webapp/images/footer-stretch.png)bin2726 -> 2726 bytes
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/header-left.png (renamed from no-spring-web/src/main/webapp/images/header-left.png)bin2887 -> 2887 bytes
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/header-right.png (renamed from no-spring-web/src/main/webapp/images/header-right.png)bin2918 -> 2918 bytes
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/menu-curve-left.png (renamed from no-spring-web/src/main/webapp/images/menu-curve-left.png)bin1277 -> 1277 bytes
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/menu-curve-right.png (renamed from no-spring-web/src/main/webapp/images/menu-curve-right.png)bin1278 -> 1278 bytes
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/menu-stretch.png (renamed from no-spring-web/src/main/webapp/images/menu-stretch.png)bin2720 -> 2720 bytes
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/mini-header-left.png (renamed from no-spring-web/src/main/webapp/images/mini-header-left.png)bin236 -> 236 bytes
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/mini-header-right.png (renamed from no-spring-web/src/main/webapp/images/mini-header-right.png)bin955 -> 955 bytes
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/server-splash.png (renamed from no-spring-web/src/main/webapp/images/server-splash.png)bin50830 -> 50830 bytes
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/index.html (renamed from no-spring-web/src/main/webapp/index.html)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/styles/main.css (renamed from no-spring-web/src/main/webapp/styles/main.css)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/styles/print.css (renamed from no-spring-web/src/main/webapp/styles/print.css)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/test/java/.gitignore (renamed from no-spring-web/src/test/java/.gitignore)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/src/test/java/META-INF/TEST.MF (renamed from no-spring-web/src/test/java/META-INF/TEST.MF)0
-rw-r--r--no-spring-web/org.eclipse.virgo.samples.no.spring/template.mf (renamed from no-spring-web/template.mf)0
44 files changed, 90 insertions, 28 deletions
diff --git a/README b/README
deleted file mode 100644
index 9e34e1e..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-To build Greenpages run 'mvn clean install' in the greenpages dir. \ No newline at end of file
diff --git a/REST/org.eclipse.virgo.samples.rest/ivy.xml b/REST/org.eclipse.virgo.samples.rest/ivy.xml
index 86f3497..157fb75 100644
--- a/REST/org.eclipse.virgo.samples.rest/ivy.xml
+++ b/REST/org.eclipse.virgo.samples.rest/ivy.xml
@@ -34,7 +34,7 @@
<!-- === TEST ====================================================== -->
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.test" rev="${org.springframework}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.teststubs" name="org.eclipse.virgo.teststubs.osgi" rev="${org.eclipse.virgo.teststubs}" conf="test->runtime"/>
+ <dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.stubs" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
<override org="org.springframework" rev="${org.springframework}"/>
</dependencies>
diff --git a/build-samples/README b/build-samples/README
deleted file mode 100644
index 61adc47..0000000
--- a/build-samples/README
+++ /dev/null
@@ -1,3 +0,0 @@
-To build all the samples and produce a combined zip for distribution, run;
-
-ant clean test package \ No newline at end of file
diff --git a/build-samples/build.xml b/build-samples/build.xml
index 454d405..c51cd6a 100644
--- a/build-samples/build.xml
+++ b/build-samples/build.xml
@@ -13,7 +13,7 @@
<pathelement location="../formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.service"/>
<pathelement location="../formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war"/>
<pathelement location="../formtags/par/org.eclipse.virgo.samples.formtags"/>
- <pathelement location="../no-spring-web"/>
+ <pathelement location="../no-spring-web/org.eclipse.virgo.samples.no.spring"/>
<pathelement location="../REST/org.eclipse.virgo.samples.rest"/>
</path>
@@ -68,27 +68,33 @@
<copy todir="${package.output.dir}/configuration-properties">
<fileset dir="${basedir}/../configuration-properties">
- <include name="**/target/artifacts/*.jar"/>
- <include name="**/target/artifacts/*.properties"/>
+ <include name="org.eclipse.virgo.samples.configuration-properties.core/**"/>
+ <include name="org.eclipse.virgo.samples.configuration-properties.web/**"/>
+ <include name="org.eclipse.virgo.samples.configuration-properties.properties/**"/>
+ <exclude name="**/target/**"/>
</fileset>
- <flattenmapper/>
</copy>
<copy todir="${package.output.dir}/formtags">
<fileset dir="${basedir}/../formtags">
- <include name="**/target/artifacts/*.jar"/>
- <include name="**/target/artifacts/*.war"/>
+ <include name="README"/>
+ <include name="par/org.eclipse.virgo.samples.formtags/**"/>
+ <include name="par/org.eclipse.virgo.samples.formtags.domain/**"/>
+ <include name="par/org.eclipse.virgo.samples.formtags.service/**"/>
+ <include name="par/org.eclipse.virgo.samples.formtags.web/**"/>
+ <include name="shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/**"/>
+ <include name="shared-services/org.eclipse.virgo.samples.formtags.shared-services.service/**"/>
+ <include name="shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/**"/>
+ <include name="war/org.eclipse.virgo.samples.formtags.war/**"/>
+ <exclude name="**/target/**"/>
</fileset>
- <flattenmapper/>
</copy>
<copy todir="${package.output.dir}/no-spring-web">
<fileset dir="${basedir}/../no-spring-web">
- <include name="**"/>
+ <include name="org.eclipse.virgo.samples.no.spring/**"/>
<exclude name="**/target/**"/>
- <include name="**/target/artifacts/*.jar"/>
</fileset>
- <flattenmapper/>
</copy>
<copy todir="${package.output.dir}/REST">
@@ -96,8 +102,17 @@
<include name="README"/>
<include name="org.eclipse.virgo.samples.rest/**"/>
<exclude name="**/target/**"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${package.output.dir}/bin">
+ <fileset dir="${basedir}/..">
<include name="**/target/artifacts/*.jar"/>
+ <include name="**/target/artifacts/*.war"/>
+ <include name="**/target/artifacts/*.par"/>
+ <include name="**/target/artifacts/*.properties"/>
</fileset>
+ <flattenmapper/>
</copy>
<chmod perm="755">
diff --git a/build-samples/resources/README b/build-samples/resources/README
new file mode 100644
index 0000000..d76d9d5
--- /dev/null
+++ b/build-samples/resources/README
@@ -0,0 +1,50 @@
+
+Virgo Samples
+=============
+
+This is a collection of six sample projects that demonstrate different features of Virgo
+and different ways of setting up your project in Eclispe. Most samples contain more detailed
+READMEs in their respective directories. The 'bin' directory contains built Artifacts and
+source jars for all the samples.
+
+The six sample projects are:
+
+OSGi-examples
+=============
+
+This is a good starting place if you are new to OSGi, this sample dose not use Virgo and shows
+the basic concepts of OSGi modularity.
+
+No Spring
+=========
+
+This is a simple web application that isn't powered by Spring but still uses the traditional
+Servlet container, another approach would be to use the OSGi HTTPService.
+
+Formtags
+========
+
+This is a Spring powered web app that is shown in four different states as it is transformed
+from a legacy 'WAR' file to an OSGi application.
+
+ 1. Legacy 'WAR' based web application.
+ 2. Shared Libs application, a single bundle with its dependancies removed.
+ 3. Shared Services application now consisting of several OSGi bundles.
+ 4. PAR file packaging the bundles of the application together.
+
+REST
+====
+
+This is an example of using the Spring REST features to publish a restFull API from an OSGi
+application. It contains it's own detailed README.
+
+Configuration Properties
+========================
+
+This simple sample shows how to configure your OSGi application using configuration artifacts.
+
+GreenPages
+==========
+
+This is a much more complex and realistic application. The 'docs' directory contains very
+detailed information on this project. \ No newline at end of file
diff --git a/build-samples/resources/epl-v10.html b/build-samples/resources/about_files/epl-v10.html
index 2b5cf73..2b5cf73 100644
--- a/build-samples/resources/epl-v10.html
+++ b/build-samples/resources/about_files/epl-v10.html
diff --git a/build.versions b/build.versions
index 65a3c16..201446c 100644
--- a/build.versions
+++ b/build.versions
@@ -14,6 +14,7 @@ org.aspectj=1.6.12.RELEASE
org.eclipse.osgi=3.8.1.v20120830-144521
org.eclipse.osgi.services=3.3.0.v20120307-2102
org.eclipse.equinox.cm=1.0.400.v20120319-2029
+org.slf4j.nop=1.7.2.v201212060727
org.slf4j.api=1.7.2.v20121108-1250
org.springframework=3.1.0.RELEASE
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/ivy.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/ivy.xml
index 26cf705..c236f44 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/ivy.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/ivy.xml
@@ -29,7 +29,7 @@
<dependency org="org.springframework" name="org.springframework.beans" rev="${org.springframework}" conf="provided->runtime"/>
<!-- === TEST ====================================================== -->
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.stubs.osgi" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
+ <dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.stubs" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
</dependencies>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/ivy.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/ivy.xml
index f232d5d..656f0ad 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/ivy.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/ivy.xml
@@ -35,7 +35,7 @@
<!-- === TEST ====================================================== -->
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.test" rev="${org.springframework}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.teststubs" name="org.eclipse.virgo.teststubs.osgi" rev="${org.eclipse.virgo.teststubs}" conf="test->runtime"/>
+ <dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.stubs" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
<override org="org.springframework" rev="${org.springframework}"/>
</dependencies>
diff --git a/formtags/README.TXT b/formtags/README.TXT
index ce5475a..d81e7f9 100644
--- a/formtags/README.TXT
+++ b/formtags/README.TXT
@@ -64,25 +64,25 @@ Alternatively, you can deploy the applications via the web-based admin console
(e.g., http://localhost:8080/admin).
Standard WAR
- - Copy dist/formtags-war-2.0.1.RELEASE.war to the SERVER_HOME/pickup
+ - Copy dist/formtags-war-3.0.0.RELEASE.war to the SERVER_HOME/pickup
directory.
- Open http://localhost:8080/formtags-war-1.0.0.RELEASE
Shared Libraries WAR
- - Copy dist/formtags-shared-libs-2.0.1.RELEASE.war to the SERVER_HOME/pickup
+ - Copy dist/formtags-shared-libs-3.0.0.RELEASE.war to the SERVER_HOME/pickup
directory.
- - Open http://localhost:8080/formtags-shared-libs-2.0.1.RELEASE
+ - Open http://localhost:8080/formtags-shared-libs-3.0.0.RELEASE
Shared Services WAR
- Note that the 'service' bundle must be deployed prior to the WAR.
- - Copy dist/formtags-shared-services-service-2.0.1.RELEASE.jar to the
+ - Copy dist/formtags-shared-services-service-3.0.0.RELEASE.jar to the
SERVER_HOME/pickup directory.
- - Copy dist/formtags-shared-services-war-2.0.1.RELEASE.war to the
+ - Copy dist/formtags-shared-services-war-3.0.0.RELEASE.war to the
SERVER_HOME/pickup directory.
- - Open http://localhost:8080/formtags-shared-services-war-2.0.1.RELEASE
+ - Open http://localhost:8080/formtags-shared-services-war-3.0.0.RELEASE
PAR with a Web Bundle
- - Copy dist/formtags-par-2.0.1.RELEASE.par to the SERVER_HOME/pickup
+ - Copy dist/formtags-par-3.0.0.RELEASE.par to the SERVER_HOME/pickup
directory.
- Open http://localhost:8080/formtags-par
diff --git a/no-spring-web/.classpath b/no-spring-web/org.eclipse.virgo.samples.no.spring/.classpath
index fe60a5e..fe60a5e 100644
--- a/no-spring-web/.classpath
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/.classpath
diff --git a/no-spring-web/.project b/no-spring-web/org.eclipse.virgo.samples.no.spring/.project
index aa0b90e..aa0b90e 100644
--- a/no-spring-web/.project
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/.project
diff --git a/no-spring-web/.settings/org.eclipse.jdt.core.prefs b/no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.jdt.core.prefs
index 8000cd6..8000cd6 100644
--- a/no-spring-web/.settings/org.eclipse.jdt.core.prefs
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.jdt.core.prefs
diff --git a/no-spring-web/.settings/org.eclipse.virgo.ide.bundlor.core.prefs b/no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
index 2d8b2dc..2d8b2dc 100644
--- a/no-spring-web/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
diff --git a/no-spring-web/.settings/org.eclipse.wst.common.component b/no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.wst.common.component
index 4f3ad83..4f3ad83 100644
--- a/no-spring-web/.settings/org.eclipse.wst.common.component
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.wst.common.component
diff --git a/no-spring-web/.settings/org.eclipse.wst.common.project.facet.core.xml b/no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.wst.common.project.facet.core.xml
index 88ab4ac..88ab4ac 100644
--- a/no-spring-web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/no-spring-web/.settings/org.eclipse.wst.jsdt.ui.superType.container b/no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.wst.jsdt.ui.superType.container
index 3bd5d0a..3bd5d0a 100644
--- a/no-spring-web/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/no-spring-web/.settings/org.eclipse.wst.jsdt.ui.superType.name b/no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.wst.jsdt.ui.superType.name
index 05bd71b..05bd71b 100644
--- a/no-spring-web/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/no-spring-web/build.xml b/no-spring-web/org.eclipse.virgo.samples.no.spring/build.xml
index a99f3b7..c1a7535 100644
--- a/no-spring-web/build.xml
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.eclipse.virgo.samples.no.spring">
- <property file="${basedir}/../build.properties"/>
- <property file="${basedir}/../build.versions"/>
- <import file="${basedir}/../virgo-build/wab/default.xml"/>
+ <property file="${basedir}/../../build.properties"/>
+ <property file="${basedir}/../../build.versions"/>
+ <import file="${basedir}/../../virgo-build/wab/default.xml"/>
<target name="deploy">
diff --git a/no-spring-web/ivy.xml b/no-spring-web/org.eclipse.virgo.samples.no.spring/ivy.xml
index 29ec7fd..44ecf8e 100644
--- a/no-spring-web/ivy.xml
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/ivy.xml
@@ -22,7 +22,7 @@
<dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="provided->runtime"/>
<!-- === TEST ====================================================== -->
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
- <dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="test->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.nop" rev="${org.slf4j.nop}" conf="test->runtime"/>
</dependencies>
</ivy-module>
diff --git a/no-spring-web/src/main/java/org/eclipse/virgo/samples/no/spring/ContentServlet.java b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/java/org/eclipse/virgo/samples/no/spring/ContentServlet.java
index 1ec43df..1ec43df 100644
--- a/no-spring-web/src/main/java/org/eclipse/virgo/samples/no/spring/ContentServlet.java
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/java/org/eclipse/virgo/samples/no/spring/ContentServlet.java
diff --git a/no-spring-web/src/main/java/org/eclipse/virgo/samples/no/spring/GZIPResponseStream.java b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/java/org/eclipse/virgo/samples/no/spring/GZIPResponseStream.java
index fcb617c..fcb617c 100644
--- a/no-spring-web/src/main/java/org/eclipse/virgo/samples/no/spring/GZIPResponseStream.java
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/java/org/eclipse/virgo/samples/no/spring/GZIPResponseStream.java
diff --git a/no-spring-web/src/main/resources/.gitignore b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/resources/.gitignore
index e69de29..e69de29 100644
--- a/no-spring-web/src/main/resources/.gitignore
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/resources/.gitignore
diff --git a/no-spring-web/src/main/webapp/META-INF/MANIFEST.MF b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/META-INF/MANIFEST.MF
index 666bcc1..666bcc1 100644
--- a/no-spring-web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/no-spring-web/src/main/webapp/WEB-INF/sample.html b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/WEB-INF/sample.html
index 585e0d2..585e0d2 100644
--- a/no-spring-web/src/main/webapp/WEB-INF/sample.html
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/WEB-INF/sample.html
diff --git a/no-spring-web/src/main/webapp/WEB-INF/web.xml b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/WEB-INF/web.xml
index 72b9a55..72b9a55 100644
--- a/no-spring-web/src/main/webapp/WEB-INF/web.xml
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/WEB-INF/web.xml
diff --git a/no-spring-web/src/main/webapp/images/favicon.ico b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/favicon.ico
index e963685..e963685 100755
--- a/no-spring-web/src/main/webapp/images/favicon.ico
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/favicon.ico
Binary files differ
diff --git a/no-spring-web/src/main/webapp/images/footer-left.png b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/footer-left.png
index 8bfe3b1..8bfe3b1 100644
--- a/no-spring-web/src/main/webapp/images/footer-left.png
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/footer-left.png
Binary files differ
diff --git a/no-spring-web/src/main/webapp/images/footer-right.png b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/footer-right.png
index 51527ad..51527ad 100644
--- a/no-spring-web/src/main/webapp/images/footer-right.png
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/footer-right.png
Binary files differ
diff --git a/no-spring-web/src/main/webapp/images/footer-stretch.png b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/footer-stretch.png
index c58f721..c58f721 100644
--- a/no-spring-web/src/main/webapp/images/footer-stretch.png
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/footer-stretch.png
Binary files differ
diff --git a/no-spring-web/src/main/webapp/images/header-left.png b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/header-left.png
index 4920a0a..4920a0a 100644
--- a/no-spring-web/src/main/webapp/images/header-left.png
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/header-left.png
Binary files differ
diff --git a/no-spring-web/src/main/webapp/images/header-right.png b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/header-right.png
index 09b0a59..09b0a59 100644
--- a/no-spring-web/src/main/webapp/images/header-right.png
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/header-right.png
Binary files differ
diff --git a/no-spring-web/src/main/webapp/images/menu-curve-left.png b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/menu-curve-left.png
index c48a2e0..c48a2e0 100644
--- a/no-spring-web/src/main/webapp/images/menu-curve-left.png
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/menu-curve-left.png
Binary files differ
diff --git a/no-spring-web/src/main/webapp/images/menu-curve-right.png b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/menu-curve-right.png
index 1f3b100..1f3b100 100644
--- a/no-spring-web/src/main/webapp/images/menu-curve-right.png
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/menu-curve-right.png
Binary files differ
diff --git a/no-spring-web/src/main/webapp/images/menu-stretch.png b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/menu-stretch.png
index 0ca66f7..0ca66f7 100644
--- a/no-spring-web/src/main/webapp/images/menu-stretch.png
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/menu-stretch.png
Binary files differ
diff --git a/no-spring-web/src/main/webapp/images/mini-header-left.png b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/mini-header-left.png
index 72551e7..72551e7 100644
--- a/no-spring-web/src/main/webapp/images/mini-header-left.png
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/mini-header-left.png
Binary files differ
diff --git a/no-spring-web/src/main/webapp/images/mini-header-right.png b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/mini-header-right.png
index 8aaf50c..8aaf50c 100644
--- a/no-spring-web/src/main/webapp/images/mini-header-right.png
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/mini-header-right.png
Binary files differ
diff --git a/no-spring-web/src/main/webapp/images/server-splash.png b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/server-splash.png
index f8fe1f9..f8fe1f9 100644
--- a/no-spring-web/src/main/webapp/images/server-splash.png
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/images/server-splash.png
Binary files differ
diff --git a/no-spring-web/src/main/webapp/index.html b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/index.html
index df27e3b..df27e3b 100644
--- a/no-spring-web/src/main/webapp/index.html
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/index.html
diff --git a/no-spring-web/src/main/webapp/styles/main.css b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/styles/main.css
index 78e2927..78e2927 100644
--- a/no-spring-web/src/main/webapp/styles/main.css
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/styles/main.css
diff --git a/no-spring-web/src/main/webapp/styles/print.css b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/styles/print.css
index 3abe1c0..3abe1c0 100644
--- a/no-spring-web/src/main/webapp/styles/print.css
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/main/webapp/styles/print.css
diff --git a/no-spring-web/src/test/java/.gitignore b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/test/java/.gitignore
index e69de29..e69de29 100644
--- a/no-spring-web/src/test/java/.gitignore
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/test/java/.gitignore
diff --git a/no-spring-web/src/test/java/META-INF/TEST.MF b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/test/java/META-INF/TEST.MF
index 3ec0672..3ec0672 100644
--- a/no-spring-web/src/test/java/META-INF/TEST.MF
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/src/test/java/META-INF/TEST.MF
diff --git a/no-spring-web/template.mf b/no-spring-web/org.eclipse.virgo.samples.no.spring/template.mf
index 853a85a..853a85a 100644
--- a/no-spring-web/template.mf
+++ b/no-spring-web/org.eclipse.virgo.samples.no.spring/template.mf

Back to the top