Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--REST/org.eclipse.virgo.samples.rest/.classpath6
-rw-r--r--REST/org.eclipse.virgo.samples.rest/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/META-INF/MANIFEST.MF6
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml1
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/MANIFEST.MF2
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath6
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.common.project.facet.core.xml1
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/META-INF/MANIFEST.MF8
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/jsp/properties.jsp12
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/sample-servlet.xml4
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/web.xml10
-rwxr-xr-xconfiguration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/favicon.ico (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/favicon.ico)bin1150 -> 1150 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/footer-left.png (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-left.png)bin2792 -> 2792 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/footer-right.png (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-right.png)bin2792 -> 2792 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/footer-stretch.png (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-stretch.png)bin2726 -> 2726 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/header-left.png (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/header-left.png)bin2887 -> 2887 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/header-right.png (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/header-right.png)bin2918 -> 2918 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/loader-white-large.gif (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/loader-white-large.gif)bin7399 -> 7399 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/loader-white-small.gif (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/loader-white-small.gif)bin2228 -> 2228 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/menu-curve-left.png (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-curve-left.png)bin1277 -> 1277 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/menu-curve-right.png (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-curve-right.png)bin1278 -> 1278 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/menu-stretch.png (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-stretch.png)bin2720 -> 2720 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/mini-header-left.png (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/mini-header-left.png)bin236 -> 236 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/mini-header-right.png (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/mini-header-right.png)bin955 -> 955 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/server-splash.png (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/server-splash.png)bin50830 -> 50830 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/spring.png (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/spring.png)bin3139 -> 3139 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/table-header-background.png (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/table-header-background.png)bin2765 -> 2765 bytes
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/styles/local.css (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/local.css)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/styles/main.css (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/main.css)0
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/styles/print.css (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/print.css)0
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/META-INF/MANIFEST.MF1
-rw-r--r--no-spring-web/.classpath5
-rw-r--r--no-spring-web/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--no-spring-web/.settings/org.eclipse.virgo.ide.bundlor.core.prefs4
-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.MF15
-rw-r--r--no-spring-web/template.mf6
38 files changed, 57 insertions, 48 deletions
diff --git a/REST/org.eclipse.virgo.samples.rest/.classpath b/REST/org.eclipse.virgo.samples.rest/.classpath
index 9ef238e..f3341b1 100644
--- a/REST/org.eclipse.virgo.samples.rest/.classpath
+++ b/REST/org.eclipse.virgo.samples.rest/.classpath
@@ -18,6 +18,10 @@
<classpathentry kind="var" path="IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar" sourcepath="/IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_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="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/REST/org.eclipse.virgo.samples.rest/.settings/org.eclipse.wst.common.project.facet.core.xml b/REST/org.eclipse.virgo.samples.rest/.settings/org.eclipse.wst.common.project.facet.core.xml
index 1ccb66e..ea69099 100644
--- a/REST/org.eclipse.virgo.samples.rest/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/REST/org.eclipse.virgo.samples.rest/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="VTS 3.6.0"/>
+ <runtime name="Virgo Runtime"/>
<fixed facet="jst.web"/>
<fixed facet="jst.java"/>
<installed facet="jst.web" version="2.5"/>
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 07b865e..f93b0af 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
@@ -3,11 +3,9 @@ Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
1.1.2,1.3)"
Bundle-Classpath: .,WEB-INF/classes
Bundle-Version: 1
-Tool: Bundlor 1.1.1.RELEASE
+Tool: Bundlor 1.1.2.RELEASE
Bundle-Name: REST Sample Web Bundle
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.virgo.samples.rest
-Web-ContextPath: rest
Import-Package: javax.servlet.http;version="[2.1.0, 3.0.0)",org.eclips
e.virgo.web.dm;version="[3.0.0,4.0.0)",org.springframework.beans.fact
ory.xml;version="[3.0,4.0)",org.springframework.context.config;versio
@@ -23,4 +21,6 @@ Import-Package: javax.servlet.http;version="[2.1.0, 3.0.0)",org.eclips
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)"
+Bundle-SymbolicName: org.eclipse.virgo.samples.rest
+Web-ContextPath: rest
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml
index 92aa290..3a7a03c 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
+ <runtime name="Virgo Runtime"/>
<installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/MANIFEST.MF b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/MANIFEST.MF
index 19518cb..25d0031 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/MANIFEST.MF
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Export-Package: org.eclipse.virgo.samples.configuration.properties.cor
e;version="3.0.0"
Bundle-Version: 3.0.0
-Tool: Bundlor 1.1.1.RELEASE
+Tool: Bundlor 1.1.2.RELEASE
Bundle-Name: Configuration Sample Content Bundle
Bundle-ManifestVersion: 2
Bundle-Description: Configuration Sample Content Provider
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
index fa256ed..3accae7 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
@@ -18,7 +18,11 @@
<classpathentry kind="var" path="IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar" sourcepath="/IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.samples.configuration-properties.core"/>
+ <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="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.common.project.facet.core.xml
index 31e1d4d..ea69099 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
+ <runtime name="Virgo Runtime"/>
<fixed facet="jst.web"/>
<fixed facet="jst.java"/>
<installed facet="jst.web" version="2.5"/>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/META-INF/MANIFEST.MF b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/META-INF/MANIFEST.MF
index 5cc8697..347911e 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/META-INF/MANIFEST.MF
@@ -3,12 +3,9 @@ Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
1.1.2,1.3)"
Bundle-ClassPath: .,WEB-INF/classes,images,styles
Bundle-Version: 3.0.0
-Tool: Bundlor 1.1.1.RELEASE
+Tool: Bundlor 1.1.2.RELEASE
Bundle-Name: Configuration Sample Web Bundle
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.virgo.samples.configuration.propertie
- s.web
-Web-ContextPath: config-properties
Import-Package: org.eclipse.virgo.samples.configuration.properties.cor
e;version="[3.0.0,4.0.0)",org.eclipse.virgo.web.dm;version="[3.0.0,4.
0.0)",org.springframework.beans.factory.annotation;version="[3.0,4.0)
@@ -24,4 +21,7 @@ Import-Package: org.eclipse.virgo.samples.configuration.properties.cor
org.springframework.web.servlet.mvc.annotation;version="[3.0,4.0)",or
g.springframework.web.servlet.support;version="[3.0,4.0)",org.springf
ramework.web.servlet.view;version="[3.0,4.0)"
+Bundle-SymbolicName: org.eclipse.virgo.samples.configuration.propertie
+ s.web
+Web-ContextPath: config-properties
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/jsp/properties.jsp b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/jsp/properties.jsp
index 899c9ce..2a18fe4 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/jsp/properties.jsp
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/jsp/properties.jsp
@@ -5,10 +5,10 @@
<head>
<title>Configuration properties sample</title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <link rel="shortcut icon" href="/resources/images/favicon.ico" />
- <link rel="stylesheet" href="/resources/styles/main.css" type="text/css" />
- <link rel="stylesheet" href="/resources/styles/local.css" type="text/css" />
- <link rel="stylesheet" href="/resources/styles/print.css" type="text/css" media="print" />
+ <link rel="shortcut icon" href="<c:url value="/resources/images/favicon.ico"/>" />
+ <link rel="stylesheet" href=" <c:url value="/resources/styles/main.css" />" type="text/css" />
+ <link rel="stylesheet" href=" <c:url value="/resources/styles/local.css" />" type="text/css" />
+ <link rel="stylesheet" href=" <c:url value="/resources/styles/print.css" />" type="text/css" media="print" />
</head>
<body class="main tundra">
<div id="page">
@@ -20,14 +20,14 @@
<div id="primary-navigation">
<div id="primary-left">
</div>
- <img id="left-curve" src="/config-properties/images/menu-curve-left.png"/>
+ <img id="left-curve" src="<c:url value="/resources/images/menu-curve-left.png" />"/>
<div id="primary-right">
<ul>
<li><a href="/admin" title="Admin Console">Admin Console</a></li>
<li><a href="http://www.eclipse.org/virgo" title="Virgo">Virgo</a></li>
</ul>
</div>
- <img id="right-curve" src="/config-properties/images/menu-curve-right.png"/>
+ <img id="right-curve" src="<c:url value="/resources/images/menu-curve-right.png" />" />
</div><!-- /primary-navigation -->
<div id="container">
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/sample-servlet.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/sample-servlet.xml
index 005fc51..63133f2 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/sample-servlet.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/sample-servlet.xml
@@ -8,12 +8,12 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
-
<mvc:annotation-driven />
+ <mvc:resources mapping="/resources/**" location="/resources/" />
+
<context:component-scan base-package="org.eclipse.virgo.samples.configuration.properties.web" />
-
<!-- VIEW CONFIG -->
<bean id="topViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/web.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/web.xml
index b614cd2..a650e6b 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/web.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/web.xml
@@ -33,15 +33,5 @@
<servlet-name>sample</servlet-name>
<url-pattern>/properties/*</url-pattern>
</servlet-mapping>
-
- <servlet>
- <servlet-name>ResourceServlet</servlet-name>
- <servlet-class>org.springframework.web.servlet.ResourceServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ResourceServlet</servlet-name>
- <url-pattern>/resources/*</url-pattern>
- </servlet-mapping>
</web-app> \ No newline at end of file
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/favicon.ico b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/favicon.ico
index 9244a9c..9244a9c 100755
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/favicon.ico
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/favicon.ico
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-left.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/footer-left.png
index 8bfe3b1..8bfe3b1 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-left.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/footer-left.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-right.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/footer-right.png
index 51527ad..51527ad 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-right.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/footer-right.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-stretch.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/footer-stretch.png
index c58f721..c58f721 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/footer-stretch.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/footer-stretch.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/header-left.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/header-left.png
index 4920a0a..4920a0a 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/header-left.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/header-left.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/header-right.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/header-right.png
index 09b0a59..09b0a59 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/header-right.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/header-right.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/loader-white-large.gif b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/loader-white-large.gif
index aa4ec5a..aa4ec5a 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/loader-white-large.gif
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/loader-white-large.gif
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/loader-white-small.gif b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/loader-white-small.gif
index 75ad2b3..75ad2b3 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/loader-white-small.gif
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/loader-white-small.gif
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-curve-left.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/menu-curve-left.png
index c48a2e0..c48a2e0 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-curve-left.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/menu-curve-left.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-curve-right.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/menu-curve-right.png
index 1f3b100..1f3b100 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-curve-right.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/menu-curve-right.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-stretch.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/menu-stretch.png
index 0ca66f7..0ca66f7 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/menu-stretch.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/menu-stretch.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/mini-header-left.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/mini-header-left.png
index 72551e7..72551e7 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/mini-header-left.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/mini-header-left.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/mini-header-right.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/mini-header-right.png
index 8aaf50c..8aaf50c 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/mini-header-right.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/mini-header-right.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/server-splash.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/server-splash.png
index f8fe1f9..f8fe1f9 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/server-splash.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/server-splash.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/spring.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/spring.png
index 05a1940..05a1940 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/spring.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/spring.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/table-header-background.png b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/table-header-background.png
index 8f2ba1b..8f2ba1b 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/images/table-header-background.png
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/images/table-header-background.png
Binary files differ
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/local.css b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/styles/local.css
index 8bdb7f4..8bdb7f4 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/local.css
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/styles/local.css
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/main.css b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/styles/main.css
index ea3ccff..ea3ccff 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/main.css
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/styles/main.css
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/print.css b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/styles/print.css
index 3abe1c0..3abe1c0 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/styles/print.css
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/resources/styles/print.css
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath b/formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath
index 62e9da0..9abd83e 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath
@@ -3,8 +3,6 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.virgo.ide.jdt.core.MANIFEST_CLASSPATH_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.samples.formtags.par.domain"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.samples.formtags.par.service"/>
<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="owner.project.facets" value="java"/>
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/META-INF/MANIFEST.MF b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/META-INF/MANIFEST.MF
index d4ae3c4..07e4d16 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/META-INF/MANIFEST.MF
@@ -11,4 +11,3 @@ Import-Package: org.eclipse.virgo.samples.formtags.par.domain,
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="1.1.2"
Import-Library: org.springframework.spring;version="[2.5.6.A,5.0.0)"
Web-ContextPath: formtags-par
-
diff --git a/no-spring-web/.classpath b/no-spring-web/.classpath
index 122d7d0..35a0df3 100644
--- a/no-spring-web/.classpath
+++ b/no-spring-web/.classpath
@@ -20,5 +20,10 @@
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
+ <classpathentry kind="con" path="org.eclipse.virgo.ide.jdt.core.MANIFEST_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/no-spring-web/.settings/org.eclipse.jdt.core.prefs b/no-spring-web/.settings/org.eclipse.jdt.core.prefs
index c281ea4..f26c14e 100644
--- a/no-spring-web/.settings/org.eclipse.jdt.core.prefs
+++ b/no-spring-web/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,12 @@
-#Fri Aug 12 09:58:53 BST 2011
+#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.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+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.6
+org.eclipse.jdt.core.compiler.source=1.5
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 09c6a33..9b5f917 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=true
+bundlor.generated.manifest.autoformatting=false
byte.code.scanning=true
eclipse.preferences.version=1
-template.properties.files=template.properties;../build.properties
+template.properties.files=../build.versions
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 6b7604e..ea69099 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="6.0"/>
+ <installed facet="jst.java" version="5.0"/>
<installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</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 057fa79..24c7448 100644
--- a/no-spring-web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/no-spring-web/src/main/webapp/META-INF/MANIFEST.MF
@@ -1,6 +1,9 @@
-Manifest-Version: 1.0
-Bundle-Name: Sample No Spring
-Bundle-Version: 3.0.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.virgo.samples.no.spring
-Bundle-ClassPath: WEB-INF/classes \ No newline at end of file
+Manifest-Version: 1.0
+Bundle-ClassPath: .,WEB-INF/classes
+Bundle-Version: 3.0.0
+Tool: Bundlor 1.1.1.RELEASE
+Bundle-Name: Sample No Spring
+Bundle-ManifestVersion: 2
+Web-ContextPath: /nospring
+Bundle-SymbolicName: org.eclipse.virgo.samples.no.spring
+
diff --git a/no-spring-web/template.mf b/no-spring-web/template.mf
index 44c2c9d..b95b460 100644
--- a/no-spring-web/template.mf
+++ b/no-spring-web/template.mf
@@ -3,10 +3,10 @@ Bundle-Name: Sample No Spring
Bundle-Version: 3.0.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.virgo.samples.no.spring
-Bundle-ClassPath: WEB-INF/classes
+Bundle-ClassPath: .,WEB-INF/classes
Web-ContextPath: /nospring
Import-Template:
- javax.servlet.*;version="${javax.servlet:[2.5.0,+1)}",
- org.slf4j;version="${org.slf4j:[=.=.=,+1)}"
+ javax.servlet.*;version="${javax.servlet:[=.=.=,+1)}",
+ org.slf4j;version="${org.slf4j.api:[=.=.=,+1)}"
Excluded-Exports: *

Back to the top