Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2013-02-14 16:31:30 -0500
committerChristopher Frost2013-02-14 16:31:30 -0500
commit3137740692844ec0329d8b70224f7cc42940db6e (patch)
treed9faf9940ce6c2f170c859649f4fd1a72759f9bf
parent893f0d7a57927f247c69b76cfddb02b942f5f890 (diff)
downloadorg.eclipse.virgo.samples-3137740692844ec0329d8b70224f7cc42940db6e.tar.gz
org.eclipse.virgo.samples-3137740692844ec0329d8b70224f7cc42940db6e.tar.xz
org.eclipse.virgo.samples-3137740692844ec0329d8b70224f7cc42940db6e.zip
329368 - Minor changes to the no spring sample
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/META-INF/MANIFEST.MF19
-rw-r--r--build-samples/build.xml13
-rw-r--r--greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF4
-rw-r--r--greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF4
-rw-r--r--greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF4
-rw-r--r--greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF13
-rw-r--r--no-spring-web/.classpath8
-rw-r--r--no-spring-web/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--no-spring-web/.settings/org.eclipse.virgo.ide.bundlor.core.prefs2
-rw-r--r--no-spring-web/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--no-spring-web/src/main/webapp/META-INF/MANIFEST.MF6
-rw-r--r--no-spring-web/src/main/webapp/WEB-INF/sample.html18
-rw-r--r--no-spring-web/template.mf4
13 files changed, 50 insertions, 54 deletions
diff --git a/REST/org.eclipse.virgo.samples.rest/src/main/webapp/META-INF/MANIFEST.MF b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/META-INF/MANIFEST.MF
index f93b0af..5b64910 100644
--- a/REST/org.eclipse.virgo.samples.rest/src/main/webapp/META-INF/MANIFEST.MF
+++ b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/META-INF/MANIFEST.MF
@@ -11,16 +11,15 @@ Import-Package: javax.servlet.http;version="[2.1.0, 3.0.0)",org.eclips
ory.xml;version="[3.0,4.0)",org.springframework.context.config;versio
n="[3.0,4.0)",org.springframework.context.support;version="[3.0,4.0)"
,org.springframework.http;version="[3.0,4.0)",org.springframework.ste
- reotype;version="[3.0,4.0)",org.springframework.util;version="[3.0,4.
- 0)",org.springframework.web.bind.annotation;version="[3.0,4.0)",org.s
- pringframework.web.context;version="[3.0,4.0)",org.springframework.we
- b.context.support;version="[3.0,4.0)",org.springframework.web.servlet
- ;version="[3.0,4.0)",org.springframework.web.servlet.config;version="
- [3.0,4.0)",org.springframework.web.servlet.handler;version="[3.0,4.0)
- ",org.springframework.web.servlet.mvc;version="[3.0,4.0)",org.springf
- ramework.web.servlet.mvc.annotation;version="[3.0,4.0)",org.springfra
- mework.web.servlet.support;version="[3.0,4.0)",org.springframework.we
- b.servlet.view;version="[3.0,4.0)"
+ reotype;version="[3.0,4.0)",org.springframework.web.bind.annotation;v
+ ersion="[3.0,4.0)",org.springframework.web.context;version="[3.0,4.0)
+ ",org.springframework.web.context.support;version="[3.0,4.0)",org.spr
+ ingframework.web.servlet;version="[3.0,4.0)",org.springframework.web.
+ servlet.config;version="[3.0,4.0)",org.springframework.web.servlet.ha
+ ndler;version="[3.0,4.0)",org.springframework.web.servlet.mvc;version
+ ="[3.0,4.0)",org.springframework.web.servlet.mvc.annotation;version="
+ [3.0,4.0)",org.springframework.web.servlet.support;version="[3.0,4.0)
+ ",org.springframework.web.servlet.view;version="[3.0,4.0)"
Bundle-SymbolicName: org.eclipse.virgo.samples.rest
Web-ContextPath: rest
diff --git a/build-samples/build.xml b/build-samples/build.xml
index 59fd697..454d405 100644
--- a/build-samples/build.xml
+++ b/build-samples/build.xml
@@ -74,17 +74,19 @@
<flattenmapper/>
</copy>
- <copy todir="${package.output.dir}/no-spring-web">
- <fileset dir="${basedir}/../no-spring-web">
+ <copy todir="${package.output.dir}/formtags">
+ <fileset dir="${basedir}/../formtags">
<include name="**/target/artifacts/*.jar"/>
+ <include name="**/target/artifacts/*.war"/>
</fileset>
<flattenmapper/>
</copy>
- <copy todir="${package.output.dir}/formtags">
- <fileset dir="${basedir}/../formtags">
+ <copy todir="${package.output.dir}/no-spring-web">
+ <fileset dir="${basedir}/../no-spring-web">
+ <include name="**"/>
+ <exclude name="**/target/**"/>
<include name="**/target/artifacts/*.jar"/>
- <include name="**/target/artifacts/*.war"/>
</fileset>
<flattenmapper/>
</copy>
@@ -93,6 +95,7 @@
<fileset dir="${basedir}/../REST">
<include name="README"/>
<include name="org.eclipse.virgo.samples.rest/**"/>
+ <exclude name="**/target/**"/>
<include name="**/target/artifacts/*.jar"/>
</fileset>
</copy>
diff --git a/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
index a54d066..9bc5078 100644
--- a/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.core/src/main/resources/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
Export-Package: greenpages;version="3.0.0"
Bundle-Vendor: SpringSource Inc.
Bundle-Version: 3.0.0
-Tool: Bundlor 1.1.0.RELEASE
+Tool: Bundlor 1.1.2.RELEASE
Bundle-Name: GreenPages Service
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: greenpages.core
Import-Package: org.springframework.stereotype;version="[3.0, 3.5)"
+Bundle-SymbolicName: greenpages.core
diff --git a/greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
index 0daa073..698edc1 100644
--- a/greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
Bundle-Vendor: SpringSource
Bundle-Classpath: .
Bundle-Version: 3.0.0
-Tool: Bundlor 1.1.0.RELEASE
+Tool: Bundlor 1.1.2.RELEASE
Bundle-Name: GreenPages DataSource
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: greenpages.db
Import-Package: javax.sql;version="0",org.apache.commons.dbcp;version=
"[1.2.2.osgi, 1.2.2.osgi]",org.h2;version="[1.0.71, 1.0.71]"
+Bundle-SymbolicName: greenpages.db
diff --git a/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
index 7471562..0f28e56 100644
--- a/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
@@ -4,10 +4,9 @@ Import-Bundle: com.springsource.org.eclipse.persistence;version="[2.0.
.0, 2.1.0)"
Bundle-Vendor: SpringSource
Bundle-Version: 3.0.0
-Tool: Bundlor 1.1.0.RELEASE
+Tool: Bundlor 1.1.2.RELEASE
Bundle-Name: GreenPages JPA
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: greenpages.jpa
Import-Package: greenpages;version="[3.0, 4.0)",javax.persistence;vers
ion="[2, 2.1)",javax.persistence.criteria;version="[2, 2.1)",javax.sq
l;version="0",org.apache.commons.dbcp;version="[1.2.2.osgi, 1.2.2.osg
@@ -19,4 +18,5 @@ Import-Package: greenpages;version="[3.0, 4.0)",javax.persistence;vers
ngframework.stereotype;version="[3.0, 3.5)",org.springframework.trans
action.annotation;version="[3.0, 3.5)",org.springframework.transactio
n.aspectj;version="[3.0, 3.5)"
+Bundle-SymbolicName: greenpages.jpa
diff --git a/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF b/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF
index f853672..fefa2cf 100644
--- a/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF
+++ b/greenpages/greenpages.web/src/test/resources/META-INF/MANIFEST.MF
@@ -3,12 +3,10 @@ Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
1.1.2,2.0)"
Bundle-ClassPath: .,WEB-INF/classes
Bundle-Version: 3.0.0
-Tool: Bundlor 1.1.0.RELEASE
-Bundle-Name: GreenPages Web
+Tool: Bundlor 1.1.2.RELEASE
Import-Library: org.springframework.spring;version="[3.0, 3.5)"
+Bundle-Name: GreenPages Web
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: greenpages.web
-Web-ContextPath: greenpages
Import-Package: freemarker.cache;version="[2.3.18,2.3.18]",greenpages;
version="[3.0, 4.0)",javax.servlet;version="[3.0.0, 3.1.0)",javax.ser
vlet.jsp.jstl.core;version="[1.2.0, 2.0.0)",javax.sql,org.apache.comm
@@ -16,8 +14,7 @@ Import-Package: freemarker.cache;version="[2.3.18,2.3.18]",greenpages;
framework.beans.factory.annotation;version="[3.0, 3.5)",org.springfra
mework.core.io;version="[3.0, 3.5)",org.springframework.stereotype;ve
rsion="[3.0, 3.5)",org.springframework.web.bind.annotation;version="[
- 3.0, 3.5)",org.springframework.web.context;version="[3.0, 3.5)",org.s
- pringframework.web.servlet;version="[3.0, 3.5)",org.springframework.w
- eb.servlet.mvc.annotation;version="[3.0, 3.5)",org.springframework.we
- b.servlet.view.freemarker;version="[3.0, 3.5)"
+ 3.0, 3.5)"
+Bundle-SymbolicName: greenpages.web
+Web-ContextPath: greenpages
diff --git a/no-spring-web/.classpath b/no-spring-web/.classpath
index 35a0df3..fe60a5e 100644
--- a/no-spring-web/.classpath
+++ b/no-spring-web/.classpath
@@ -15,14 +15,14 @@
<attribute name="org.eclipse.virgo.ide.jdt.core.test.classpathentry" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
+ <classpathentry kind="con" path="org.eclipse.virgo.ide.jdt.core.MANIFEST_CLASSPATH_CONTAINER">
<attributes>
- <attribute name="owner.project.facets" value="java"/>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.virgo.ide.jdt.core.MANIFEST_CLASSPATH_CONTAINER">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
<attributes>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
+ <attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
diff --git a/no-spring-web/.settings/org.eclipse.jdt.core.prefs b/no-spring-web/.settings/org.eclipse.jdt.core.prefs
index f26c14e..8000cd6 100644
--- a/no-spring-web/.settings/org.eclipse.jdt.core.prefs
+++ b/no-spring-web/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,11 @@
-#Mon Aug 24 17:26:00 BST 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/no-spring-web/.settings/org.eclipse.virgo.ide.bundlor.core.prefs b/no-spring-web/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
index 9b5f917..2d8b2dc 100644
--- a/no-spring-web/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
+++ b/no-spring-web/.settings/org.eclipse.virgo.ide.bundlor.core.prefs
@@ -1,4 +1,4 @@
bundlor.generated.manifest.autoformatting=false
byte.code.scanning=true
eclipse.preferences.version=1
-template.properties.files=../build.versions
+template.properties.files=../build.versions;../build.properties
diff --git a/no-spring-web/.settings/org.eclipse.wst.common.project.facet.core.xml b/no-spring-web/.settings/org.eclipse.wst.common.project.facet.core.xml
index ea69099..88ab4ac 100644
--- a/no-spring-web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/no-spring-web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -4,6 +4,6 @@
<fixed facet="jst.web"/>
<fixed facet="jst.java"/>
<installed facet="jst.web" version="2.5"/>
- <installed facet="jst.java" version="5.0"/>
<installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
+ <installed facet="jst.java" version="1.6"/>
</faceted-project>
diff --git a/no-spring-web/src/main/webapp/META-INF/MANIFEST.MF b/no-spring-web/src/main/webapp/META-INF/MANIFEST.MF
index 24c7448..4c43d06 100644
--- a/no-spring-web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/no-spring-web/src/main/webapp/META-INF/MANIFEST.MF
@@ -1,9 +1,11 @@
Manifest-Version: 1.0
Bundle-ClassPath: .,WEB-INF/classes
Bundle-Version: 3.0.0
-Tool: Bundlor 1.1.1.RELEASE
+Tool: Bundlor 1.1.2.RELEASE
Bundle-Name: Sample No Spring
Bundle-ManifestVersion: 2
-Web-ContextPath: /nospring
+Import-Package: javax.servlet;version="[2.6,4)",javax.servlet.http;ver
+ sion="[2.6,4)"
Bundle-SymbolicName: org.eclipse.virgo.samples.no.spring
+Web-ContextPath: /nospring
diff --git a/no-spring-web/src/main/webapp/WEB-INF/sample.html b/no-spring-web/src/main/webapp/WEB-INF/sample.html
index 2c87575..585e0d2 100644
--- a/no-spring-web/src/main/webapp/WEB-INF/sample.html
+++ b/no-spring-web/src/main/webapp/WEB-INF/sample.html
@@ -36,21 +36,15 @@
<div id="version-text"><!--@<sample-string@--></div>
</div>
- <h1>Welcome</h1>
+ <h1>Spring Free Sample Web App</h1>
<p>
- Congratulations on installing the Virgo Server.
- From this splash page you can access the web-based <a href="/admin" title="Admin Console">admin console</a>.
+ This is a very simple web app that can serve as a starting place for developing a OSGi based web application
+ without any Spring Framework usage. This sample uses a regular servlet container and is deployed as a 'Web
+ Application Bundle', an alternative would be to use the OSGi HTTPService. This can run on any Virgo distribution
+ and may be more suitable especially for more lightweight applications. From this sample page you can access the
+ web-based <a href="/admin" title="Admin Console">admin console</a>.
</p>
- <h1>Documentation</h1>
- <p>
- Documentation is available on-line for the server and related products.
- </p>
- <ul>
- <li><a href="http://www.eclipse.org/virgo/documentation" target="_blank" title="Virgo Server - Documentation">Virgo Server - Documentation</a>.</li>
- <li><a href="http://www.springsource.org/documentation" target="_blank" title="Spring Framework">Spring Framework Documentation</a></li>
- <li><a href="http://static.springframework.org/osgi/docs/current/reference/html/" target="_blank" title="Spring Dynamic Modules">Spring Dynamic Modules Documentation</a></li>
- </ul>
</div><!-- /content -->
</div><!-- /container -->
diff --git a/no-spring-web/template.mf b/no-spring-web/template.mf
index b95b460..10b777d 100644
--- a/no-spring-web/template.mf
+++ b/no-spring-web/template.mf
@@ -6,7 +6,9 @@ Bundle-SymbolicName: org.eclipse.virgo.samples.no.spring
Bundle-ClassPath: .,WEB-INF/classes
Web-ContextPath: /nospring
Import-Template:
- javax.servlet.*;version="${javax.servlet:[=.=.=,+1)}",
org.slf4j;version="${org.slf4j.api:[=.=.=,+1)}"
+Import-Package:
+ javax.servlet;version="${javax.servlet:[2.6,+1)}",
+ javax.servlet.http;version="${javax.servlet:[2.6,+1)}"
Excluded-Exports: *

Back to the top