Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2013-01-17 06:11:41 -0500
committerChristopher Frost2013-01-17 06:11:41 -0500
commitef6733e824488e55594489141212da27384740f4 (patch)
treed993de265a372e8b540ce48c80515467ebf0a207
parenta03dac37e8c1cd0396cb801a0a4d8fa4f14b1aeb (diff)
downloadorg.eclipse.virgo.samples-ef6733e824488e55594489141212da27384740f4.tar.gz
org.eclipse.virgo.samples-ef6733e824488e55594489141212da27384740f4.tar.xz
org.eclipse.virgo.samples-ef6733e824488e55594489141212da27384740f4.zip
329368 more fixes to clean up Eclipse, versions are up to date and some more deprecated code removed
-rw-r--r--build-samples/build.xml2
-rw-r--r--build.versions1
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath1
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.project5
-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.core/src/main/java/org/eclipse/virgo/samples/configuration/properties/core/PropertiesService.java (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/PropertiesService.java)2
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/java/org/eclipse/virgo/samples/configuration/properties/core/StandardPropertiesService.java (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/StandardPropertiesService.java)2
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/MANIFEST.MF11
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/spring/module-context.xml2
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/spring/osgi-context.xml4
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/template.mf4
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath7
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.project5
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/build.xml2
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/ivy.xml3
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/java/org/eclipse/virgo/samples/configuration/properties/web/PropertiesController.java (renamed from configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/java/org/eclipse/virgo/sample/configuration/properties/web/PropertiesController.java)5
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/META-INF/MANIFEST.MF35
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/applicationContext.xml2
-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.xml12
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/web.xml4
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/index.html2
-rw-r--r--configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/template.mf36
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/build.xml2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/ivy.xml2
-rw-r--r--formtags/par/org.eclipse.virgo.samples.formtags.web/src/main/webapp/META-INF/MANIFEST.MF1
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/build.xml2
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/ivy.xml2
-rw-r--r--formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/META-INF/MANIFEST.MF3
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.project2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/build.xml2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/ivy.xml2
-rw-r--r--formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF2
-rw-r--r--no-spring-web/.classpath11
-rw-r--r--no-spring-web/.settings/.jsdtscope11
-rw-r--r--no-spring-web/.settings/org.eclipse.virgo.ide.bundlor.core.prefs6
-rw-r--r--no-spring-web/.settings/org.eclipse.wst.common.project.facet.core.xml1
-rw-r--r--no-spring-web/.settings/org.springframework.ide.eclipse.core.prefs63
-rw-r--r--no-spring-web/src/main/webapp/META-INF/.gitignore0
-rw-r--r--no-spring-web/src/main/webapp/META-INF/MANIFEST.MF16
-rw-r--r--no-spring-web/src/main/webapp/index.html2
-rw-r--r--no-spring-web/template.mf4
45 files changed, 114 insertions, 193 deletions
diff --git a/build-samples/build.xml b/build-samples/build.xml
index 0ff88f3..7ed62ae 100644
--- a/build-samples/build.xml
+++ b/build-samples/build.xml
@@ -65,7 +65,7 @@
<copy todir="${package.output.dir}/configuration-properties">
<fileset dir="${basedir}/../configuration-properties">
<include name="**/target/artifacts/*.jar"/>
- <include name="**/target/artifacts/*.war"/>
+ <include name="**/target/artifacts/*.properties"/>
</fileset>
<flattenmapper/>
</copy>
diff --git a/build.versions b/build.versions
index 0d0ee21..65a3c16 100644
--- a/build.versions
+++ b/build.versions
@@ -15,7 +15,6 @@ 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.api=1.7.2.v20121108-1250
-org.springframework.js=2.0.8.RELEASE
org.springframework=3.1.0.RELEASE
# Test
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath
index 521d242..1304211 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.classpath
@@ -26,7 +26,6 @@
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RC1/org.springframework.core-sources-3.0.0.RC1.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RC1/org.springframework.beans-sources-3.0.0.RC1.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.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.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 combineaccessrules="false" kind="src" path="/Virgo Runtime at localhost Server"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.project b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.project
index 4d5a701..bf78ea7 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.project
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/.project
@@ -25,6 +25,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.virgo.ide.bundlor.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>com.springsource.server.ide.facet.core.bundlenature</nature>
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 0bb7e3f..26cf705 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.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.osgi" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
</dependencies>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/PropertiesService.java b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/java/org/eclipse/virgo/samples/configuration/properties/core/PropertiesService.java
index fb56569..1db5d34 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/PropertiesService.java
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/java/org/eclipse/virgo/samples/configuration/properties/core/PropertiesService.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.sample.configuration.properties.core;
+package org.eclipse.virgo.samples.configuration.properties.core;
import java.util.Map;
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/StandardPropertiesService.java b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/java/org/eclipse/virgo/samples/configuration/properties/core/StandardPropertiesService.java
index abfe28d..09fea32 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/StandardPropertiesService.java
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/java/org/eclipse/virgo/samples/configuration/properties/core/StandardPropertiesService.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.sample.configuration.properties.core;
+package org.eclipse.virgo.samples.configuration.properties.core;
import java.util.HashMap;
import java.util.Map;
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 e1cb377..ae113e6 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
@@ -1,12 +1,11 @@
Manifest-Version: 1.0
-Export-Package: org.eclipse.virgo.sample.configuration.properties.core
- ;version="2.0.0";uses:="org.osgi.service.cm"
+Export-Package: org.eclipse.virgo.samples.configuration.properties.cor
+ e;version="3.0.0"
Bundle-Version: 3.0.0
-Tool: Bundlor 1.0.0.BUILD-20091207202403
+Tool: Bundlor 1.1.0.RELEASE
Bundle-Name: Configuration Sample Content Bundle
Bundle-ManifestVersion: 2
Bundle-Description: Configuration Sample Content Provider
-Bundle-SymbolicName: org.eclipse.virgo.sample.configuration.properties
- .core
-Import-Package: org.osgi.service.cm;version="0"
+Bundle-SymbolicName: org.eclipse.virgo.samples.configuration.propertie
+ s.core
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/spring/module-context.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/spring/module-context.xml
index bf6beaf..cd6d166 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/spring/module-context.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/spring/module-context.xml
@@ -7,7 +7,7 @@
<!-- ARTEFACT MANAGER -->
- <bean id="propertiesService" class="org.eclipse.virgo.sample.configuration.properties.core.StandardPropertiesService">
+ <bean id="propertiesService" class="org.eclipse.virgo.samples.configuration.properties.core.StandardPropertiesService">
<constructor-arg value="${driverClassName}"/>
<constructor-arg value="${url}"/>
<constructor-arg value="${username}"/>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/spring/osgi-context.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/spring/osgi-context.xml
index 530c4da..e4e9131 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/spring/osgi-context.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/src/main/resources/META-INF/spring/osgi-context.xml
@@ -9,8 +9,8 @@
http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium-1.2.xsd">
- <osgi:service ref="propertiesService" interface="org.eclipse.virgo.sample.configuration.properties.core.PropertiesService"/>
+ <osgi:service ref="propertiesService" interface="org.eclipse.virgo.samples.configuration.properties.core.PropertiesService"/>
- <osgi-compendium:cm-properties id="configAdminProperties" persistent-id="org.eclipse.virgo.sample.configuration"/>
+ <osgi-compendium:cm-properties id="configAdminProperties" persistent-id="org.eclipse.virgo.samples.configuration"/>
</beans>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/template.mf b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/template.mf
index 1657aff..e31c68e 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/template.mf
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.core/template.mf
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-Name: Configuration Sample Content Bundle
Bundle-Description: Configuration Sample Content Provider
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.virgo.sample.configuration.properties.core
+Bundle-SymbolicName: org.eclipse.virgo.samples.configuration.properties.core
Bundle-Version: 3.0.0
Import-Template:
javax.management.*;version="0",
@@ -11,4 +11,4 @@ Import-Template:
org.osgi.service.cm.*;version="0"
Excluded-Imports:
org.junit,
- org.eclipse.virgo.sample.configuration.*
+ org.eclipse.virgo.samples.configuration.*
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 10fa3f6..0264c0a 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.classpath
@@ -5,11 +5,7 @@
<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path="src/main/resources">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
- </attributes>
- </classpathentry>
+ <classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.1.0.RELEASE/org.springframework.web-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/3.0.0.RELEASE/org.springframework.web-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/3.1.0.RELEASE/org.springframework.web.servlet-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.RELEASE/org.springframework.web.servlet-sources-3.0.0.RELEASE.jar"/>
@@ -19,7 +15,6 @@
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet.jsp.jstl/1.2.0.v201105211821/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.springframework.webflow/org.springframework.js/2.0.8.RELEASE/org.springframework.js-2.0.8.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework.webflow/org.springframework.js/2.0.8.RELEASE/org.springframework.js-sources-2.0.8.RELEASE.jar"/>
<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"/>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.project b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.project
index cb9b91d..4c59f2d 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.project
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/.project
@@ -25,6 +25,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.virgo.ide.bundlor.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>com.springsource.server.ide.facet.core.bundlenature</nature>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/build.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/build.xml
index 930634f..5a075d1 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/build.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/build.xml
@@ -3,6 +3,6 @@
<property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
- <import file="${basedir}/../../virgo-build/war/default.xml"/>
+ <import file="${basedir}/../../virgo-build/wab/default.xml"/>
</project>
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 e5e662a..f232d5d 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
@@ -12,7 +12,7 @@
</configurations>
<publications>
- <artifact name="${ant.project.name}" type="war" ext="war"/>
+ <artifact name="${ant.project.name}" type="wab" ext="jar"/>
<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
</publications>
@@ -32,7 +32,6 @@
<dependency org="org.springframework" name="org.springframework.beans" rev="${org.springframework}" conf="provided->runtime"/>
<dependency org="org.springframework" name="org.springframework.web" rev="${org.springframework}" conf="provided->runtime"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="${org.springframework}" conf="provided->runtime"/>
- <dependency org="org.springframework.webflow" name="org.springframework.js" rev="${org.springframework.js}" conf="provided->runtime"/>
<!-- === 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"/>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/java/org/eclipse/virgo/sample/configuration/properties/web/PropertiesController.java b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/java/org/eclipse/virgo/samples/configuration/properties/web/PropertiesController.java
index 3cc9aa0..3692870 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/java/org/eclipse/virgo/sample/configuration/properties/web/PropertiesController.java
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/java/org/eclipse/virgo/samples/configuration/properties/web/PropertiesController.java
@@ -9,14 +9,14 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.sample.configuration.properties.web;
+package org.eclipse.virgo.samples.configuration.properties.web;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
-import org.eclipse.virgo.sample.configuration.properties.core.PropertiesService;
+import org.eclipse.virgo.samples.configuration.properties.core.PropertiesService;
/**
@@ -30,7 +30,6 @@ import org.eclipse.virgo.sample.configuration.properties.core.PropertiesService;
*
*/
@Controller
-@RequestMapping("/properties")
public final class PropertiesController {
@Autowired
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 b5d5c4f..3d7c25c 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
@@ -1,25 +1,24 @@
Manifest-Version: 1.0
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
- 1.1.2,1.3)",org.springframework.js;version="[2.0.7.RELEASE,3.0.0)"
+ 1.1.2,1.3)"
Bundle-Version: 3.0.0
-Tool: Bundlor 1.0.0.BUILD-20091207202403
+Tool: Bundlor 1.1.0.RELEASE
Bundle-Name: Configuration Sample Web Bundle
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.virgo.sample.configuration.properties
- .web
+Bundle-SymbolicName: org.eclipse.virgo.samples.configuration.propertie
+ s.web
Web-ContextPath: config-properties
-Import-Package: javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.0)",or
- g.apache.juli.logging.impl;version="[6.0.16,6.1)",org.eclipse.virgo.s
- ample.configuration.properties.core;version="[2.0.0,2.5.0)",org.eclip
- se.virgo.web.dm;version="[2.0.0,3.0.0)",org.springframework.beans.fac
- tory.xml;version="[3.0,3.1)",org.springframework.context.config;versi
- on="[3.0, 3.1)",org.springframework.context.support;version="[3.0,3.1
- )",org.springframework.js.resource;version="[2.0.7.RELEASE,3.0.0)",or
- g.springframework.web.context;version="[3.0,4.0)",org.springframework
- .web.context.support;version="[3.0,3.1)",org.springframework.web.serv
- let;version="[3.0,4.0)",org.springframework.web.servlet.handler;versi
- on="[3.0,3.1)",org.springframework.web.servlet.mvc;version="[3.0,3.1)
- ",org.springframework.web.servlet.mvc.annotation;version="[3.0,3.1)",
- org.springframework.web.servlet.support;version="[3.0,3.1)",org.sprin
- gframework.web.servlet.view;version="[3.0,3.1)"
+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.xml;version="[3.0,4.0)",org.s
+ pringframework.context.config;version="[3.0,4.0)",org.springframework
+ .context.support;version="[3.0,4.0)",org.springframework.web.context;
+ version="[3.0,4.0)",org.springframework.web.context.support;version="
+ [3.0,4.0)",org.springframework.web.servlet;version="[3.0,4.0)",org.sp
+ ringframework.web.servlet.config;version="[3.0,4.0)",org.springframew
+ ork.web.servlet.handler;version="[3.0,4.0)",org.springframework.web.s
+ ervlet.mvc;version="[3.0,4.0)",org.springframework.web.servlet.mvc.an
+ notation;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)"
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/applicationContext.xml b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/applicationContext.xml
index d58d75f..d9694d7 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/WEB-INF/applicationContext.xml
@@ -5,6 +5,6 @@
xsi:schemaLocation="http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
- <osgi:reference id="propertiesService" interface="org.eclipse.virgo.sample.configuration.properties.core.PropertiesService" />
+ <osgi:reference id="propertiesService" interface="org.eclipse.virgo.samples.configuration.properties.core.PropertiesService" />
</beans>
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 9db256d..899c9ce 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="<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" />
+ <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" />
</head>
<body class="main tundra">
<div id="page">
@@ -34,7 +34,7 @@
<div id="content-no-nav">
<h1 class="title">Configuration properties sample</h1>
<p>
- The following properties have been found in 'org.eclipse.virgo.sample.configuration'.
+ The following properties have been found in 'org.eclipse.virgo.samples.configuration'.
</p>
<table id="properties" class="bordered-table">
<tr>
@@ -66,7 +66,7 @@
</div><!-- /container -->
<div id="footer-wrapper">
- <div id="footer-left">&copy; Copyright 2008, 2010 VMware Inc. Licensed under the Eclipse Public License v1.0.</div>
+ <div id="footer-left">&copy; Copyright 2008, 2013 VMware Inc. Licensed under the Eclipse Public License v1.0.</div>
<div id="footer-right"></div>
</div>
</div> <!-- /page-->
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 8fa829a..005fc51 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
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ 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">
- <context:component-scan base-package="org.eclipse.virgo.sample.configuration.properties.web" />
+ <mvc:annotation-driven />
+
+ <context:component-scan base-package="org.eclipse.virgo.samples.configuration.properties.web" />
+
<!-- VIEW CONFIG -->
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 d71a201..b614cd2 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
@@ -31,12 +31,12 @@
<servlet-mapping>
<servlet-name>sample</servlet-name>
- <url-pattern>/web/*</url-pattern>
+ <url-pattern>/properties/*</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ResourceServlet</servlet-name>
- <servlet-class>org.springframework.js.resource.ResourceServlet</servlet-class>
+ <servlet-class>org.springframework.web.servlet.ResourceServlet</servlet-class>
</servlet>
<servlet-mapping>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/index.html b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/index.html
index 9840cca..053c714 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/index.html
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/src/main/webapp/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Virgo Sample</title>
- <meta http-equiv="REFRESH" content="0;url=/config-properties/web/properties/overview">
+ <meta http-equiv="REFRESH" content="0;url=/config-properties/properties/overview">
</head>
<body>
<br/>
diff --git a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/template.mf b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/template.mf
index 3e45ff7..49485c4 100644
--- a/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/template.mf
+++ b/configuration-properties/org.eclipse.virgo.samples.configuration-properties.web/template.mf
@@ -2,33 +2,31 @@ Manifest-Version: 1.0
Bundle-Name: Configuration Sample Web Bundle
Bundle-Version: 3.0.0
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.virgo.sample.configuration.properties.web
+Bundle-SymbolicName: org.eclipse.virgo.samples.configuration.properties.web
Import-Template:
- org.eclipse.virgo.sample.configuration.properties.core;version="[2.0.0,2.5.0)",
+ org.eclipse.virgo.samples.configuration.properties.core;version="[3.0.0,4.0.0)",
org.springframework.*;version="[3.0,4.0)",
- org.springframework.js;version="[2.0.7.RELEASE,3.0.0)",
org.apache.commons.logging;version="[1.1.1,1.1.1]",
javax.servlet.*;version="[2.1.0, 3.0.0)",
javax.xml.stream.*;version="0",
org.osgi.framework.*;version="0",
org.osgi.service.cm.*;version="0"
Import-Bundle:
- com.springsource.org.apache.taglibs.standard;version="[1.1.2,1.3)",
- org.springframework.js;version="[2.0.7.RELEASE,3.0.0)"
+ com.springsource.org.apache.taglibs.standard;version="[1.1.2,1.3)"
Import-Package:
- javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.0)",
- org.eclipse.virgo.web.dm;version="[2.0.0,3.0.0)",
- org.eclipse.virgo.sample.configuration.properties.core;version="[2.0.0,3.0.0)",
- org.springframework.web.servlet.handler;version="[3.0,3.1)",
- org.springframework.web.servlet.view;version="[3.0,3.1)",
- org.springframework.web.servlet.mvc;version="[3.0,3.1)",
- org.springframework.web.servlet.mvc.annotation;version="[3.0,3.1)",
- org.springframework.web.servlet.support;version="[3.0,3.1)",
- org.springframework.web.context.support;version="[3.0,3.1)",
- org.springframework.context.support;version="[3.0,3.1)",
- org.springframework.context.config;version="[3.0, 3.1)",
- org.springframework.beans.factory.xml;version="[3.0,3.1)",
- org.springframework.js.resource;version="[2.0.7.RELEASE,3.0.0)",
- org.apache.juli.logging.impl;version="[6.0.16,6.1)"
+ org.eclipse.virgo.web.dm;version="[3.0.0,4.0.0)",
+ org.eclipse.virgo.samples.configuration.properties.core;version="[3.0.0,4.0.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.view;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.context;version="[3.0,4.0)",
+ org.springframework.web.context.support;version="[3.0,4.0)",
+ org.springframework.context.support;version="[3.0,4.0)",
+ org.springframework.context.config;version="[3.0,4.0)",
+ org.springframework.beans.factory.xml;version="[3.0,4.0)"
Excluded-Exports: *
Web-ContextPath: config-properties
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath b/formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath
index 86b0500..62e9da0 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/.classpath
@@ -4,11 +4,11 @@
<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"/>
</attributes>
</classpathentry>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.samples.formtags.par.service"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.jdt.core.prefs b/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.jdt.core.prefs
index 935ed0d..c537b63 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.jdt.core.prefs
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Fri Jun 26 16:45:50 BST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+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.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/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml
index 2a4afa6..88ab4ac 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -5,5 +5,5 @@
<fixed facet="jst.java"/>
<installed facet="jst.web" version="2.5"/>
<installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
- <installed facet="jst.java" version="5.0"/>
+ <installed facet="jst.java" version="1.6"/>
</faceted-project>
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/build.xml b/formtags/par/org.eclipse.virgo.samples.formtags.web/build.xml
index 98631ba..7452ffc 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/build.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/build.xml
@@ -3,6 +3,6 @@
<property file="${basedir}/../../../build.properties" />
<property file="${basedir}/../../../build.versions" />
- <import file="${basedir}/../../../virgo-build/war/default.xml" />
+ <import file="${basedir}/../../../virgo-build/wab/default.xml" />
</project>
diff --git a/formtags/par/org.eclipse.virgo.samples.formtags.web/ivy.xml b/formtags/par/org.eclipse.virgo.samples.formtags.web/ivy.xml
index f24c263..819a0a3 100644
--- a/formtags/par/org.eclipse.virgo.samples.formtags.web/ivy.xml
+++ b/formtags/par/org.eclipse.virgo.samples.formtags.web/ivy.xml
@@ -12,7 +12,7 @@
</configurations>
<publications>
- <artifact name="${ant.project.name}" ext="war"/>
+ <artifact name="${ant.project.name}" type="wab" ext="jar"/>
<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
</publications>
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 1845e52..d4ae3c4 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,5 +11,4 @@ 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
-Bundle-Classpath: WEB-INF/classes
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/build.xml b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/build.xml
index 2680f3b..8c697b2 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/build.xml
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/build.xml
@@ -4,6 +4,6 @@
<property file="${basedir}/../../../build.properties" />
<property file="${basedir}/../../../build.versions" />
<import file="${basedir}/../../../build-samples/package-bundle.xml" />
- <import file="${basedir}/../../../virgo-build/war/default.xml" />
+ <import file="${basedir}/../../../virgo-build/wab/default.xml" />
</project>
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/ivy.xml b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/ivy.xml
index 4b278ee..058616e 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/ivy.xml
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/ivy.xml
@@ -12,7 +12,7 @@
</configurations>
<publications>
- <artifact name="${ant.project.name}" type="war" ext="war"/>
+ <artifact name="${ant.project.name}" type="wab" ext="jar"/>
<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
</publications>
diff --git a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/META-INF/MANIFEST.MF b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/META-INF/MANIFEST.MF
index 7623036..04009c7 100644
--- a/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/META-INF/MANIFEST.MF
+++ b/formtags/shared-libs/org.eclipse.virgo.samples.formtags.shared-libs/src/main/webapp/META-INF/MANIFEST.MF
@@ -2,8 +2,9 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Version: 3.0.0
Bundle-Name: FormTags Shared Library War
-Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.formtags_shared_libs
+Bundle-SymbolicName: org.eclipse.virgo.samples.formtags.shared_libs
Import-Package: javax.servlet.http,
javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.1)"
Import-Library: org.springframework.spring;version="[2.5.6.A,5.0.0)"
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="1.1.2"
+Web-ContextPath: formtags-par
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.project b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.project
index 802b514..46d26f1 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.project
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/.project
@@ -3,7 +3,7 @@
<name>org.eclipse.virgo.samples.formtags.shared-services.web</name>
<comment></comment>
<projects>
- <project>formtags-shared-services-service</project>
+ <project>org.eclipse.virgo.samples.formtags.shared-services.service</project>
</projects>
<buildSpec>
<buildCommand>
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/build.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/build.xml
index 562df8f..d5845e6 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/build.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/build.xml
@@ -4,6 +4,6 @@
<property file="${basedir}/../../../build.properties" />
<property file="${basedir}/../../../build.versions" />
<import file="${basedir}/../../../build-samples/package-bundle.xml" />
- <import file="${basedir}/../../../virgo-build/war/default.xml" />
+ <import file="${basedir}/../../../virgo-build/wab/default.xml" />
</project>
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/ivy.xml b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/ivy.xml
index bc53625..6435297 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/ivy.xml
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/ivy.xml
@@ -12,7 +12,7 @@
</configurations>
<publications>
- <artifact name="${ant.project.name}" type="war" ext="war"/>
+ <artifact name="${ant.project.name}" type="wab" ext="jar"/>
<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
</publications>
diff --git a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF
index 7723339..651a074 100644
--- a/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF
+++ b/formtags/shared-services/org.eclipse.virgo.samples.formtags.shared-services.war/src/main/webapp/META-INF/MANIFEST.MF
@@ -10,4 +10,4 @@ Import-Package: javax.servlet.http,
org.eclipse.virgo.web.dm;version="[3.0,5.0)"
Import-Library: org.springframework.spring;version="[2.5.6.A,4.0.0)"
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="1.1.2.v20110517"
-
+Web-ContextPath: formtags-par
diff --git a/no-spring-web/.classpath b/no-spring-web/.classpath
index e5c668c..122d7d0 100644
--- a/no-spring-web/.classpath
+++ b/no-spring-web/.classpath
@@ -15,17 +15,10 @@
<attribute name="org.eclipse.virgo.ide.jdt.core.test.classpathentry" value="true"/>
</attributes>
</classpathentry>
- <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">
+ <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="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="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/.settings/.jsdtscope b/no-spring-web/.settings/.jsdtscope
deleted file mode 100644
index 5d8de19..0000000
--- a/no-spring-web/.settings/.jsdtscope
+++ /dev/null
@@ -1,11 +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">
- <attributes>
- <attribute name="hide" value="false"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
- <classpathentry kind="output" path=""/>
-</classpath>
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 a427da3..09c6a33 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,2 +1,4 @@
-org.eclipse.virgo.ide.bundlor.core.template.properties.files=../build.properties;../build.versions
-eclipse.preferences.version=1 \ No newline at end of file
+bundlor.generated.manifest.autoformatting=true
+byte.code.scanning=true
+eclipse.preferences.version=1
+template.properties.files=template.properties;../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 6e25134..6b7604e 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
@@ -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/no-spring-web/.settings/org.springframework.ide.eclipse.core.prefs b/no-spring-web/.settings/org.springframework.ide.eclipse.core.prefs
deleted file mode 100644
index 785f1a6..0000000
--- a/no-spring-web/.settings/org.springframework.ide.eclipse.core.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Wed Jun 22 16:08:40 IST 2011
-eclipse.preferences.version=1
-org.springframework.ide.eclipse.core.builders.enable.aopreferencemodelbuilder=true
-org.springframework.ide.eclipse.core.builders.enable.beanmetadatabuilder=true
-org.springframework.ide.eclipse.core.builders.enable.osgibundleupdater=false
-org.springframework.ide.eclipse.core.enable.project.preferences=false
-org.springframework.ide.eclipse.core.validator.enable.com.springsource.server.ide.manifest.core.manifestvalidator=true
-org.springframework.ide.eclipse.core.validator.enable.com.springsource.sts.bestpractices.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=true
-org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.core.springvalidator=false
-org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.applicationSymbolicNameRule-com.springsource.server.ide.manifest.core.manifestvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.applicationVersionRule-com.springsource.server.ide.manifest.core.manifestvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleActivationPolicyRule-com.springsource.server.ide.manifest.core.manifestvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleActivatorRule-com.springsource.server.ide.manifest.core.manifestvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleManifestVersionRule-com.springsource.server.ide.manifest.core.manifestvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleSymbolicNameRule-com.springsource.server.ide.manifest.core.manifestvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleVersionRule-com.springsource.server.ide.manifest.core.manifestvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.exportPackageRule-com.springsource.server.ide.manifest.core.manifestvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.importRule-com.springsource.server.ide.manifest.core.manifestvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.parsingProblemsRule-com.springsource.server.ide.manifest.core.manifestvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.requireBundleRule-com.springsource.server.ide.manifest.core.manifestvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.AvoidDriverManagerDataSource-com.springsource.sts.bestpractices.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.ImportElementsAtTopRulee-com.springsource.sts.bestpractices.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.ParentBeanSpecifiesAbstractClassRule-com.springsource.sts.bestpractices.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.RefElementRule-com.springsource.sts.bestpractices.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.TooManyBeansInFileRule-com.springsource.sts.bestpractices.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.UnnecessaryValueElementRule-com.springsource.sts.bestpractices.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.UseBeanInheritance-com.springsource.sts.bestpractices.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.legacyxmlusage.jndiobjectfactory-com.springsource.sts.bestpractices.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.autowire.autowire-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanConstructorArgument-org.springframework.ide.eclipse.beans.core.beansvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinition-org.springframework.ide.eclipse.beans.core.beansvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinitionHolder-org.springframework.ide.eclipse.beans.core.beansvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanFactory-org.springframework.ide.eclipse.beans.core.beansvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanInitDestroyMethod-org.springframework.ide.eclipse.beans.core.beansvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanReference-org.springframework.ide.eclipse.beans.core.beansvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.methodOverride-org.springframework.ide.eclipse.beans.core.beansvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.parsingProblems-org.springframework.ide.eclipse.beans.core.beansvalidator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.requiredProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.toolAnnotation-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.core.springClasspath-org.springframework.ide.eclipse.core.springvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.action-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.actionstate-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attribute-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attributemapper-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.beanaction-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationaction-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationresult-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.exceptionhandler-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.import-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.inputattribute-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.mapping-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.outputattribute-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.set-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.state-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.subflowstate-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.transition-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.variable-org.springframework.ide.eclipse.webflow.core.validator=true
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.webflowstate-org.springframework.ide.eclipse.webflow.core.validator=true
diff --git a/no-spring-web/src/main/webapp/META-INF/.gitignore b/no-spring-web/src/main/webapp/META-INF/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/no-spring-web/src/main/webapp/META-INF/.gitignore
+++ /dev/null
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 8e74ce9..057fa79 100644
--- a/no-spring-web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/no-spring-web/src/main/webapp/META-INF/MANIFEST.MF
@@ -1,10 +1,6 @@
-Manifest-Version: 1.0
-Bundle-ClassPath: WEB-INF/classes
-Bundle-Version: 3.5.0
-Tool: Bundlor 1.1.0.BUILD-20101220120024
-Bundle-Name: Splash Screen
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.virgo.apps.splash
-Web-ContextPath: /
-Import-Package: org.eclipse.virgo.apps.splash
-
+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
diff --git a/no-spring-web/src/main/webapp/index.html b/no-spring-web/src/main/webapp/index.html
index 9e01d06..df27e3b 100644
--- a/no-spring-web/src/main/webapp/index.html
+++ b/no-spring-web/src/main/webapp/index.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<title>Virgo Sample Web</title>
- <meta http-equiv="REFRESH" content="0;url=/sample">
+ <meta http-equiv="REFRESH" content="0;url=/nospring/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 4cdfc55..44c2c9d 100644
--- a/no-spring-web/template.mf
+++ b/no-spring-web/template.mf
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-Name: Sample No Spring
-Bundle-Version: ${version}
+Bundle-Version: 3.0.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.virgo.samples.no.spring
Bundle-ClassPath: WEB-INF/classes
-Web-ContextPath: /
+Web-ContextPath: /nospring
Import-Template:
javax.servlet.*;version="${javax.servlet:[2.5.0,+1)}",
org.slf4j;version="${org.slf4j:[=.=.=,+1)}"

Back to the top